♻️ [shared] Moved users config to base. Use password from Sops

hosts/pi4/default.nix

@@ -1,31 +1,16 @@
 {
   lib,
-  config,
   systemConfig,
   ...
 }:
 
 {
   imports = with lib.custom; [
-    (relativeToRoot "shared/desktop/modules/nix-helper.nix")
-    (relativeToRoot "shared/desktop/modules/nixos.nix")
-    (relativeToRoot "shared/desktop/modules/shell.nix")
-    (relativeToRoot "shared/desktop/modules/security/sops.nix")
+    (relativeToBase "modules")
     ./boot.nix
-    ./development.nix
     ./hardware.nix
-    ./networking.nix
     ./security
   ];
 
   system.stateVersion = systemConfig.version;
-
-  users = {
-    mutableUsers = false;
-    users.${systemConfig.username} = {
-      isNormalUser = true;
-      hashedPasswordFile = config.sops.secrets.password-hash.path;
-      extraGroups = [ "wheel" ];
-    };
-  };
 }

hosts/pi4/development.nix

@@ -1,11 +0,0 @@
-{ pkgs, lib, ... }:
-
-{
-  imports = [
-    (lib.custom.relativeToRoot "shared/modules/development/formatters.nix")
-  ];
-
-  environment.systemPackages = with pkgs; [
-    just
-  ];
-}

hosts/pi4/networking.nix

@@ -1,13 +0,0 @@
-{ systemConfig, ... }:
-
-{
-  networking = {
-    hostName = systemConfig.hostName;
-    networkmanager.enable = true;
-  };
-
-  services = {
-    openssh.enable = true;
-    tailscale.enable = true;
-  };
-}

shared/base/modules/default.nix

@@ -1,3 +1,11 @@
 {
-  imports = [ ./networking.nix ];
+  imports = [
+    ./development
+    ./networking.nix
+    ./nix-helper.nix
+    ./nixos.nix
+    ./security
+    ./shell.nix
+    ./users.nix
+  ];
 }

shared/base/modules/development/default.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./formatters.nix
+    ./nix.nix
+  ];
+
+  environment.systemPackages = with pkgs; [
+    git
+    just
+  ];
+}

shared/base/modules/networking.nix

@@ -8,19 +8,12 @@
   networking = {
     networkmanager.enable = true;
     hostName = systemConfig.hostName;
-    # wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   };
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
   programs.ssh.enableAskPassword = false;
 
-  services.tailscale.enable = true;
+  services = {
+    openssh.enable = true;
+    tailscale.enable = true;
+  };
 }

shared/base/modules/security/default.nix

@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./sops.nix
+    ./ssh.nix
+  ];
+
+  programs.gnupg.agent.enable = true;
+}

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"
+      ];
+    };
+  };
+}

shared/desktop/modules/default.nix

@@ -1,8 +1,8 @@
 { lib, ... }:
 
 {
-  imports = [
-    (lib.custom.relativeToBase "modules")
+  imports = with lib.custom; [
+    (relativeToBase "modules")
     ./boot.nix
     ./development
     ./electron.nix
@@ -14,15 +14,11 @@
     ./locale.nix
     ./mail.nix
     ./media.nix
-    ./nixos.nix
-    ./nix-helper.nix
     ./office.nix
     ./hyprland
     ./sddm.nix
     ./security
-    ./shell.nix
     ./social.nix
-    ./users.nix
     ./qt.nix
     ./xdg.nix
     ./xserver.nix

shared/desktop/modules/development/default.nix

@@ -4,17 +4,12 @@
   imports = [
     ./docker.nix
     ./dotnet.nix
-    ./formatters.nix
-    ./nix.nix
     ./node.nix
     ./ollama.nix
     ./rust.nix
   ];
 
   environment.systemPackages = with pkgs; [
-    # Tools
-    git
-    just
     unstable.libpq # Required for PostgreSQL
   ];
 }

shared/desktop/modules/qt.nix

@@ -1,10 +1,15 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  lib,
+  systemConfig,
+  ...
+}:
 
 {
   environment = {
     sessionVariables = {
       QT_QPA_PLATFORMTHEME = "qt6ct";
-      QT_QPA_PLATFORM = "wayland"; # Enable Wayland for QT
+      QT_QPA_PLATFORM = lib.mkIf systemConfig.wayland.enable "wayland"; # Enable Wayland for QT
     };
     systemPackages = with pkgs.kdePackages; [
       qtwayland

shared/desktop/modules/security/default.nix

@@ -1,9 +1,5 @@
 {
   imports = [
-    ./sops.nix
-    ./ssh.nix
     ./yubikey.nix
   ];
-
-  programs.gnupg.agent.enable = true;
 }

shared/desktop/modules/users.nix

@@ -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"
-    ];
-  };
-}