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 @@
     "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.<name>
-              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