Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

permown: fix flakify fuckups

Browse Source
This commit is contained in:
tv 2023-07-04 11:33:54 +02:00
parent 0e6c1e2d94
commit 512232b72a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
krebs/3modules/permown.nix
View File

@ -1,4 +1,6 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }: let
slib = import ../../lib/pure.nix { inherit lib; };
in
with lib; { with lib; {
options.krebs.permown = mkOption { options.krebs.permown = mkOption {
@ -16,7 +18,7 @@ with lib; {
group = mkOption { group = mkOption {
apply = x: if x == null then "" else x; apply = x: if x == null then "" else x;
default = null; default = null;
type = types.nullOr types.groupname; type = types.nullOr slib.types.groupname;
}; };
keepGoing = mkOption { keepGoing = mkOption {
default = false; default = false;
@ -28,15 +30,15 @@ with lib; {
''; '';
}; };
owner = mkOption { owner = mkOption {
type = types.username; type = slib.types.username;
}; };
path = mkOption { path = mkOption {
default = config._module.args.name; default = config._module.args.name;
type = types.absolute-pathname; type = slib.types.absolute-pathname;
}; };
umask = mkOption { umask = mkOption {
default = "0027"; default = "0027";
type = types.file-mode; type = slib.types.file-mode;
}; };
}; };
})); }));
@ -48,11 +50,11 @@ with lib; {
system.activationScripts.permown = let system.activationScripts.permown = let
mkdir = plan: /* sh */ '' mkdir = plan: /* sh */ ''
${pkgs.coreutils}/bin/mkdir -p ${shell.escape plan.path} ${pkgs.coreutils}/bin/mkdir -p ${slib.shell.escape plan.path}
''; '';
in concatMapStrings mkdir plans; in concatMapStrings mkdir plans;
systemd.services = genAttrs' plans (plan: let systemd.services = slib.genAttrs' plans (plan: let
continuable = command: continuable = command:
if plan.keepGoing if plan.keepGoing
then /* sh */ "{ ${command}; } || :" then /* sh */ "{ ${command}; } || :"