vm: fix user propagation, refactor base.users

hosts/fra1-a/configuration.nix

@@ -31,13 +31,13 @@
   mj = {
     stateVersion = "23.05";
     timeZone = "UTC";
+    username = "motiejus";
+
     base = {
       users = {
         enable = true;
-        passwd = {
-          root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
-          motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
-        };
+        root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
+        user.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
       };
 
       unitstatus = {

hosts/fwminex/configuration.nix

@@ -56,16 +56,15 @@ in {
   mj = {
     stateVersion = "23.05";
     timeZone = "Europe/Vilnius";
+    username = "motiejus";
 
     base = {
       zfs.enable = true;
       users = {
         enable = true;
         devTools = true;
-        passwd = {
-          root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
-          motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
-        };
+        root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
+        user.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
       };
 
       snapshot = {

hosts/vm/configuration.nix

@@ -2,33 +2,24 @@
   self,
   lib,
   pkgs,
-  myData,
-  config,
   modulesPath,
   ...
 }: {
   imports = [
     "${modulesPath}/profiles/all-hardware.nix"
     "${modulesPath}/installer/cd-dvd/iso-image.nix"
-    ../../modules/profiles/desktop
   ];
 
-  home-manager.useGlobalPkgs = true;
-  home-manager.users.nixos = {pkgs, ...}:
-    import ../../shared/home/default.nix {
-      inherit lib;
-      inherit pkgs;
-      inherit (config.mj) stateVersion;
-      username = "nixos";
-      devTools = true;
-      hmOnly = false;
-      email = "motiejus@jakstys.lt";
-    };
-
   mj = {
     stateVersion = "23.11";
     timeZone = "UTC";
     username = "nixos";
+
+    base.users = {
+      enable = true;
+      user.initialHashedPassword = "";
+      root.initialHashedPassword = "";
+    };
   };
 
   isoImage = {
@@ -44,32 +35,15 @@
   swapDevices = [];
 
   services = {
-    pcscd.enable = true;
     getty.autologinUser = "nixos";
-    xserver.enable = true;
-  };
-
-  users.users = {
-    nixos = {
-      isNormalUser = true;
-      initialHashedPassword = "";
-      openssh.authorizedKeys.keys = [myData.people_pubkeys.motiejus];
-    };
-    root.initialHashedPassword = "";
   };
 
   # do not autostart lightdm, leave at tty
   systemd.services.display-manager.wantedBy = lib.mkForce [];
 
-  security = {
-    pam.services.lightdm.text = ''
-      auth sufficient pam_succeed_if.so user ingroup wheel
-    '';
-    sudo = {
-      enable = true;
-      wheelNeedsPassword = false;
-    };
-  };
+  security.pam.services.lightdm.text = ''
+    auth sufficient pam_succeed_if.so user ingroup wheel
+  '';
 
   networking = {
     hostName = "vm";

hosts/vno1-oh2/configuration.nix

@@ -38,15 +38,14 @@
   mj = {
     stateVersion = "23.05";
     timeZone = "Europe/Vilnius";
+    username = "motiejus";
 
     base = {
       zfs.enable = true;
       users = {
         enable = true;
-        passwd = {
-          root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
-          motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
-        };
+        root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
+        user.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
       };
 
       snapshot = {

hosts/vno3-rp3b/configuration.nix

@@ -54,14 +54,14 @@
   mj = {
     stateVersion = "23.05";
     timeZone = "Europe/Vilnius";
+    username = "motiejus";
+
     base = {
       zfs.enable = true;
       users = {
         enable = true;
-        passwd = {
-          root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
-          motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
-        };
+        root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
+        user.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
       };
       unitstatus = {
         enable = true;