update commonUsers and refactor system config

nix/os/devices/steveej-t14/system.nix

@@ -6,8 +6,6 @@
 , ...
 }:
 let
-  passwords = import ../../../variables/passwords.crypt.nix;
-
   localTcpPorts = [
     22
 
@@ -30,6 +28,7 @@ in
     ../../snippets/nix-settings-holo-chain.nix
     ../../snippets/radicale.nix
     ../../snippets/sway-desktop.nix
+    ../../snippets/timezone.nix
   ];
 
   nix.settings = {
@@ -64,6 +63,8 @@ in
     }
   ];
 
+  networking.networkmanager.enable = true;
+
   networking.extraHosts = ''
   '';
 
@@ -122,8 +123,6 @@ in
 
   services.xserver.videoDrivers = lib.mkForce [ "amdgpu" ];
 
-  time.timeZone = lib.mkForce passwords.timeZone.stefan;
-
   hardware.ledger.enable = true;
 
   # services.zerotierone = {

nix/os/devices/steveej-t14/user.nix

@@ -1,19 +1,20 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
+{ config
+, pkgs
+, lib
+, ...
+}:
+let
   keys = import ../../../variables/keys.nix;
-  inherit (pkgs.callPackage ../../lib/default.nix {}) mkUser;
-in {
+  inherit (pkgs.callPackage ../../lib/default.nix { }) mkUser;
+in
+{
   users.extraUsers.steveej2 = mkUser {
     uid = 1001;
     openssh.authorizedKeys.keys = keys.users.steveej.openssh;
-    passwordFile = config.sops.secrets.sharedUsers-steveej.path;
+    hashedPasswordFile = config.sops.secrets.sharedUsers-steveej.path;
   };
 
-  nix.settings.trusted-users = ["steveej"];
+  nix.settings.trusted-users = [ "steveej" ];
 
   security.pam.u2f.enable = true;
   security.pam.services.steveej.u2fAuth = true;

nix/os/devices/steveej-x13s/configuration.nix

@@ -45,12 +45,11 @@
       # sops.defaultSopsFile = ../../../../secrets/${nodeName}/secrets.yaml;
       # sops.defaultSopsFormat = "yaml";
 
-      # users.commonUsers = {
-      #   enable = true;
-      #   enableNonRoot = true;
-      # };
-
-      users.users.root.initialPassword = "install";
+      users.commonUsers = {
+        enable = true;
+        enableNonRoot = true;
+        installPassword = "install";
+      };
     }
 
     nodeFlake.inputs.home-manager.nixosModules.home-manager
@@ -66,14 +65,9 @@
     bluetoothMac = "65:9e:7a:8b:86:28";
   };
 
-  networking = {
-    hostName = nodeName;
-
-    firewall.enable = true;
-
-    # useNetworkd = true;
-  };
-
+  networking.hostName = nodeName;
+  networking.firewall.enable = true;
+  networking.networkmanager.enable = true;
 
   nixpkgs.config.allowUnfree = true;