diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2023-10-04 14:51:54 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2023-10-04 14:57:41 +0200 |
commit | ccae7987be59b8a30e98f0429bd78479f6f7c7bc (patch) | |
tree | 88f1e7978e8911fbc6a34abff3ee7da21c237da8 /flakes/private | |
parent | 3274fe3012a87fce2b2b7e9c34b8928c94b26187 (diff) | |
download | Nix-ccae7987be59b8a30e98f0429bd78479f6f7c7bc.tar.gz Nix-ccae7987be59b8a30e98f0429bd78479f6f7c7bc.tar.zst Nix-ccae7987be59b8a30e98f0429bd78479f6f7c7bc.zip |
Move dilion user to private
Diffstat (limited to 'flakes/private')
-rw-r--r-- | flakes/private/chatons/flake.lock | 2 | ||||
-rw-r--r-- | flakes/private/environment/flake.nix | 16 | ||||
-rw-r--r-- | flakes/private/mail-relay/flake.lock | 2 | ||||
-rw-r--r-- | flakes/private/milters/flake.lock | 2 | ||||
-rw-r--r-- | flakes/private/monitoring/flake.lock | 2 | ||||
-rw-r--r-- | flakes/private/opendmarc/flake.lock | 2 | ||||
-rw-r--r-- | flakes/private/ssh/flake.lock | 2 | ||||
-rw-r--r-- | flakes/private/system/flake.lock | 2 | ||||
-rw-r--r-- | flakes/private/system/flake.nix | 12 |
9 files changed, 8 insertions, 34 deletions
diff --git a/flakes/private/chatons/flake.lock b/flakes/private/chatons/flake.lock index 3f958f9..b931cca 100644 --- a/flakes/private/chatons/flake.lock +++ b/flakes/private/chatons/flake.lock | |||
@@ -3,7 +3,7 @@ | |||
3 | "environment": { | 3 | "environment": { |
4 | "locked": { | 4 | "locked": { |
5 | "lastModified": 1, | 5 | "lastModified": 1, |
6 | "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", | 6 | "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", |
7 | "path": "../environment", | 7 | "path": "../environment", |
8 | "type": "path" | 8 | "type": "path" |
9 | }, | 9 | }, |
diff --git a/flakes/private/environment/flake.nix b/flakes/private/environment/flake.nix index 50df449..4321fa8 100644 --- a/flakes/private/environment/flake.nix +++ b/flakes/private/environment/flake.nix | |||
@@ -138,14 +138,6 @@ | |||
138 | ''; | 138 | ''; |
139 | }; | 139 | }; |
140 | isVm = mkEnableOption "The host is a vm"; | 140 | isVm = mkEnableOption "The host is a vm"; |
141 | users = mkOption { | ||
142 | type = unspecified; | ||
143 | default = pkgs: []; | ||
144 | description = '' | ||
145 | Sublist of users from realUsers. Function that takes pkgs as | ||
146 | argument and gives an array as a result | ||
147 | ''; | ||
148 | }; | ||
149 | emails = mkOption { | 141 | emails = mkOption { |
150 | default = []; | 142 | default = []; |
151 | description = "List of e-mails that the server can be a sender of"; | 143 | description = "List of e-mails that the server can be a sender of"; |
@@ -345,14 +337,6 @@ | |||
345 | }; | 337 | }; |
346 | }; | 338 | }; |
347 | }; | 339 | }; |
348 | realUsers = mkOption { | ||
349 | description = '' | ||
350 | Attrset of function taking pkgs as argument. | ||
351 | Real users settings, should provide a subattr of users.users.<name> | ||
352 | with at least: name, (hashed)Password, shell | ||
353 | ''; | ||
354 | type = attrsOf unspecified; | ||
355 | }; | ||
356 | users = mkOption { | 340 | users = mkOption { |
357 | description = "System and regular users uid/gid"; | 341 | description = "System and regular users uid/gid"; |
358 | type = attrsOf (submodule { | 342 | type = attrsOf (submodule { |
diff --git a/flakes/private/mail-relay/flake.lock b/flakes/private/mail-relay/flake.lock index ebcc5ed..a36264b 100644 --- a/flakes/private/mail-relay/flake.lock +++ b/flakes/private/mail-relay/flake.lock | |||
@@ -3,7 +3,7 @@ | |||
3 | "environment": { | 3 | "environment": { |
4 | "locked": { | 4 | "locked": { |
5 | "lastModified": 1, | 5 | "lastModified": 1, |
6 | "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", | 6 | "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", |
7 | "path": "../environment", | 7 | "path": "../environment", |
8 | "type": "path" | 8 | "type": "path" |
9 | }, | 9 | }, |
diff --git a/flakes/private/milters/flake.lock b/flakes/private/milters/flake.lock index fc29662..d4770de 100644 --- a/flakes/private/milters/flake.lock +++ b/flakes/private/milters/flake.lock | |||
@@ -3,7 +3,7 @@ | |||
3 | "environment": { | 3 | "environment": { |
4 | "locked": { | 4 | "locked": { |
5 | "lastModified": 1, | 5 | "lastModified": 1, |
6 | "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", | 6 | "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", |
7 | "path": "../environment", | 7 | "path": "../environment", |
8 | "type": "path" | 8 | "type": "path" |
9 | }, | 9 | }, |
diff --git a/flakes/private/monitoring/flake.lock b/flakes/private/monitoring/flake.lock index 80ac0d8..0267ce0 100644 --- a/flakes/private/monitoring/flake.lock +++ b/flakes/private/monitoring/flake.lock | |||
@@ -3,7 +3,7 @@ | |||
3 | "environment": { | 3 | "environment": { |
4 | "locked": { | 4 | "locked": { |
5 | "lastModified": 1, | 5 | "lastModified": 1, |
6 | "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", | 6 | "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", |
7 | "path": "../environment", | 7 | "path": "../environment", |
8 | "type": "path" | 8 | "type": "path" |
9 | }, | 9 | }, |
diff --git a/flakes/private/opendmarc/flake.lock b/flakes/private/opendmarc/flake.lock index 8b0f1fc..ead778a 100644 --- a/flakes/private/opendmarc/flake.lock +++ b/flakes/private/opendmarc/flake.lock | |||
@@ -3,7 +3,7 @@ | |||
3 | "environment": { | 3 | "environment": { |
4 | "locked": { | 4 | "locked": { |
5 | "lastModified": 1, | 5 | "lastModified": 1, |
6 | "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", | 6 | "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", |
7 | "path": "../environment", | 7 | "path": "../environment", |
8 | "type": "path" | 8 | "type": "path" |
9 | }, | 9 | }, |
diff --git a/flakes/private/ssh/flake.lock b/flakes/private/ssh/flake.lock index ebcc5ed..a36264b 100644 --- a/flakes/private/ssh/flake.lock +++ b/flakes/private/ssh/flake.lock | |||
@@ -3,7 +3,7 @@ | |||
3 | "environment": { | 3 | "environment": { |
4 | "locked": { | 4 | "locked": { |
5 | "lastModified": 1, | 5 | "lastModified": 1, |
6 | "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", | 6 | "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", |
7 | "path": "../environment", | 7 | "path": "../environment", |
8 | "type": "path" | 8 | "type": "path" |
9 | }, | 9 | }, |
diff --git a/flakes/private/system/flake.lock b/flakes/private/system/flake.lock index 27bcc99..052217d 100644 --- a/flakes/private/system/flake.lock +++ b/flakes/private/system/flake.lock | |||
@@ -19,7 +19,7 @@ | |||
19 | "environment": { | 19 | "environment": { |
20 | "locked": { | 20 | "locked": { |
21 | "lastModified": 1, | 21 | "lastModified": 1, |
22 | "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", | 22 | "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", |
23 | "path": "../environment", | 23 | "path": "../environment", |
24 | "type": "path" | 24 | "type": "path" |
25 | }, | 25 | }, |
diff --git a/flakes/private/system/flake.nix b/flakes/private/system/flake.nix index 04ebbc7..e40328f 100644 --- a/flakes/private/system/flake.nix +++ b/flakes/private/system/flake.nix | |||
@@ -54,17 +54,7 @@ | |||
54 | ''; | 54 | ''; |
55 | 55 | ||
56 | users.groups.acme.gid = myuids.lib.gids.acme; | 56 | users.groups.acme.gid = myuids.lib.gids.acme; |
57 | users.users = | 57 | users.users.acme.uid = myuids.lib.uids.acme; |
58 | builtins.listToAttrs (map (x: lib.attrsets.nameValuePair x.name ({ | ||
59 | isNormalUser = true; | ||
60 | home = "/home/${x.name}"; | ||
61 | createHome = true; | ||
62 | linger = true; | ||
63 | # Enable in latest unstable homeMode = "755"; | ||
64 | } // x)) (config.hostEnv.users pkgs)) | ||
65 | // { | ||
66 | acme.uid = myuids.lib.uids.acme; | ||
67 | }; | ||
68 | environment.systemPackages = [ | 58 | environment.systemPackages = [ |
69 | pkgs.inetutils | 59 | pkgs.inetutils |
70 | pkgs.htop | 60 | pkgs.htop |