colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

users: make the service manager partly configurable

Browse Source
This commit is contained in:
Colin
2024-09-23 01:56:24 +00:00
parent a2e709b940
commit 6d0a2d63fc
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/users/default.nix
View File

@@ -153,6 +153,13 @@ let
services to define for this user. services to define for this user.
''; '';
}; };
serviceManager = mkOption {
type = types.nullOr (types.enum [ "s6" ]);
default = "s6";
description = ''
which service manager to plumb `services` into.
'';
};
}; };
userModule = let userModule = let
nixConfig = config; nixConfig = config;

2
modules/users/s6-rc.nix
View File

@@ -325,7 +325,7 @@ in
xdg_runtime_dir = "/run/user/${name}"; xdg_runtime_dir = "/run/user/${name}";
scanDir = mkScanDir "${xdg_runtime_dir}/s6/live" compiled; scanDir = mkScanDir "${xdg_runtime_dir}/s6/live" compiled;
liveDir = mkLiveDir compiled; liveDir = mkLiveDir compiled;
in { in lib.mkIf (config.serviceManager == "s6") {
fs.".config/s6/live".symlink.target = liveDir; fs.".config/s6/live".symlink.target = liveDir;
fs.".config/s6/scandir".symlink.target = scanDir; fs.".config/s6/scandir".symlink.target = scanDir;
fs.".config/s6/compiled".symlink.target = compiled; fs.".config/s6/compiled".symlink.target = compiled;