refactor: switch from modules to import arrays

2025-10-22 01:22:05 +11:00 · 2025-10-22 01:22:05 +11:00 · 41eaa38d31
commit 41eaa38d31
parent d893750c09
75 changed files with 1870 additions and 2541 deletions
--- a/flake.nix
+++ b/flake.nix
@ -39,6 +39,9 @@
          userName ? "will",
          system ? "x86_64-linux",
        }:
+        let
+          util = import ./util.nix;
+        in
        nixpkgs.lib.nixosSystem {
          modules = [
            ./hosts/${hostName}/configuration.nix
@ -52,8 +55,7 @@
                ];
                backupFileExtension = "backup";
                extraSpecialArgs = {
-                  inherit userName;
-                  inherit hostName;
+                  inherit userName hostName util;
                };
                useGlobalPkgs = true;
                useUserPackages = true;
@ -61,10 +63,13 @@
            }
          ];
          specialArgs = {
-            inherit inputs;
-            inherit hostName;
-            inherit userName;
-            inherit system;
+            inherit
+              inputs
+              hostName
+              userName
+              system
+              util
+              ;
          };
          inherit system;
        };