factorize passing of modules

3 files changed, 19 insertions, 21 deletions

diff --git a/flake.lock b/flake.lock
index f05a33f..99f23f7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -14,9 +14,8 @@
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
+        "id": "home-manager",
+        "type": "indirect"
       }
     },
     "my-nixpkgs": {
@@ -24,8 +23,8 @@
         "nur": "nur"
       },
       "locked": {
-        "lastModified": 1676820683,
-        "narHash": "sha256-Duxvn4bUTG0n03KO3cxvqThtEk1e6FfLdGXJLKrOV8c=",
+        "lastModified": 1676844532,
+        "narHash": "sha256-rohBHku9GTPvS3F1JxaA4ZFw1zZdes/s3hKrioIQyDo=",
         "type": "git",
         "url": "file:///home/qaristote/code/nix/my-nixpkgs"
       },
@@ -44,10 +43,8 @@
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
+        "id": "nixos-hardware",
+        "type": "indirect"
       }
     },
     "nixpkgs": {
@@ -82,11 +79,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1676817898,
-        "narHash": "sha256-1yrNakg2qtOI9v/IFk+cYPEYtuoOQTsRvjG88tlhAVo=",
+        "lastModified": 1677012355,
+        "narHash": "sha256-ccE3BQPMA0R5fR3jJRX/CUa4FmcLSoK5RvUreTpT/HY=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "241b6ab4dccc162906a265e421a537847b74e8e9",
+        "rev": "6f8988a961627ad6a591095d0a360d51dc8098d8",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 6ad632a..4bc26a3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,18 +9,19 @@
       overlays-module = { ... }: {
         nixpkgs.overlays = [ my-nixpkgs.overlays.personal ];
       };
+      homeModules = [ overlays-module my-nixpkgs.homeModules.personal ./home ];
+      nixosModules =
+        [ overlays-module my-nixpkgs.nixosModules.personal ./nixos ];
     in {
       nixosConfigurations.latitude-7490 = nixpkgs.lib.nixosSystem {
         inherit system;
-        specialArgs = {
-          inherit nixos-hardware home-manager;
-          home.qaristote = import ./home;
-        };
-        modules = [ overlays-module my-nixpkgs.nixosModules.personal ./nixos ];
+        specialArgs = { inherit nixos-hardware home-manager homeModules; };
+        modules = nixosModules;
       };
+
       homeConfigurations.qaristote = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages."${system}";
-        modules = [ overlays-module ./home ];
+        modules = homeModules;
       };
     };
 }
diff --git a/nixos/users.nix b/nixos/users.nix
index b7512e8..0b28011 100644
--- a/nixos/users.nix
+++ b/nixos/users.nix
@@ -1,4 +1,4 @@
-{ home, home-manager, ... }:
+{ home-manager, homeModules, ... }:
 
 {
   imports = [ home-manager.nixosModules.home-manager ];
@@ -9,8 +9,8 @@
   };
 
   home-manager = {
-    users.qaristote = home.qaristote;
-    useGlobalPkgs = false;
+    users.qaristote = { ... }: { imports = homeModules; };
+    useGlobalPkgs = true;
     useUserPackages = true;
   };
 }