Regenerated
This commit is contained in:
+381
-373
File diff suppressed because it is too large
Load Diff
+13
-5
@@ -2032,17 +2032,25 @@ in
|
|||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
environment.sessionVariables = lib.genAttrs cfg.directories (
|
environment.sessionVariables = lib.genAttrs cfg.directories (
|
||||||
dirName: dirValue: "XDG_${builtins.toUpper dirName}_DIR" -> "${config.xdg.dataHome or "/home/${config.defaultUser or \"henrov\"}"}/${dirValue}"
|
dirName: dirValue:
|
||||||
|
let
|
||||||
|
dirUpper = builtins.toUpper dirName;
|
||||||
|
dataHome = config.xdg.dataHome or ("/home/" + (config.defaultUser or "henrov"));
|
||||||
|
in
|
||||||
|
"XDG_${dirUpper}_DIR" -> "${dataHome}/${dirValue}"
|
||||||
);
|
);
|
||||||
|
|
||||||
system.activationScripts.xdgUserDirs = ''
|
system.activationScripts.xdgUserDirs = let
|
||||||
mkdir -p ${toString (
|
dataHome = config.xdg.dataHome or ("/home/" + (config.defaultUser or "henrov"));
|
||||||
|
userName = builtins.elemAt (builtins.attrNames config.users.users) 0 or "henrov";
|
||||||
|
in ''
|
||||||
|
mkdir -p ${builtins.toJSON (
|
||||||
builtins.attrValues (
|
builtins.attrValues (
|
||||||
builtins.mapAttrs (dirName: dirValue: "${config.xdg.dataHome or "/home/${config.defaultUser or \"henrov\"}"}/${dirValue}")
|
builtins.mapAttrs (dirName: dirValue: "${dataHome}/${dirValue}")
|
||||||
cfg.directories
|
cfg.directories
|
||||||
)
|
)
|
||||||
)}
|
)}
|
||||||
chown -R ${toString (config.users.users.${config.defaultUser or "henrov"}.name or "henrov")}: "${config.xdg.dataHome or "/home/${config.defaultUser or \"henrov\"}"}"
|
chown -R ${userName}: "${dataHome}"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,17 +29,25 @@ in
|
|||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
environment.sessionVariables = lib.genAttrs cfg.directories (
|
environment.sessionVariables = lib.genAttrs cfg.directories (
|
||||||
dirName: dirValue: "XDG_${builtins.toUpper dirName}_DIR" -> "${config.xdg.dataHome or "/home/${config.defaultUser or \"henrov\"}"}/${dirValue}"
|
dirName: dirValue:
|
||||||
|
let
|
||||||
|
dirUpper = builtins.toUpper dirName;
|
||||||
|
dataHome = config.xdg.dataHome or ("/home/" + (config.defaultUser or "henrov"));
|
||||||
|
in
|
||||||
|
"XDG_${dirUpper}_DIR" -> "${dataHome}/${dirValue}"
|
||||||
);
|
);
|
||||||
|
|
||||||
system.activationScripts.xdgUserDirs = ''
|
system.activationScripts.xdgUserDirs = let
|
||||||
mkdir -p ${toString (
|
dataHome = config.xdg.dataHome or ("/home/" + (config.defaultUser or "henrov"));
|
||||||
|
userName = builtins.elemAt (builtins.attrNames config.users.users) 0 or "henrov";
|
||||||
|
in ''
|
||||||
|
mkdir -p ${builtins.toJSON (
|
||||||
builtins.attrValues (
|
builtins.attrValues (
|
||||||
builtins.mapAttrs (dirName: dirValue: "${config.xdg.dataHome or "/home/${config.defaultUser or \"henrov\"}"}/${dirValue}")
|
builtins.mapAttrs (dirName: dirValue: "${dataHome}/${dirValue}")
|
||||||
cfg.directories
|
cfg.directories
|
||||||
)
|
)
|
||||||
)}
|
)}
|
||||||
chown -R ${toString (config.users.users.${config.defaultUser or "henrov"}.name or "henrov")}: "${config.xdg.dataHome or "/home/${config.defaultUser or \"henrov\"}"}"
|
chown -R ${userName}: "${dataHome}"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user