Finish cleanup for new flake syntax

6 files changed, 56 insertions, 16 deletions

diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index 7279a9f..0098090 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, inputs, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "zfs" ];
     kernel.sysctl = {
@@ -209,6 +209,17 @@
     };
   };
 
+  nixpkgs = {
+    config.allowUnfree = true;
+    hostPlatform = "x86_64-linux";
+    overlays = [
+      inputs.nvidia-patch.overlays.default
+      outputs.overlays.additions
+      outputs.overlays.modifications
+      outputs.overlays.stable-packages
+    ];
+  };
+
   services.openssh.settings.X11Forwarding = true;
   services.xserver.videoDrivers = [ "nvidia" ];
 
diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix
index 6dc6542..5a4c958 100644
--- a/hosts/arrakis/hardware-configuration.nix
+++ b/hosts/arrakis/hardware-configuration.nix
@@ -88,17 +88,6 @@
     { device = "/dev/disk/by-label/swap2"; }
   ];
 
-  nixpkgs = {
-    config.allowUnfree = true;
-    hostPlatform = "x86_64-linux";
-    overlays = [
-      inputs.nvidia-patch.overlays.default
-      outputs.overlays.additions
-      outputs.overlays.modifications
-      outputs.overlays.stable-packages
-    ];
-  };
-
   hardware = {
     bluetooth.enable = true;
     graphics = {
diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix
index 7eb3c62..c39f66a 100644
--- a/hosts/darkstar/default.nix
+++ b/hosts/darkstar/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, inputs, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "zfs" ];
     kernel.sysctl = {
@@ -80,6 +80,16 @@
     #};
   };
 
+  nixpkgs = {
+    config.allowUnfree = true;
+    hostPlatform = "x86_64-linux";
+    overlays = [
+      outputs.overlays.additions
+      outputs.overlays.modifications
+      outputs.overlays.stable-packages
+    ];
+  };
+
   sops = {
     age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
     defaultSopsFile = ../secrets/darkstar.yaml;
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index f35e36b..cf11b5e 100644
--- a/hosts/ginaz/default.nix
+++ b/hosts/ginaz/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, inputs, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "amdgpu" "zfs" ];
     kernelPackages = pkgs.linuxPackages_6_10;
@@ -43,6 +43,16 @@
     nftables.enable = true;
   };
 
+  nixpkgs = {
+    config.allowUnfree = true;
+    hostPlatform = "x86_64-linux";
+    overlays = [
+      outputs.overlays.additions
+      outputs.overlays.modifications
+      outputs.overlays.stable-packages
+    ];
+  };
+
   services.openssh.settings.X11Forwarding = true;
   services.xserver.videoDrivers = [ "amdgpu" ];
 
diff --git a/hosts/kaitain/default.nix b/hosts/kaitain/default.nix
index e6b264a..eb44243 100644
--- a/hosts/kaitain/default.nix
+++ b/hosts/kaitain/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: {
+{ config, inputs, lib, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "zfs" ];
     kernelPackages = pkgs.linuxPackages_6_10;
@@ -36,6 +36,16 @@
     nftables.enable = true;
   };
 
+  nixpkgs = {
+    config.allowUnfree = true;
+    hostPlatform = "x86_64-linux";
+    overlays = [
+      outputs.overlays.additions
+      outputs.overlays.modifications
+      outputs.overlays.stable-packages
+    ];
+  };
+
   services.openssh.openFirewall = false;
   services.xserver.videoDrivers = lib.mkForce [ "vmware" "virtualbox" "modesetting" ];
 
diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index 865eef7..c476b60 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: {
+{ config, inputs, lib, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "zfs" ];
     kernelPackages = pkgs.linuxPackages_6_10;
@@ -33,6 +33,16 @@
     nftables.enable = true;
   };
 
+  nixpkgs = {
+    config.allowUnfree = true;
+    hostPlatform = "x86_64-linux";
+    overlays = [
+      outputs.overlays.additions
+      outputs.overlays.modifications
+      outputs.overlays.stable-packages
+    ];
+  };
+
   services.openssh.openFirewall = false;
   services.xserver.videoDrivers = lib.mkForce [ "vmware" "virtualbox" "modesetting" ];