nix: apply shared home config to reserved aid

Signed-off-by: Ophestra <cat@gensokyo.uk>
2025-01-23 20:48:04 +09:00 · 2025-01-23 20:48:04 +09:00 · 96d5d8a396
commit 96d5d8a396
parent 8a00a83c71
1 changed files with 14 additions and 11 deletions
--- a/nixos.nix
+++ b/nixos.nix
@ -204,17 +204,20 @@ in

        users = foldlAttrs (
          acc: _: fid:
-          mergeAttrsList (
-            # aid 0 is reserved
-            imap1 (aid: app: {
-              ${getsubname fid aid} = mkMerge [
-                (cfg.home-manager (getsubname fid aid) (getsubuid fid aid))
-                app.extraConfig
-                { home.packages = app.packages; }
-              ];
-            }) cfg.apps
-          )
-          // acc
+          mkMerge [
+            (mergeAttrsList (
+              # aid 0 is reserved
+              imap1 (aid: app: {
+                ${getsubname fid aid} = mkMerge [
+                  (cfg.home-manager (getsubname fid aid) (getsubuid fid aid))
+                  app.extraConfig
+                  { home.packages = app.packages; }
+                ];
+              }) cfg.apps
+            ))
+            { ${getsubname fid 0} = cfg.home-manager (getsubname fid 0) (getsubuid fid 0); }
+            acc
+          ]
        ) privPackages cfg.users;
      };