flake

commit 018a7b8e8839730a36cf49e6096f255dea9f3e7a
parent 11e27a4aa984c30e287e0e737fe332301b400e31
Author: Francesco Saccone <francesco@francescosaccone.com>
Date:   Mon, 14 Apr 2025 15:38:50 +0200

refactor: remove make-home-modules lib function and inline its calls

Signed-off-by: Francesco Saccone <francesco@francescosaccone.com>

Diffstat:
M
flake.nix
 | 
35
++++++++++++++++++++++++++++++-----
D
lib/make-home-modules.nix
 | 
32
--------------------------------

2 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -54,10 +54,6 @@
             inherit (inputs) nixpkgs;
             inherit inputs;
           };
-          makeHomeModules = import ./lib/make-home-modules.nix {
-            inherit (inputs) home-manager;
-            inherit inputs;
-          };
           getPkgs = import ./lib/get-pkgs.nix {
             inherit (inputs) nixpkgs;
             inherit inputs;
@@ -94,7 +90,36 @@
 
       nixosConfigurations = {
         "laptop" = lib.makeHost "laptop" {
-          additionalModules = lib.makeHomeModules "francesco";
+          additionalModules = [
+            inputs.home-manager.nixosModules.home-manager
+            {
+              imports = [
+                ./homes/francesco/user
+              ];
+
+              home-manager = {
+                useGlobalPkgs = true;
+                useUserPackages = true;
+                backupFileExtension = "bkp";
+
+                extraSpecialArgs = {
+                  inherit inputs;
+                };
+
+                users.francesco =
+                  { ... }:
+                  {
+                    imports = [
+                      ./homes/francesco/home
+                      ./homes/common
+                      ./modules/home
+                    ];
+
+                    home.stateVersion = "25.05";
+                  };
+              };
+            }
+          ];
         };
         "git-server" = lib.makeHost "git-server" {
           additionalModules = [
diff --git a/lib/make-home-modules.nix b/lib/make-home-modules.nix
@@ -1,32 +0,0 @@
-{ home-manager, inputs }:
-user: [
-  home-manager.nixosModules.home-manager
-  {
-    imports = [
-      ../homes/${user}/user
-      (../homes + "/${user}/user")
-    ];
-
-    home-manager = {
-      useGlobalPkgs = true;
-      useUserPackages = true;
-      backupFileExtension = "bkp";
-
-      extraSpecialArgs = {
-        inherit inputs;
-      };
-
-      users.${user} =
-        { ... }:
-        {
-          imports = [
-            (../homes + "/${user}/home")
-            ../homes/common
-            ../modules/home
-          ];
-
-          home.stateVersion = "25.05";
-        };
-    };
-  }
-]