Regenerated
This commit is contained in:
+328
-310
File diff suppressed because it is too large
Load Diff
+28
-10
@@ -141,19 +141,35 @@ let
|
|||||||
|
|
||||||
allModules = hostModules.imports ++ globalUsers.imports;
|
allModules = hostModules.imports ++ globalUsers.imports;
|
||||||
|
|
||||||
|
#########################################################
|
||||||
|
# Merge all _module.args.hmUsers from your modules
|
||||||
|
#########################################################
|
||||||
|
mergedHmUsers = lib.mkMerge (map (_: _.args?.hmUsers or {}) allModules);
|
||||||
|
|
||||||
|
#########################################################
|
||||||
|
# Add single activation to ensure all parent dirs exist
|
||||||
|
#########################################################
|
||||||
|
mergedHmUsersWithDirs = lib.mapAttrs (_: userCfg: userCfg // {
|
||||||
|
home.activation.ensureDirs = lib.hm.dag.entryAfter ["writeBoundary"] (let
|
||||||
|
ensureDirs = files: lib.mapAttrs (_: path: ''
|
||||||
|
mkdir -p $(dirname $HOME/${path})
|
||||||
|
'') files;
|
||||||
|
in
|
||||||
|
ensureDirs (builtins.attrNames (userCfg.home.file or {}))
|
||||||
|
);
|
||||||
|
}) mergedHmUsers;
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
#################################
|
#################################
|
||||||
# Core system config
|
# Core system config
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
networking.hostName = hostname;
|
networking.hostName = hostname;
|
||||||
system.stateVersion = "26.05";
|
system.stateVersion = "26.05";
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
# Imports
|
# Imports
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
imports =
|
imports =
|
||||||
[ ../../../generated/users/henrov.nix
|
[ ../../../generated/users/henrov.nix
|
||||||
./boot.nix
|
./boot.nix
|
||||||
@@ -165,19 +181,21 @@ in
|
|||||||
#################################
|
#################################
|
||||||
# Home Manager integration
|
# Home Manager integration
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
|
|
||||||
# Install dconf for the system/user
|
# Pass the merged user definitions with automatic dir creation
|
||||||
environment.systemPackages = [
|
home-manager.users = mergedHmUsersWithDirs;
|
||||||
pkgs.dconf
|
|
||||||
];
|
|
||||||
|
|
||||||
# Ensure Home Manager writes dconf safely
|
#################################
|
||||||
programs.dconf.enable = true;
|
# System packages & programs
|
||||||
|
#################################
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.dconf
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.dconf.enable = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
** =generated/hosts/traveldroid/hardware-configuration.nix=
|
** =generated/hosts/traveldroid/hardware-configuration.nix=
|
||||||
|
|||||||
@@ -11,19 +11,35 @@ let
|
|||||||
|
|
||||||
allModules = hostModules.imports ++ globalUsers.imports;
|
allModules = hostModules.imports ++ globalUsers.imports;
|
||||||
|
|
||||||
|
#########################################################
|
||||||
|
# Merge all _module.args.hmUsers from your modules
|
||||||
|
#########################################################
|
||||||
|
mergedHmUsers = lib.mkMerge (map (_: _.args?.hmUsers or {}) allModules);
|
||||||
|
|
||||||
|
#########################################################
|
||||||
|
# Add single activation to ensure all parent dirs exist
|
||||||
|
#########################################################
|
||||||
|
mergedHmUsersWithDirs = lib.mapAttrs (_: userCfg: userCfg // {
|
||||||
|
home.activation.ensureDirs = lib.hm.dag.entryAfter ["writeBoundary"] (let
|
||||||
|
ensureDirs = files: lib.mapAttrs (_: path: ''
|
||||||
|
mkdir -p $(dirname $HOME/${path})
|
||||||
|
'') files;
|
||||||
|
in
|
||||||
|
ensureDirs (builtins.attrNames (userCfg.home.file or {}))
|
||||||
|
);
|
||||||
|
}) mergedHmUsers;
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
#################################
|
#################################
|
||||||
# Core system config
|
# Core system config
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
networking.hostName = hostname;
|
networking.hostName = hostname;
|
||||||
system.stateVersion = "26.05";
|
system.stateVersion = "26.05";
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
# Imports
|
# Imports
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
imports =
|
imports =
|
||||||
[ ../../../generated/users/henrov.nix
|
[ ../../../generated/users/henrov.nix
|
||||||
./boot.nix
|
./boot.nix
|
||||||
@@ -35,15 +51,18 @@ in
|
|||||||
#################################
|
#################################
|
||||||
# Home Manager integration
|
# Home Manager integration
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
|
|
||||||
# Install dconf for the system/user
|
# Pass the merged user definitions with automatic dir creation
|
||||||
environment.systemPackages = [
|
home-manager.users = mergedHmUsersWithDirs;
|
||||||
pkgs.dconf
|
|
||||||
];
|
|
||||||
|
|
||||||
# Ensure Home Manager writes dconf safely
|
#################################
|
||||||
programs.dconf.enable = true;
|
# System packages & programs
|
||||||
|
#################################
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.dconf
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.dconf.enable = true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user