From e4fe0e11272693e2c98d676bb9465c4b079d8158 Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <git@martials.no>
Date: Thu, 22 May 2025 19:40:49 +0200
Subject: [PATCH] :recycle: [shared] Moved users config to base. Use password
 from Sops

---
 hosts/pi4/default.nix              | 10 ----------
 shared/base/modules/default.nix    |  1 +
 shared/base/modules/users.nix      | 18 ++++++++++++++++++
 shared/desktop/modules/default.nix |  1 -
 shared/desktop/modules/users.nix   | 15 ---------------
 5 files changed, 19 insertions(+), 26 deletions(-)
 create mode 100644 shared/base/modules/users.nix
 delete mode 100644 shared/desktop/modules/users.nix

diff --git a/hosts/pi4/default.nix b/hosts/pi4/default.nix
index fcbec8d..eeebb93 100644
--- a/hosts/pi4/default.nix
+++ b/hosts/pi4/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   systemConfig,
   ...
 }:
@@ -14,13 +13,4 @@
   ];
 
   system.stateVersion = systemConfig.version;
-
-  users = {
-    mutableUsers = false;
-    users.${systemConfig.username} = {
-      isNormalUser = true;
-      hashedPasswordFile = config.sops.secrets.password-hash.path;
-      extraGroups = [ "wheel" ];
-    };
-  };
 }
diff --git a/shared/base/modules/default.nix b/shared/base/modules/default.nix
index 0093dc5..e9306bb 100644
--- a/shared/base/modules/default.nix
+++ b/shared/base/modules/default.nix
@@ -6,5 +6,6 @@
     ./nixos.nix
     ./security
     ./shell.nix
+    ./users.nix
   ];
 }
diff --git a/shared/base/modules/users.nix b/shared/base/modules/users.nix
new file mode 100644
index 0000000..76e4af5
--- /dev/null
+++ b/shared/base/modules/users.nix
@@ -0,0 +1,18 @@
+{ config, systemConfig, ... }:
+let
+  username = systemConfig.username;
+in
+{
+  users = {
+    mutableUsers = false;
+    users.${username} = {
+      isNormalUser = true;
+      hashedPasswordFile = config.sops.secrets.password-hash.path;
+      description = username;
+      extraGroups = [
+        "networkmanager"
+        "wheel"
+      ];
+    };
+  };
+}
diff --git a/shared/desktop/modules/default.nix b/shared/desktop/modules/default.nix
index e3a9ef8..c085160 100644
--- a/shared/desktop/modules/default.nix
+++ b/shared/desktop/modules/default.nix
@@ -19,7 +19,6 @@
     ./sddm.nix
     ./security
     ./social.nix
-    ./users.nix
     ./qt.nix
     ./xdg.nix
     ./xserver.nix
diff --git a/shared/desktop/modules/users.nix b/shared/desktop/modules/users.nix
deleted file mode 100644
index 89c45e2..0000000
--- a/shared/desktop/modules/users.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, systemConfig, ... }:
-let
-  username = systemConfig.username;
-in
-{
-  users.users.${username} = {
-    isNormalUser = true;
-    hashedPasswordFile = config.sops.secrets.password-hash.path;
-    description = username;
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-    ];
-  };
-}