henrov/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regenerated

Browse Source
This commit is contained in:
Henro Veijer
2026-03-27 14:49:07 +00:00
parent cb76d9d397
commit 16ff804437
3 changed files with 330 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.html
+310 -304
View File
File diff suppressed because it is too large Load Diff
Droidnix/README.org
+10 -4
View File
@@ -142,12 +142,18 @@ let
allModules = hostModules.imports ++ globalUsers.imports; allModules = hostModules.imports ++ globalUsers.imports;
######################################################### #########################################################
# Merge all _module.args.hmUsers from your modules # Merge all _module.args.hmUsers from modules safely
######################################################### #########################################################
mergedHmUsers = lib.mkMerge (map (m: if builtins.hasAttr "args" m && builtins.hasAttr "hmUsers" m.args then m.args.hmUsers else {}) allModules); mergedHmUsers = lib.mkMerge (map (m:
if builtins.hasAttr "args" m
&& builtins.hasAttr "hmUsers" m.args
&& builtins.typeOf m.args.hmUsers == "attrset"
then m.args.hmUsers
else {}
) allModules);
######################################################### #########################################################
# Add single activation to ensure all parent dirs exist # Add activation to ensure all parent directories exist
######################################################### #########################################################
mergedHmUsersWithDirs = lib.mapAttrs (_: userCfg: userCfg // { mergedHmUsersWithDirs = lib.mapAttrs (_: userCfg: userCfg // {
home.activation.ensureDirs = lib.hm.dag.entryAfter ["writeBoundary"] (let home.activation.ensureDirs = lib.hm.dag.entryAfter ["writeBoundary"] (let
@@ -184,7 +190,7 @@ in
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# Pass the merged user definitions with automatic dir creation # Apply merged users with automatic directory creation
home-manager.users = mergedHmUsersWithDirs; home-manager.users = mergedHmUsersWithDirs;
################################# #################################
Droidnix/generated/hosts/traveldroid/host.nix
+10 -4
View File
@@ -12,12 +12,18 @@ let
allModules = hostModules.imports ++ globalUsers.imports; allModules = hostModules.imports ++ globalUsers.imports;
######################################################### #########################################################
# Merge all _module.args.hmUsers from your modules # Merge all _module.args.hmUsers from modules safely
######################################################### #########################################################
mergedHmUsers = lib.mkMerge (map (m: if builtins.hasAttr "args" m && builtins.hasAttr "hmUsers" m.args then m.args.hmUsers else {}) allModules); mergedHmUsers = lib.mkMerge (map (m:
if builtins.hasAttr "args" m
&& builtins.hasAttr "hmUsers" m.args
&& builtins.typeOf m.args.hmUsers == "attrset"
then m.args.hmUsers
else {}
) allModules);
######################################################### #########################################################
# Add single activation to ensure all parent dirs exist # Add activation to ensure all parent directories exist
######################################################### #########################################################
mergedHmUsersWithDirs = lib.mapAttrs (_: userCfg: userCfg // { mergedHmUsersWithDirs = lib.mapAttrs (_: userCfg: userCfg // {
home.activation.ensureDirs = lib.hm.dag.entryAfter ["writeBoundary"] (let home.activation.ensureDirs = lib.hm.dag.entryAfter ["writeBoundary"] (let
@@ -54,7 +60,7 @@ in
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# Pass the merged user definitions with automatic dir creation # Apply merged users with automatic directory creation
home-manager.users = mergedHmUsersWithDirs; home-manager.users = mergedHmUsersWithDirs;
################################# #################################