npins: update website

The SSH host key files are already defined in the OpenSSH module, so
there is no need to persist them with impermanence.nix.

agenix/secrets.nix

@@ -21,5 +21,5 @@ in
   map (user: {
     name = "dns/tuxcord.net/${user.name}.tuxcord.net.key.age";
     value.publicKeys = [ tuxcord-ca ] ++ getSSHKeys user.name;
-  }) (builtins.filter (user: user.value.ddns or false) (attrsToList users))
+  }) (builtins.filter (user: user.value.options.ddns or false) (attrsToList users))
 )

lib/default.nix

@@ -3,7 +3,7 @@ rec {
 
   adminSSHKeys = builtins.concatLists (
     map (user: getSSHKeys user.name) (
-      builtins.filter (user: user.value.admin or false) (attrsToList users)
+      builtins.filter (user: user.value.options.admin or false) (attrsToList users)
     )
   );
 

lib/users.nix

@@ -1,19 +1,23 @@
 {
   error = {
     ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDzdpxex2GlFVf5G2qsh3Ixa/XCMjnbq4JSTmAev7WYJ error.nointernet@gmail.com";
-    admin = true;
-    ddns = true;
+    options = {
+      admin = true;
+      ddns = true;
+    };
   };
 
   javalsai = {
     ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDFjavnLqxIzFLIUpUWDOwhlYeoII4Qk1/9e0yWWxD/P";
-    admin = true;
-    ddns = true;
+    options = {
+      admin = true;
+      ddns = true;
+    };
   };
 
   max = {
     ssh = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDxVfJhzPDZ108UjB3Vj/akzlzYn27kyAw29AuYAr7gvG5vrqhLUYYmK8t+ZVWVpc1g6cK7OF1oUn2E5Qfmy6wqyZQXftAZ4OcRS0MB71W1bAcRq3rGe6KQDm8RSEeygX+zO+2Z6zQmVWgPr/I+JFQZ8wiWdP8X8djqTRdhqUD+SR3ZgTcnY3aLmeB/I56rcZQ3lKIeg/pEsyQ8weptlV0rTWamna6Z7Nw48VwWNSI+6EqfW2/4/edm0Ue8jMNqNZ0yx+kHJbudPgZgSR1SiR2rqlEEUaiQJQQV3VdY4DhGm7143ZSKUxyKlfTuQ7qR1zSIg6f5V71A37ik9YiSbBlOZO86swR4qHESoMNf608IuqRt2NdALHwozFPUCu16qnhu5JTk8twSAzrAhOk5zWQj1LYMoQEBhcFSmwir/1gE71NSjYtqXGVAdfkVmZ4uqG5+a1D7H3VXWOqu/j839M045O1ZBY6X3lKDsEJ1Z1+LCl/NojWnvPtJUHYI6+SdQ6k=";
-    admin = true;
+    options.admin = true;
   };
 
   vectorum = {

nixos/users.nix

@@ -11,30 +11,35 @@ let
     "wheel"
   ];
 
-  mkUser = name: uid: admin: {
-    users.users.${name} = {
-      inherit uid;
-      isNormalUser = true;
-      extraGroups = lib.optionals admin adminGroups;
-      openssh.authorizedKeys.keys = self.lib.getSSHKeys name;
-    };
+  mkUser =
+    name: uid: options:
+    let
+      admin = options.admin or false;
+    in
+    {
+      users.users.${name} = {
+        inherit uid;
+        isNormalUser = true;
+        extraGroups = lib.optionals admin adminGroups;
+        openssh.authorizedKeys.keys = self.lib.getSSHKeys name;
+      };
 
-    systemd.slices."user-${builtins.toString uid}".sliceConfig = {
-      CPUQuota = "50%";
-      CPUWeight = "10";
-      IOAccounting = true;
-      IOWeight = "10";
-      MemoryMax = "2G";
-      MemorySwapMax = "1G";
-      TasksMax = "100";
+      systemd.slices."user-${builtins.toString uid}".sliceConfig = {
+        CPUQuota = "50%";
+        CPUWeight = "10";
+        IOAccounting = true;
+        IOWeight = "10";
+        MemoryMax = "2G";
+        MemorySwapMax = "1G";
+        TasksMax = "100";
+      };
     };
-  };
 in
 lib.recursiveUpdate
   (builtins.foldl'
     (attrs: user: {
       options = lib.recursiveUpdate attrs.options (
-        mkUser user.name attrs.uid (user.value.admin or false)
+        mkUser user.name attrs.uid (user.value.options or { })
       );
       uid = attrs.uid + 1;
     })