diff --git a/flake.lock b/flake.lock index 9b4372b..d90d484 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1670028550, - "narHash": "sha256-jrCEzbRfcNBSy0YHYPLpMSeoluryej3EuqdMZsR1bhQ=", + "lastModified": 1672274978, + "narHash": "sha256-Ui3WNLr/WsXwZ/GM1RI9PuBJj8nKr0DZLkBX/BHpJT4=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "8f3697c4ea0b138255a30b65510a25d393c4ce4c", + "rev": "b147ba53ff19743066e4f8c7c15422e710164b9c", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1670751203, - "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", + "lastModified": 1673540789, + "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", + "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1671740841, - "narHash": "sha256-y9xl0aYI9uOJpNabIVja7aksDgV5nMgH8MsWaEOW2bM=", + "lastModified": 1673339198, + "narHash": "sha256-5EAIJq89sTFooJ5vhsnaw7mDtKVDICvCv2ul7+BXAgA=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "3ec8fafb7b5d1463cb166233cf18bf495dd8e944", + "rev": "217178edb1127fb41ac4fd534d8a513c3dd3d81b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4f43dfc..828e53c 100644 --- a/flake.nix +++ b/flake.nix @@ -82,9 +82,9 @@ "lappy" = machine { name = "lappy"; }; "iso" = machine { name = "iso"; }; # nix build '.#nixosConfigurations.wsl.config.system.build.installer' - "wsl" = machine { name = "wsl"; }; + "nixos" = machine { name = "wsl"; system = "aarch64-linux"; }; # nix build '.#nixosConfigurations.wsl-aarch.config.system.build.installer' - "wsl-aarch" = machine { name = "wsl"; system = "aarch64-linux"; }; + "nixos-arm" = machine { name = "wsl"; system = "aarch64-linux"; }; }; darwinConfigurations = diff --git a/home/default.nix b/home/default.nix index 521f6d0..8c28d1e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -51,14 +51,14 @@ let gnome = false; }; - arch = { system = "aarch64-linux"; }; + arm = { system = "aarch64-linux"; }; x86 = { system = "x86_64-linux"; }; darwin = { system = "x86_64-darwin"; }; in { - "wsl" = mkhome (gui // arch); - "aarch64-gui" = mkhome (gdm // arch); - "aarch64-nogui" = mkhome (cli // arch); + "wsl" = mkhome (gui // arm); + "aarch64-gui" = mkhome (gdm // arm); + "aarch64-nogui" = mkhome (cli // arm); "x86_64-gui" = mkhome (gdm // x86); "x86_64-nogui" = mkhome (cli // x86); - "x86_64-darwin" = mkhome (gdm // darwin); + "x86_64-darwin" = mkhome (gui // darwin); } diff --git a/home/gui/chat.nix b/home/gui/chat.nix index f8eee62..913e0e0 100644 --- a/home/gui/chat.nix +++ b/home/gui/chat.nix @@ -3,15 +3,16 @@ let darwinPkgs = []; x86Pkgs = with pkgs; [ + discord element-desktop slack ]; - archPkgs = with pkgs; [ + armPkgs = with pkgs; [ element-desktop ]; in { - home.packages = ( if ( pkgs.stdenv.hostPlatform.isDarwin ) then darwinPkgs else - ( if ( lib.hasPrefix "aarch64" pkgs.system ) then archPkgs else + home.packages = ( if ( pkgs.stdenv.hostPlatform.isDarwin ) then darwinPkgs else + ( if ( lib.hasPrefix "aarch64" pkgs.system ) then armPkgs else ( if ( lib.hasPrefix "x86_64" pkgs.system ) then x86Pkgs else [] ) ) ); diff --git a/home/gui/firefox.nix b/home/gui/firefox.nix index f3ea6b1..9156f6f 100644 --- a/home/gui/firefox.nix +++ b/home/gui/firefox.nix @@ -13,7 +13,7 @@ let in with lib; { programs.firefox = { - enable = true; + enable = (! pkgs.stdenv.hostPlatform.isDarwin); package = ffPkgs; extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden diff --git a/hosts/linode/synapse.nix.crypt b/hosts/linode/synapse.nix.crypt index d9021cd..d35013c 100644 --- a/hosts/linode/synapse.nix.crypt +++ b/hosts/linode/synapse.nix.crypt @@ -1,16 +1,30 @@ -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 diff --git a/modules-all/automatic/nix.nix b/modules-all/automatic/nix.nix index feb18e6..1026545 100644 --- a/modules-all/automatic/nix.nix +++ b/modules-all/automatic/nix.nix @@ -4,6 +4,17 @@ # Enable flakes nix = { package = pkgs.nixFlakes; + buildMachines = [ + { + hostName = "dns.me.ts"; + system = "aarch64-linux"; + } + + { + hostName = "jude.me.ts"; + system = "x86_64-linux"; + } + ]; settings = { experimental-features = "nix-command flakes"; diff --git a/modules-linux/automatic/syncthing.nix b/modules-linux/automatic/syncthing.nix index 1bd8471..1778dba 100644 --- a/modules-linux/automatic/syncthing.nix +++ b/modules-linux/automatic/syncthing.nix @@ -9,7 +9,7 @@ let in { services.syncthing = { - enable = true; + enable = false; user = "greg"; group = "users"; dataDir = "/home/greg/sync";