arrange users marisa:spark and satori:bat

Signed-off-by: natto1784 <natto@weirdnatto.in>

hosts/marisa/default.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, network, ... }:
 {
   imports = [
     ./networking.nix
@@ -7,6 +7,14 @@
     ./services.nix
   ];
 
+  users.users.spark = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    home = "/home/spark";
+    extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = network.commonSSHKeys;
+  };
+
   time.timeZone = "Asia/Kolkata";
   system.stateVersion = "21.05";
 }

hosts/marisa/networking.nix

@@ -26,23 +26,22 @@
       enable = false;
       iwd.enable = true;
     };
+
     interfaces = {
       eth0 = {
-        useDHCP = false;
         ipv4.addresses = [{
           prefixLength = 24;
           address = "192.168.1.159";
         }];
       };
       wlan0 = {
-        useDHCP = false;
         ipv4.addresses = [{
           prefixLength = 24;
           address = "192.168.1.159";
         }];
       };
     };
-    wireguard.interfaces.wg0 = with network.address.wireguard.ips; {
+    wireguard.interfaces.wg0 = with network.addresses.wireguard.ips; {
       ips = [ marisa ];
       listenPort = 17840;
       privateKeyFile = "/var/secrets/wg.key";

hosts/marisa/services.nix

@@ -38,14 +38,7 @@
       extraConfigFiles = lib.singleton "/run/consul/consul.json";
     };
   };
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHingN2Aho+KGgEvBMjtoez+W1svl9uVoa4vG0d646j"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPX1HDzWpoaOcU8GDEGuDzXgxkCpyeqxRR6gLs/8JgHw"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOSQnDNrNP69tIK7U2D7qaMjycfIjpgx0at4U2D5Ufib"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK5V/hdkTTQSkDLXaEwY8xb/T8+sWtw5c6UjYOPaTrO8"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFyKi0HYfkgvEDvjzmDRGwAq2z2KOkfv7scTVSnonBh"
-  ];
-  security.pki.certificateFiles = [ ../../cert.pem ../../consul-agent-ca.pem ];
 
+  security.pki.certificateFiles = [ ../../cert.pem ../../consul-agent-ca.pem ];
 }
 

hosts/modules/minimal.nix

@@ -6,7 +6,7 @@
       enable = true;
       extraRules = [
         {
-          users = [ ];
+          users = [ "wheel" ];
           keepEnv = true;
           persist = true;
         }
@@ -18,6 +18,7 @@
     git
     htop
     vim
+    tmux
     wireguard-tools
     rnix-lsp
     nmap

hosts/remilia/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, network, ... }:
 {
   imports = [
     ./networking.nix
@@ -15,6 +15,7 @@
     shell = pkgs.zsh;
     home = "/home/bat";
     extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = network.commonSSHKeys;
   };
 
   system.stateVersion = "21.11";

hosts/remilia/services.nix

@@ -77,12 +77,6 @@ in
     };
   };
 
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHingN2Aho+KGgEvBMjtoez+W1svl9uVoa4vG0d646j"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILCH975XCps+VCzo8Fpp5BkbtiFmj9y3//FBVYlQ7/yo"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMu+SbTrfE62nT7gkZCwiOVOlI2TkVz+RJQ49HbnHvnQ"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFyKi0HYfkgvEDvjzmDRGwAq2z2KOkfv7scTVSnonBh"
-  ];
   security.acme = {
     acceptTerms = true;
     certs = {