summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-12-26 10:44:54 +0100
committerlassulus <lass@aidsballs.de>2015-12-26 10:44:54 +0100
commit6733fa66b46f0d00b7016a92f4ef093ccb7b7a2b (patch)
tree13bca60f67491263bf027b2b1f09cf5b14b1c9c0 /tv/2configs
parentf55b44eb7cffbe0934785afd3a36001ba0713ad1 (diff)
parent763f0db52ad45eef6e09d7982cd0f6cd898857e3 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/charybdis.nix4
-rw-r--r--tv/2configs/pulse.nix8
2 files changed, 5 insertions, 7 deletions
diff --git a/tv/2configs/charybdis.nix b/tv/2configs/charybdis.nix
index 80c6f7c4a..f9ab3da68 100644
--- a/tv/2configs/charybdis.nix
+++ b/tv/2configs/charybdis.nix
@@ -72,9 +72,9 @@ let
};
};
- user = {
+ user = rec {
name = "charybdis";
- uid = 3748224544; # genid charybdis
+ uid = genid name;
};
configFile = toFile "charybdis-ircd.conf" ''
diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix
index 0ddc52789..3db3532d5 100644
--- a/tv/2configs/pulse.nix
+++ b/tv/2configs/pulse.nix
@@ -69,12 +69,10 @@ in
};
};
- users = let
- id = 3768151709; # genid pulse
- in {
- groups.pulse.gid = id;
+ users = {
+ groups.pulse.gid = config.users.users.pulse.uid;
users.pulse = {
- uid = id;
+ uid = genid "pulse";
group = "pulse";
extraGroups = [ "audio" ];
home = "${runDir}/home";