diff --git a/hosts/best/default.nix b/hosts/best/default.nix index 771c320..d0dd9de 100644 --- a/hosts/best/default.nix +++ b/hosts/best/default.nix @@ -58,7 +58,6 @@ in { }; }; - nixpkgs.hostPlatform = "x86_64-linux"; system.stateVersion = "25.05"; home-manager.sharedModules = [{ home.stateVersion = "25.05"; diff --git a/hosts/best/hardware.nix b/hosts/best/hardware.nix index 2abbc15..ab1fdad 100644 --- a/hosts/best/hardware.nix +++ b/hosts/best/hardware.nix @@ -27,4 +27,6 @@ in { fsType = "vfat"; options = [ "noatime" ]; }; + + nixpkgs.hostPlatform = "x86_64-linux"; } diff --git a/hosts/cube/default.nix b/hosts/cube/default.nix index 184887e..421fae0 100644 --- a/hosts/cube/default.nix +++ b/hosts/cube/default.nix @@ -65,7 +65,6 @@ in { }; }; - nixpkgs.hostPlatform = "x86_64-linux"; system.stateVersion = "23.05"; home-manager.sharedModules = [{ home.stateVersion = "23.11"; diff --git a/hosts/cube/hardware.nix b/hosts/cube/hardware.nix index 5984ea7..89be440 100644 --- a/hosts/cube/hardware.nix +++ b/hosts/cube/hardware.nix @@ -20,4 +20,6 @@ in { fsType = "ext4"; options = [ "noatime" ]; }; + + nixpkgs.hostPlatform = "x86_64-linux"; } diff --git a/hosts/disk/default.nix b/hosts/disk/default.nix index 87d6683..6466d67 100644 --- a/hosts/disk/default.nix +++ b/hosts/disk/default.nix @@ -58,7 +58,6 @@ in { }; }; - nixpkgs.hostPlatform = "x86_64-linux"; system.stateVersion = "23.11"; home-manager.sharedModules = [{ home.stateVersion = "23.11"; diff --git a/hosts/disk/hardware.nix b/hosts/disk/hardware.nix index 9c07aa5..405fffe 100644 --- a/hosts/disk/hardware.nix +++ b/hosts/disk/hardware.nix @@ -33,4 +33,6 @@ in { swapDevices = [{ device = "/dev/disk/by-label/swap"; }]; + + nixpkgs.hostPlatform = "x86_64-linux"; } diff --git a/hosts/nine/default.nix b/hosts/nine/default.nix index 97f53b3..97a58db 100644 --- a/hosts/nine/default.nix +++ b/hosts/nine/default.nix @@ -58,7 +58,6 @@ in { }; }; - nixpkgs.hostPlatform = "aarch64-linux"; system.stateVersion = "23.11"; home-manager.sharedModules = [{ home.stateVersion = "23.11"; diff --git a/hosts/nine/hardware.nix b/hosts/nine/hardware.nix index fa7c015..4b8e33c 100644 --- a/hosts/nine/hardware.nix +++ b/hosts/nine/hardware.nix @@ -30,4 +30,6 @@ in { }; zramSwap = enabled; + + nixpkgs.hostPlatform = "aarch64-linux"; } diff --git a/hosts/pala/default.nix b/hosts/pala/default.nix index acc75cd..f4afdb5 100644 --- a/hosts/pala/default.nix +++ b/hosts/pala/default.nix @@ -1,4 +1,8 @@ -lib: lib.darwinSystem { +lib: lib.darwinSystem ({ lib, ... }: let + inherit (lib) collectNix remove; +in { + imports = collectNix ./. |> remove ./default.nix; + type = "desktop"; networking.hostName = "pala"; @@ -13,6 +17,5 @@ lib: lib.darwinSystem { homeDirectory = "/Users/pala"; }; - nixpkgs.hostPlatform = "aarch64-darwin"; system.stateVersion = 5; -} +}) diff --git a/hosts/pala/hardware.nix b/hosts/pala/hardware.nix new file mode 100644 index 0000000..69ee5ed --- /dev/null +++ b/hosts/pala/hardware.nix @@ -0,0 +1,3 @@ +{ + nixpkgs.hostPlatform = "aarch64-darwin"; +}