1 files changed, 10 insertions, 13 deletions

diff --git a/bragi.nix b/bragi.nix
index 063aff06..64d8ed2c 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -8,6 +8,7 @@ in {
       ./bragi-hw.nix
       ./customized/autofs.nix
       ./custom/zsh.nix
+      ./users.nix
     ];
 
   boot.loader.grub.enable = true;
@@ -136,19 +137,6 @@ in {
     group = "audio";
   };
 
-  users.extraUsers.gkleen = {
-    name = "gkleen";
-    isNormalUser = true;
-    uid = 1000;
-    createHome = true;
-    home = "/home/gkleen";
-    shell = "${pkgs.zsh}/bin/zsh";
-    openssh.authorizedKeys.keys = [ "ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBABVMu+0txXdxdTSY8POAYVXbuOEDW6VxJzaYwQljc9kzM63VUZuE606R0g2ZGr9A+Gk6qO6fpCiq4SM+1Yygz5yHgGlbO750TOGaTe6KSGw+u3miaeDviejmxTqetGmiJe7BTLRAbYHjRgD5SkK/Ovos0cDSyOfZ5aha/ehox+proQKGA== gkleen@cathy"
-                                  ];
-    extraGroups = [ "wheel" "audio" ];
-    hashedPassword = "$6$MBq4kwM68$Eg8O6m76mM2905VppNZO67J3EHqJVBuIWQkz.MFFa7afVQKhGuSSYHl50WkkFYXHEY5MIM7IjWYZ0UJwq2IDJ0";
-  };
-
   security.setuidPrograms = ["mount.nfs"];
 
   security.pam.loginLimits =
@@ -218,6 +206,15 @@ in {
       subnet 10.141.4.0 netmask 255.255.255.0 {
         range 10.141.4.100 10.141.4.254;
       }
+
+      group {
+        use-host-decl-names on;
+
+        host vali {
+          hardware ethernet e0:cb:4e:f7:10:3d;
+          fixed-address vali.bragisheimr.yggdrasil;
+        }
+      }
     '';
   };