From ccae7987be59b8a30e98f0429bd78479f6f7c7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 4 Oct 2023 14:51:54 +0200 Subject: Move dilion user to private --- flakes/flake.lock | 142 +++++++++++++++++------------------ flakes/private/chatons/flake.lock | 2 +- flakes/private/environment/flake.nix | 16 ---- flakes/private/mail-relay/flake.lock | 2 +- flakes/private/milters/flake.lock | 2 +- flakes/private/monitoring/flake.lock | 2 +- flakes/private/opendmarc/flake.lock | 2 +- flakes/private/ssh/flake.lock | 2 +- flakes/private/system/flake.lock | 2 +- flakes/private/system/flake.nix | 12 +-- 10 files changed, 79 insertions(+), 105 deletions(-) (limited to 'flakes') diff --git a/flakes/flake.lock b/flakes/flake.lock index b3a7696..d1ee7d2 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock @@ -150,7 +150,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-axj8Eo6qOPyh4DOk9cKEKqjpMjX5y5EDSB8Myxdm5jg=", + "narHash": "sha256-5xTmX1Pq80U/1q27508T1SVJDQXAdmTHGhVyA7lqnPg=", "path": "../../flakes/private/chatons", "type": "path" }, @@ -165,7 +165,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-axj8Eo6qOPyh4DOk9cKEKqjpMjX5y5EDSB8Myxdm5jg=", + "narHash": "sha256-5xTmX1Pq80U/1q27508T1SVJDQXAdmTHGhVyA7lqnPg=", "path": "../../flakes/private/chatons", "type": "path" }, @@ -545,7 +545,7 @@ "environment": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -557,7 +557,7 @@ "environment_10": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -569,7 +569,7 @@ "environment_11": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -581,7 +581,7 @@ "environment_12": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -593,7 +593,7 @@ "environment_13": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -605,7 +605,7 @@ "environment_14": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -617,7 +617,7 @@ "environment_15": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -629,7 +629,7 @@ "environment_16": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -641,7 +641,7 @@ "environment_17": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -653,7 +653,7 @@ "environment_18": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -665,7 +665,7 @@ "environment_19": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../../flakes/private/environment", "type": "path" }, @@ -677,7 +677,7 @@ "environment_2": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../../flakes/private/environment", "type": "path" }, @@ -689,7 +689,7 @@ "environment_20": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -701,7 +701,7 @@ "environment_21": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -713,7 +713,7 @@ "environment_22": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -725,7 +725,7 @@ "environment_23": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../../flakes/private/environment", "type": "path" }, @@ -737,7 +737,7 @@ "environment_24": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -749,7 +749,7 @@ "environment_25": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -761,7 +761,7 @@ "environment_26": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -773,7 +773,7 @@ "environment_27": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -785,7 +785,7 @@ "environment_28": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -797,7 +797,7 @@ "environment_29": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -809,7 +809,7 @@ "environment_3": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -821,7 +821,7 @@ "environment_30": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -833,7 +833,7 @@ "environment_31": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -845,7 +845,7 @@ "environment_32": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -857,7 +857,7 @@ "environment_33": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -869,7 +869,7 @@ "environment_4": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -881,7 +881,7 @@ "environment_5": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -893,7 +893,7 @@ "environment_6": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -905,7 +905,7 @@ "environment_7": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -917,7 +917,7 @@ "environment_8": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../../flakes/private/environment", "type": "path" }, @@ -929,7 +929,7 @@ "environment_9": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, @@ -2715,7 +2715,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-9LJl0FUGZEsz5BY5YYzob5n0lz5YgEl6aoIYUkX+M5w=", + "narHash": "sha256-TYEdgBGt7mWEBdXMmuc+lmgRpsOJUlW55Y1atGlcpvU=", "path": "../../flakes/private/mail-relay", "type": "path" }, @@ -2731,7 +2731,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-9LJl0FUGZEsz5BY5YYzob5n0lz5YgEl6aoIYUkX+M5w=", + "narHash": "sha256-TYEdgBGt7mWEBdXMmuc+lmgRpsOJUlW55Y1atGlcpvU=", "path": "../../flakes/private/mail-relay", "type": "path" }, @@ -2824,7 +2824,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-8+5NUGSYepO6Pq3+9C4EaEJJTofaBUKSXJeeCFOQcnA=", + "narHash": "sha256-Q8RIW88dtLmxFy8ziw49PhWjU70fKJ8gO9SjdRr2ySw=", "path": "../../flakes/private/milters", "type": "path" }, @@ -2842,7 +2842,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-wQqciZXrwEBaeiBKJ3KMxx3hw89nlSCxT8tWf0apgHQ=", + "narHash": "sha256-rybO4c9UB9a34Xgoh+ToYz36Dz2OM1sgYxi3m00+W+E=", "path": "../../flakes/private/monitoring", "type": "path" }, @@ -2860,7 +2860,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-wQqciZXrwEBaeiBKJ3KMxx3hw89nlSCxT8tWf0apgHQ=", + "narHash": "sha256-rybO4c9UB9a34Xgoh+ToYz36Dz2OM1sgYxi3m00+W+E=", "path": "../../flakes/private/monitoring", "type": "path" }, @@ -2878,7 +2878,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-wQqciZXrwEBaeiBKJ3KMxx3hw89nlSCxT8tWf0apgHQ=", + "narHash": "sha256-rybO4c9UB9a34Xgoh+ToYz36Dz2OM1sgYxi3m00+W+E=", "path": "../../flakes/private/monitoring", "type": "path" }, @@ -2896,7 +2896,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-wQqciZXrwEBaeiBKJ3KMxx3hw89nlSCxT8tWf0apgHQ=", + "narHash": "sha256-rybO4c9UB9a34Xgoh+ToYz36Dz2OM1sgYxi3m00+W+E=", "path": "../../flakes/private/monitoring", "type": "path" }, @@ -3780,7 +3780,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-RoqVUxsqWI7dkugD9ETuSqCgWx3hd05IszZQCuadiMw=", + "narHash": "sha256-x3YcN91hUnnQGTc9kuvMyNJ1zjQVkMbHTabEKxLDpE8=", "path": "../systems/backup-2", "type": "path" }, @@ -3804,7 +3804,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-+NBoetcPPqbxJA9YLxSzE6TalyRdCfcOzZ6Pf7XUD6w=", + "narHash": "sha256-dF18vHa/Z+HVqcOqVsVvikk9f01mmq0ex0OYXtHd+R0=", "path": "../systems/dilion", "type": "path" }, @@ -3852,7 +3852,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-Z1nu071PUw57bC/DgaynarQKJ0VlXATVxGzH32kfgVQ=", + "narHash": "sha256-tz+Is1XHUyK0sk/g5QZzYOeSF/EliycuPw01aHYskxU=", "path": "../systems/eldiron", "type": "path" }, @@ -3878,7 +3878,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-2my/N6ckOug71V5UE9rsmGOMzv/Tjnq86pd49o3Wx44=", + "narHash": "sha256-8iQ7uQmqBEdJxfJlrUBlgxzMupoqkrQH7gzJm3n0v14=", "path": "../systems/monitoring-1", "type": "path" }, @@ -3903,7 +3903,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-+wFXUwLF5rjPriyUWKUrbwsCkz22u6RJjmzC4R5L2fc=", + "narHash": "sha256-cxC6CQn8xB80DUU3wPTOeciUG+ARzzO0baVk5ZAjAGg=", "path": "../systems/quatresaisons", "type": "path" }, @@ -3923,7 +3923,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-EA2HN0HgDgITj6jzKRjWYdIV4schzytlmM3UT0wFuUQ=", + "narHash": "sha256-6sVhdx5hW455a1A7MJstepn8MGKLN/YzugiNss3tiqc=", "path": "../systems/zoldene", "type": "path" }, @@ -7027,7 +7027,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-sTdenwe4616pSUR51SYGatczdwnDH2syuAG0RchZGVY=", + "narHash": "sha256-C75rGGf2EOkXc04RkzpTkyWOGF3GMZElDyvLSa4MsiI=", "path": "../../flakes/private/opendmarc", "type": "path" }, @@ -7398,7 +7398,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-axj8Eo6qOPyh4DOk9cKEKqjpMjX5y5EDSB8Myxdm5jg=", + "narHash": "sha256-5xTmX1Pq80U/1q27508T1SVJDQXAdmTHGhVyA7lqnPg=", "path": "../../flakes/private/chatons", "type": "path" }, @@ -7410,7 +7410,7 @@ "private-environment": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../../flakes/private/environment", "type": "path" }, @@ -7422,7 +7422,7 @@ "private-environment_2": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../../flakes/private/environment", "type": "path" }, @@ -7441,7 +7441,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-8+5NUGSYepO6Pq3+9C4EaEJJTofaBUKSXJeeCFOQcnA=", + "narHash": "sha256-Q8RIW88dtLmxFy8ziw49PhWjU70fKJ8gO9SjdRr2ySw=", "path": "../../flakes/private/milters", "type": "path" }, @@ -7459,7 +7459,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-wQqciZXrwEBaeiBKJ3KMxx3hw89nlSCxT8tWf0apgHQ=", + "narHash": "sha256-rybO4c9UB9a34Xgoh+ToYz36Dz2OM1sgYxi3m00+W+E=", "path": "../../flakes/private/monitoring", "type": "path" }, @@ -7494,7 +7494,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-sTdenwe4616pSUR51SYGatczdwnDH2syuAG0RchZGVY=", + "narHash": "sha256-C75rGGf2EOkXc04RkzpTkyWOGF3GMZElDyvLSa4MsiI=", "path": "../../flakes/private/opendmarc", "type": "path" }, @@ -7570,7 +7570,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-zTBAHZAowKOG9MUCEkBhOuAdEEgCAMQIQRafgbi0bWw=", + "narHash": "sha256-Xr6wtT00fyC0QhwHb6+nHcwlSPlHBShzPNZFxBaC83Y=", "path": "../../flakes/private/ssh", "type": "path" }, @@ -7589,7 +7589,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-biwf4E+pVKyOync6HNfiAMOsiyc20qbVM4ruqzGxupA=", + "narHash": "sha256-gxXgjqYGC3Nv6g42OOdU1d+HideZ4vXBZbbpBjlKsvg=", "path": "../../flakes/private/system", "type": "path" }, @@ -7608,7 +7608,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-biwf4E+pVKyOync6HNfiAMOsiyc20qbVM4ruqzGxupA=", + "narHash": "sha256-gxXgjqYGC3Nv6g42OOdU1d+HideZ4vXBZbbpBjlKsvg=", "path": "../../flakes/private/system", "type": "path" }, @@ -8304,7 +8304,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-axj8Eo6qOPyh4DOk9cKEKqjpMjX5y5EDSB8Myxdm5jg=", + "narHash": "sha256-5xTmX1Pq80U/1q27508T1SVJDQXAdmTHGhVyA7lqnPg=", "path": "./private/chatons", "type": "path" }, @@ -8316,7 +8316,7 @@ "s-private-environment": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "./private/environment", "type": "path" }, @@ -8332,7 +8332,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-9LJl0FUGZEsz5BY5YYzob5n0lz5YgEl6aoIYUkX+M5w=", + "narHash": "sha256-TYEdgBGt7mWEBdXMmuc+lmgRpsOJUlW55Y1atGlcpvU=", "path": "./private/mail-relay", "type": "path" }, @@ -8351,7 +8351,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-8+5NUGSYepO6Pq3+9C4EaEJJTofaBUKSXJeeCFOQcnA=", + "narHash": "sha256-Q8RIW88dtLmxFy8ziw49PhWjU70fKJ8gO9SjdRr2ySw=", "path": "./private/milters", "type": "path" }, @@ -8369,7 +8369,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-wQqciZXrwEBaeiBKJ3KMxx3hw89nlSCxT8tWf0apgHQ=", + "narHash": "sha256-rybO4c9UB9a34Xgoh+ToYz36Dz2OM1sgYxi3m00+W+E=", "path": "./private/monitoring", "type": "path" }, @@ -8404,7 +8404,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-sTdenwe4616pSUR51SYGatczdwnDH2syuAG0RchZGVY=", + "narHash": "sha256-C75rGGf2EOkXc04RkzpTkyWOGF3GMZElDyvLSa4MsiI=", "path": "./private/opendmarc", "type": "path" }, @@ -8480,7 +8480,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-zTBAHZAowKOG9MUCEkBhOuAdEEgCAMQIQRafgbi0bWw=", + "narHash": "sha256-Xr6wtT00fyC0QhwHb6+nHcwlSPlHBShzPNZFxBaC83Y=", "path": "./private/ssh", "type": "path" }, @@ -8499,7 +8499,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-biwf4E+pVKyOync6HNfiAMOsiyc20qbVM4ruqzGxupA=", + "narHash": "sha256-gxXgjqYGC3Nv6g42OOdU1d+HideZ4vXBZbbpBjlKsvg=", "path": "./private/system", "type": "path" }, @@ -8970,7 +8970,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-zTBAHZAowKOG9MUCEkBhOuAdEEgCAMQIQRafgbi0bWw=", + "narHash": "sha256-Xr6wtT00fyC0QhwHb6+nHcwlSPlHBShzPNZFxBaC83Y=", "path": "../../flakes/private/ssh", "type": "path" }, @@ -9133,7 +9133,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-biwf4E+pVKyOync6HNfiAMOsiyc20qbVM4ruqzGxupA=", + "narHash": "sha256-gxXgjqYGC3Nv6g42OOdU1d+HideZ4vXBZbbpBjlKsvg=", "path": "../../flakes/private/system", "type": "path" }, @@ -9152,7 +9152,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-biwf4E+pVKyOync6HNfiAMOsiyc20qbVM4ruqzGxupA=", + "narHash": "sha256-gxXgjqYGC3Nv6g42OOdU1d+HideZ4vXBZbbpBjlKsvg=", "path": "../../flakes/private/system", "type": "path" }, @@ -9171,7 +9171,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-biwf4E+pVKyOync6HNfiAMOsiyc20qbVM4ruqzGxupA=", + "narHash": "sha256-gxXgjqYGC3Nv6g42OOdU1d+HideZ4vXBZbbpBjlKsvg=", "path": "../../flakes/private/system", "type": "path" }, @@ -9190,7 +9190,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-biwf4E+pVKyOync6HNfiAMOsiyc20qbVM4ruqzGxupA=", + "narHash": "sha256-gxXgjqYGC3Nv6g42OOdU1d+HideZ4vXBZbbpBjlKsvg=", "path": "../../flakes/private/system", "type": "path" }, 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 @@ "environment": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, 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 @@ ''; }; isVm = mkEnableOption "The host is a vm"; - users = mkOption { - type = unspecified; - default = pkgs: []; - description = '' - Sublist of users from realUsers. Function that takes pkgs as - argument and gives an array as a result - ''; - }; emails = mkOption { default = []; description = "List of e-mails that the server can be a sender of"; @@ -345,14 +337,6 @@ }; }; }; - realUsers = mkOption { - description = '' - Attrset of function taking pkgs as argument. - Real users settings, should provide a subattr of users.users. - with at least: name, (hashed)Password, shell - ''; - type = attrsOf unspecified; - }; users = mkOption { description = "System and regular users uid/gid"; 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 @@ "environment": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, 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 @@ "environment": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, 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 @@ "environment": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, 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 @@ "environment": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, 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 @@ "environment": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, 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 @@ "environment": { "locked": { "lastModified": 1, - "narHash": "sha256-SukW363CI7QkbzoWtogiuh1IOUQNRZgj7fwxtIqU9Us=", + "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", "path": "../environment", "type": "path" }, 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 @@ ''; users.groups.acme.gid = myuids.lib.gids.acme; - users.users = - builtins.listToAttrs (map (x: lib.attrsets.nameValuePair x.name ({ - isNormalUser = true; - home = "/home/${x.name}"; - createHome = true; - linger = true; - # Enable in latest unstable homeMode = "755"; - } // x)) (config.hostEnv.users pkgs)) - // { - acme.uid = myuids.lib.uids.acme; - }; + users.users.acme.uid = myuids.lib.uids.acme; environment.systemPackages = [ pkgs.inetutils pkgs.htop -- cgit v1.2.3