improve home Manager support: profiles/suites, modules, extern, flake…

… outputs
divnix · Mar 14, 2021 · 4e06a53 · 4e06a53
1 parent c012f2f
commit 4e06a53
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 12 deletions.
diff --git a/extern/default.nix b/extern/default.nix
@@ -1,7 +1,4 @@
 { inputs }: with inputs;
-let
-  hmModules = { };
-in
 {
   modules = [
     home.nixosModules.home-manager
@@ -18,9 +15,15 @@ in
 
   # passed to all nixos modules
   specialArgs = {
-    inherit hmModules;
-
     overrideModulesPath = "${override}/nixos/modules";
     hardware = nixos-hardware.nixosModules;
   };
+
+  # added to home-manager
+  userModules = [
+  ];
+
+  # passed to all home-manager modules
+  userSpecialArgs = {
+  };
 }
diff --git a/flake.nix b/flake.nix
@@ -52,6 +52,10 @@
             let moduleList = import ./modules/module-list.nix;
             in lib.pathsToImportedAttrs moduleList;
 
+          homeModules =
+            let moduleList = import ./users/modules/module-list.nix;
+            in lib.pathsToImportedAttrs moduleList;
+
           overlay = import ./pkgs;
           overlays = lib.pathsToImportedAttrs (lib.pathsIn ./overlays);
 

diff --git a/hosts/default.nix b/hosts/default.nix
@@ -29,8 +29,13 @@ let
         };
 
       global = {
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+
+          extraSpecialArgs = extern.userSpecialArgs // { suites = suites.user; };
+          sharedModules = extern.userModules ++ (builtins.attrValues self.homeModules);
+        };
 
         hardware.enableRedistributableFirmware = lib.mkDefault true;
 
@@ -62,7 +67,7 @@ let
       modOverrides
     ] ++ extern.modules;
 
-  specialArgs = extern.specialArgs // { inherit suites; };
+  specialArgs = extern.specialArgs // { suites = suites.system; };
 
   mkHostConfig = hostName:
     let

diff --git a/suites/default.nix b/suites/default.nix
@@ -3,6 +3,7 @@ let
   inherit (lib) dev;
 
   profiles = dev.os.mkProfileAttrs (toString ../profiles);
+  userProfiles = dev.os.mkProfileAttrs (toString ../users/profiles);
   users = dev.os.mkProfileAttrs (toString ../users);
 
   allProfiles =
@@ -17,7 +18,18 @@ let
   suites = with profiles; rec {
     base = [ users.nixos users.root ];
   };
+
+  # available as 'suites' within the home-manager configuration
+  userSuites = with userProfiles; rec {
+    base = [ direnv git ];
+  };
+
 in
-lib.mapAttrs (_: v: dev.os.profileMap v) suites // {
-  inherit allProfiles allUsers;
+{
+  system = lib.mapAttrs (_: v: dev.os.profileMap v) suites // {
+    inherit allProfiles allUsers;
+  };
+  user = lib.mapAttrs (_: v: dev.os.profileMap v) userSuites // {
+    allProfiles = userProfiles;
+  };
 }
diff --git a/users/modules/module-list.nix b/users/modules/module-list.nix
@@ -0,0 +1 @@
+[]
diff --git a/users/nixos/default.nix b/users/nixos/default.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
-  home-manager.users.nixos = {
-    imports = [ ../profiles/git ../profiles/direnv ];
+  home-manager.users.nixos = { suites, ... }: {
+    imports = suites.base;
   };
 
   users.users.nixos = {