common/default.nix

@@ -3,7 +3,6 @@
     ./sysadmin
     ./users
     ./environment.nix
-    ./home-manager.nix
     ./nginx.nix
     ./openssh.nix
     ./security.nix

common/home-manager.nix

@@ -1,18 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home-manager = {
-    useUserPackages = true;
-    useGlobalPkgs = true;
-
-    users = {
-      qenya = { config, lib, pkgs, osConfig, ... }: {
-        home.homeDirectory = osConfig.users.users.qenya.home;
-
-        imports = [
-          ../home/qenya
-        ];
-      };
-    };
-  };
-}

common/users/qenya.nix

@@ -5,8 +5,21 @@ in {
   users.users.qenya = {
     isNormalUser = true;
     home = "/home/qenya";
+    extraGroups = [
+      "wheel" # sudo
+      "networkmanager" # UI wifi configuration
+      "dialout" # access to serial ports
+    ];
     shell = pkgs.zsh;
     openssh.authorizedKeys.keys = keys.users.qenya;
     uid = 1001;
   };
+
+  home-manager.users.qenya = { config, lib, pkgs, osConfig, ... }: {
+    home.homeDirectory = osConfig.users.users.qenya.home;
+
+    imports = [
+      ../../home
+    ];
+  };
 }

flake.nix

@@ -47,6 +47,11 @@
           overlays = [ nur.overlay ];
         };
 
+        home-manager = {
+          useUserPackages = true;
+          useGlobalPkgs = true;
+        };
+
         imports = [
           home-manager.nixosModules.home-manager
           nur.nixosModules.nur

hosts/kalessin/configuration.nix

@@ -7,8 +7,7 @@
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-
-  users.users.qenya.extraGroups = [ "wheel" ];
+  
   qenya.sysadmin.enable = true;
 
   system.stateVersion = "23.11";

hosts/orm/configuration.nix

@@ -8,7 +8,6 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   
-  users.users.qenya.extraGroups = [ "wheel" ];
   qenya.sysadmin.enable = true;
 
   age.secrets.wireguard-peer-orm.file = ../../secrets/wireguard-peer-orm.age;

hosts/tohru/configuration.nix

@@ -43,12 +43,6 @@
   sound.enable = true;
   hardware.pulseaudio.enable = true;
 
-  users.users.qenya.extraGroups = [
-    "wheel" # sudo
-    "networkmanager" # UI wifi configuration
-    "dialout" # access to serial ports
-  ];
-
   # USB drives
   boot.supportedFilesystems = [ "ntfs" ];
 

hosts/yevaud/configuration.nix

@@ -7,9 +7,7 @@
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-
-  users.users.qenya.extraGroups = [ "wheel" ];
-
+  
   qenya.sysadmin.enable = true;
 
   age.secrets.wireguard-peer-yevaud.file = ../../secrets/wireguard-peer-yevaud.age;