Don't duplicate the user's stateversion for each system

hosts/detritus/user/default.nix

@@ -1,10 +1,9 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 {
   home-manager.users."${config.vars.mainUser}" = {
     home = {
       desktop.enable = true;
       gaming.enable = true;
-      stateVersion = lib.mkForce config.system.stateVersion;
     };
 
     wayland.windowManager.sway.package = pkgs.swayfx;

hosts/hidden/user/default.nix

@@ -1,8 +1,7 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   home-manager.users."${config.vars.mainUser}".home = {
     desktop.enable = true;
     school.enable = true;
-    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }

hosts/intuos/user/default.nix

@@ -1,8 +1,7 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   home-manager.users."${config.vars.mainUser}".home = {
     desktop.enable = true;
     production.enable = true;
-    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }

hosts/jupiter/user/default.nix

@@ -1,9 +1,8 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   home-manager.users."${config.vars.mainUser}".home = {
     guifull.enable = true;
     school.enable = true;
     enableNixpkgsReleaseCheck = false;
-    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }

hosts/kitty/default.nix

@@ -5,7 +5,6 @@
     ./disko
     ./filesystems
     ./hardware
-    ./user
   ];
 
   system = {

hosts/kitty/user/default.nix

@@ -1,6 +0,0 @@
-{ config, lib, ... }:
-{
-  home-manager.users."${config.vars.mainUser}".home = {
-    stateVersion = lib.mkForce config.system.stateVersion;
-  };
-}

hosts/midas/default.nix

@@ -7,7 +7,6 @@
     ./hardware
     ./network
     ./services
-    ./user
   ];
 
   system = {

hosts/midas/user/default.nix

@@ -1,6 +0,0 @@
-{ config, lib, ... }:
-{
-  home-manager.users."${config.vars.mainUser}".home = {
-    stateVersion = lib.mkForce config.system.stateVersion;
-  };
-}

hosts/prophet/boot/default.nix

@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
   boot = {
+    binfmt.emulatedSystems = [ "x86_64-linux" ];
     kernelPackages = pkgs.linuxPackages_hardened;
     loader.systemd-boot.enable = true;
   };

hosts/prophet/default.nix

@@ -6,7 +6,6 @@
     ./filesystems
     ./hardware
     ./services
-    ./user
     (modulesPath + "/profiles/headless.nix")
   ];
 

hosts/prophet/user/@!

@@ -1,6 +0,0 @@
-{ config, lib, ... }:
-{
-  home-manager.users."${config.vars.mainUser}".home = {
-    stateVersion = lib.mkForce config.system.stateVersion;
-  };
-}

hosts/prophet/user/default.nix

@@ -1,6 +0,0 @@
-{ config, lib, ... }:
-{
-  home-manager.users."${config.vars.mainUser}".home = {
-    stateVersion = lib.mkForce config.system.stateVersion;
-  };
-}

hosts/tower/boot/default.nix

@@ -18,9 +18,6 @@ in {
 
     # Secure boot
     lanzaboote.enable = true;
-
-    # Emulate different architectures for remote builds
-    binfmt.emulatedSystems = [ "aarch64-linux" ];
   };
 
   # Use second GPU on boot

hosts/tower/user/default.nix

@@ -1,11 +1,7 @@
 { config, lib, ... }:
 {
   home-manager.users."${config.vars.mainUser}" = {
-    home = {
+    home.guifull.enable = true;
-      guifull.enable = true;
-      stateVersion = lib.mkForce config.system.stateVersion;
-    };
-
     services.swayidle.enable = lib.mkForce false;
   };
 }

modules/system/users/main/default.nix

@@ -44,5 +44,8 @@
     uid = 1000;
   };
 
-  home-manager.users."${config.vars.mainUser}" = import ../../../home;
+  home-manager.users."${config.vars.mainUser}" = {
+    imports = [ ../../../home ];
+    home.stateVersion = lib.mkForce config.system.stateVersion;
+  };
 }