diff options
| -rw-r--r-- | flake.nix | 7 | ||||
| -rw-r--r-- | machines/corsac/hardware.nix | 1 | ||||
| -rw-r--r-- | machines/fourmi/hardware.nix | 1 | ||||
| -rw-r--r-- | machines/lapin/hardware.nix | 1 | ||||
| -rw-r--r-- | machines/loup/hardware.nix | 1 | ||||
| -rw-r--r-- | machines/renard/hardware.nix | 1 | ||||
| -rw-r--r-- | machines/taupe/hardware.nix | 1 | ||||
| -rw-r--r-- | machines/taureau/hardware.nix | 1 | ||||
| -rw-r--r-- | machines/truite/hardware.nix | 1 |
9 files changed, 5 insertions, 10 deletions
diff --git a/flake.nix b/flake.nix index a385c32..adfd813 100644 --- a/flake.nix +++ b/flake.nix @@ -87,9 +87,9 @@ in { nixosConfigurations = lib.mergeAttrsList (map (machine: { ${machine.name} = nixpkgs.lib.nixosSystem { - inherit (machine) system; - specialArgs = inputs // (packageSetsForSystem machine.system) // { + specialArgs = inputs // { + inherit (packageSetsForSystem machine.system) unstablePkgs auxiliaryPkgs; inherit machines; me = machine // { is = mkMachineIdentities machines machine; }; keys = import ./secrets/keys.nix; @@ -97,6 +97,9 @@ }; modules = [ + nixpkgs.nixosModules.readOnlyPkgs + { nixpkgs.pkgs = (packageSetsForSystem machine.system).pkgs; } + ./machines/${machine.name} home-manager.nixosModules.home-manager { diff --git a/machines/corsac/hardware.nix b/machines/corsac/hardware.nix index c3038be..8ac85c4 100644 --- a/machines/corsac/hardware.nix +++ b/machines/corsac/hardware.nix @@ -35,6 +35,5 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/machines/fourmi/hardware.nix b/machines/fourmi/hardware.nix index e3913be..1738e23 100644 --- a/machines/fourmi/hardware.nix +++ b/machines/fourmi/hardware.nix @@ -28,5 +28,4 @@ # networking.interfaces.end0.useDHCP = lib.mkDefault true; # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; } diff --git a/machines/lapin/hardware.nix b/machines/lapin/hardware.nix index 08cf82e..cc32191 100644 --- a/machines/lapin/hardware.nix +++ b/machines/lapin/hardware.nix @@ -32,5 +32,4 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; } diff --git a/machines/loup/hardware.nix b/machines/loup/hardware.nix index ee9d233..f4389d4 100644 --- a/machines/loup/hardware.nix +++ b/machines/loup/hardware.nix @@ -50,6 +50,5 @@ # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true; # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/machines/renard/hardware.nix b/machines/renard/hardware.nix index 2b4173e..d79dee9 100644 --- a/machines/renard/hardware.nix +++ b/machines/renard/hardware.nix @@ -27,5 +27,4 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.ens18.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/machines/taupe/hardware.nix b/machines/taupe/hardware.nix index 8ddf1b1..810fafd 100644 --- a/machines/taupe/hardware.nix +++ b/machines/taupe/hardware.nix @@ -33,5 +33,4 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; } diff --git a/machines/taureau/hardware.nix b/machines/taureau/hardware.nix index bbb60a5..3c30146 100644 --- a/machines/taureau/hardware.nix +++ b/machines/taureau/hardware.nix @@ -25,6 +25,5 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp6s16.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; virtualisation.hypervGuest.enable = true; } diff --git a/machines/truite/hardware.nix b/machines/truite/hardware.nix index 0936388..110cd7d 100644 --- a/machines/truite/hardware.nix +++ b/machines/truite/hardware.nix @@ -20,5 +20,4 @@ swapDevices = [ ]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } |
