From 48a5083a022fa9b0e081f0516dcbfa30878142ec Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Fri, 6 Sep 2024 02:37:34 +0100
Subject: [PATCH] nixpkgs, home-manager: return nixpkgs config to flake.nix

---
 common/default.nix      |  1 -
 common/home-manager.nix | 17 ++++++-----------
 common/nixpkgs.nix      | 14 --------------
 flake.nix               | 19 ++++++++++++++-----
 4 files changed, 20 insertions(+), 31 deletions(-)
 delete mode 100644 common/nixpkgs.nix

diff --git a/common/default.nix b/common/default.nix
index bc3cc10..f6c8c0a 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -5,7 +5,6 @@
     ./environment.nix
     ./home-manager.nix
     ./nginx.nix
-    ./nixpkgs.nix
     ./openssh.nix
     ./security.nix
   ];
diff --git a/common/home-manager.nix b/common/home-manager.nix
index 6740dbc..e4d7106 100644
--- a/common/home-manager.nix
+++ b/common/home-manager.nix
@@ -1,18 +1,13 @@
 { config, lib, pkgs, ... }:
 
 {
-  home-manager = {
-    useUserPackages = true;
-    useGlobalPkgs = true;
+  home-manager.users = {
+    qenya = { config, lib, pkgs, osConfig, ... }: {
+      home.homeDirectory = osConfig.users.users.qenya.home;
 
-    users = {
-      qenya = { config, lib, pkgs, osConfig, ... }: {
-        home.homeDirectory = osConfig.users.users.qenya.home;
-
-        imports = [
-          ../home/qenya
-        ];
-      };
+      imports = [
+        ../home/qenya
+      ];
     };
   };
 }
diff --git a/common/nixpkgs.nix b/common/nixpkgs.nix
deleted file mode 100644
index b11cac9..0000000
--- a/common/nixpkgs.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, lib, pkgs, inputs, ... }:
-
-{
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-      packageOverrides = pkgs: {
-        agenix = inputs.agenix.packages.${config.nixpkgs.hostPlatform.system}.default;
-      };
-    };
-
-    overlays = [ inputs.nur.overlay ];
-  };
-}
diff --git a/flake.nix b/flake.nix
index de114b3..3e5ffdb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,15 +27,24 @@
         nodeNixpkgs = {
           kalessin = import nixpkgs { system = "aarch64-linux"; }; # TODO: this should be generated from the host config somehow
         };
-        specialArgs = {
-          inherit inputs;
-        };
       };
 
-      defaults = { name, nodes, ... }: {
+      defaults = { name, nodes, config, ... }: {
         networking.hostName = name;
 
         nix.settings.experimental-features = "nix-command flakes";
+        nix.nixPath = [ "nixpkgs=flake:nixpkgs" ];
+        nixpkgs.config.allowUnfree = true;
+
+        nixpkgs.config.packageOverrides = pkgs: {
+          agenix = inputs.agenix.packages.${config.nixpkgs.hostPlatform.system}.default;
+        };
+        nixpkgs.overlays = [ inputs.nur.overlay ];
+
+        home-manager = {
+          useUserPackages = true;
+          useGlobalPkgs = true;
+        };
 
         imports = [
           home-manager.nixosModules.home-manager
@@ -47,7 +56,7 @@
         ];
       };
 
-      kilgharrah.imports = [ ./hosts/kilgharrah ] ;
+      kilgharrah.imports = [ ./hosts/kilgharrah ];
       tohru.imports = [ ./hosts/tohru ];
 
       yevaud = { name, nodes, ... }: {