diff --git a/hosts/envy/default.nix b/hosts/envy/default.nix
index dd0ba70a..c82139cd 100644
--- a/hosts/envy/default.nix
+++ b/hosts/envy/default.nix
@@ -22,6 +22,4 @@
     libvirtd.enable = true;
     stateVersion = "24.11";
   };
-
-  services.globalprotect.enable = true;
 }
diff --git a/hosts/iso/users/main/default.nix b/hosts/iso/users/main/default.nix
index 26b7a3ad..d8b8d24f 100644
--- a/hosts/iso/users/main/default.nix
+++ b/hosts/iso/users/main/default.nix
@@ -1,8 +1,10 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}".home = {
-    desktop.enable = true;
-    remote-desktop.enable = true;
-    stateVersion = lib.mkForce config.system.stateVersion;
+  home-manager.users."${config.sysusers.main}" = {
+    home = {
+      desktop.enable = true;
+      remote-desktop.enable = true;
+      stateVersion = lib.mkForce "24.11";
+    };
   };
 }
diff --git a/hosts/kitty/users/main/default.nix b/hosts/kitty/users/main/default.nix
index bbe7e613..1a981b29 100644
--- a/hosts/kitty/users/main/default.nix
+++ b/hosts/kitty/users/main/default.nix
@@ -1,7 +1,9 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}".home = {
-    desktop.enable = false;
-    stateVersion = lib.mkForce config.system.stateVersion;
+  home-manager.users."${config.sysusers.main}" = {
+    home = {
+      desktop.enable = false;
+      stateVersion = lib.mkForce "24.05";
+    };
   };
 }
diff --git a/hosts/lacros/users/main/default.nix b/hosts/lacros/users/main/default.nix
index 26b7a3ad..d8b8d24f 100644
--- a/hosts/lacros/users/main/default.nix
+++ b/hosts/lacros/users/main/default.nix
@@ -1,8 +1,10 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}".home = {
-    desktop.enable = true;
-    remote-desktop.enable = true;
-    stateVersion = lib.mkForce config.system.stateVersion;
+  home-manager.users."${config.sysusers.main}" = {
+    home = {
+      desktop.enable = true;
+      remote-desktop.enable = true;
+      stateVersion = lib.mkForce "24.11";
+    };
   };
 }
diff --git a/hosts/midas/default.nix b/hosts/midas/default.nix
index 023a525c..a6acbb7a 100644
--- a/hosts/midas/default.nix
+++ b/hosts/midas/default.nix
@@ -33,7 +33,9 @@
     ];
   };
 
-  nixpkgs.allowUnfreePackages = [ "intel-ocl" ];
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "intel-ocl"
+  ];
 
   services.xserver.videoDrivers = [
     "intel"
diff --git a/hosts/midas/users/main/default.nix b/hosts/midas/users/main/default.nix
index 9c6469d4..be52eadb 100644
--- a/hosts/midas/users/main/default.nix
+++ b/hosts/midas/users/main/default.nix
@@ -1,9 +1,11 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}".home = {
-    desktop.enable = true;
-    gaming.enable = true;
-    production.enable = true;
-    stateVersion = lib.mkForce config.system.stateVersion;
+  home-manager.users."${config.sysusers.main}" = {
+    home = {
+      desktop.enable = true;
+      gaming.enable = true;
+      production.enable = true;
+      stateVersion = lib.mkForce config.system.stateVersion;
+    };
   };
 }
diff --git a/hosts/prophet/users/main/default.nix b/hosts/prophet/users/main/default.nix
index 9366cadc..1a981b29 100644
--- a/hosts/prophet/users/main/default.nix
+++ b/hosts/prophet/users/main/default.nix
@@ -1,6 +1,9 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}".home = {
-    stateVersion = lib.mkForce config.system.stateVersion;
+  home-manager.users."${config.sysusers.main}" = {
+    home = {
+      desktop.enable = false;
+      stateVersion = lib.mkForce "24.05";
+    };
   };
 }
diff --git a/hosts/redmond/users/main/default.nix b/hosts/redmond/users/main/default.nix
index 26b7a3ad..cfe5b79e 100644
--- a/hosts/redmond/users/main/default.nix
+++ b/hosts/redmond/users/main/default.nix
@@ -1,8 +1,10 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}".home = {
-    desktop.enable = true;
-    remote-desktop.enable = true;
-    stateVersion = lib.mkForce config.system.stateVersion;
+  home-manager.users."${config.sysusers.main}" = {
+    home = {
+      desktop.enable = true;
+      remote-desktop.enable = true;
+      stateVersion = lib.mkForce "24.05";
+    };
   };
 }
diff --git a/hosts/tower/users/main/default.nix b/hosts/tower/users/main/default.nix
index 9c6469d4..2235af0a 100644
--- a/hosts/tower/users/main/default.nix
+++ b/hosts/tower/users/main/default.nix
@@ -1,9 +1,12 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}".home = {
-    desktop.enable = true;
-    gaming.enable = true;
-    production.enable = true;
-    stateVersion = lib.mkForce config.system.stateVersion;
+  home-manager.users."${config.sysusers.main}" = {
+    home = {
+      desktop.enable = true;
+      gaming.enable = true;
+      production.enable = true;
+      school.enable = true;
+      stateVersion = lib.mkForce "24.05";
+    };
   };
 }
diff --git a/modules/home/programs/misc/gaming/default.nix b/modules/home/programs/misc/gaming/default.nix
index dec3d6ec..5f77668c 100644
--- a/modules/home/programs/misc/gaming/default.nix
+++ b/modules/home/programs/misc/gaming/default.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    ./emulators
     ./launchers
+    ./emulators
   ];
 }
diff --git a/modules/home/programs/misc/gaming/launchers/default.nix b/modules/home/programs/misc/gaming/launchers/default.nix
index f6aa32f6..39ece41d 100644
--- a/modules/home/programs/misc/gaming/launchers/default.nix
+++ b/modules/home/programs/misc/gaming/launchers/default.nix
@@ -7,7 +7,7 @@
     steam-run
   ];
 
-  nixpkgs.allowUnfreePackages = [
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
     "steam"
     "steam-unwrapped"
   ];
diff --git a/modules/home/programs/misc/headless/default.nix b/modules/home/programs/misc/headless/default.nix
index ecdc584b..061f76aa 100644
--- a/modules/home/programs/misc/headless/default.nix
+++ b/modules/home/programs/misc/headless/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     dua
diff --git a/modules/home/programs/misc/school/default.nix b/modules/home/programs/misc/school/default.nix
index 0b904df0..efbd7256 100644
--- a/modules/home/programs/misc/school/default.nix
+++ b/modules/home/programs/misc/school/default.nix
@@ -4,6 +4,5 @@
     freerdp
     gpauth
     remmina
-    globalprotect-openconnect
   ];
 }
diff --git a/modules/home/settings/nix/default.nix b/modules/home/settings/nix/default.nix
index 08fc5727..fbf9d3f1 100644
--- a/modules/home/settings/nix/default.nix
+++ b/modules/home/settings/nix/default.nix
@@ -1,24 +1,16 @@
 { config, lib, pkgs, unstable, ... }:
 {
-  options.nixpkgs.allowUnfreePackages = lib.mkOption {
-    type = with lib.types; listOf str;
+  nix = {  
+    package = lib.mkForce pkgs.nix;
+    settings.experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
+    registry.unstable.flake = unstable;
   };
 
-  config = {
-    nix = {
-      package = lib.mkForce pkgs.nix;
-      settings.experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-      registry.unstable.flake = unstable;
-    };
-
-    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowUnfreePackages;
-
-    _module.args.pkgsUnstable = import unstable {
-      inherit (pkgs.stdenv.hostPlatform) system;
-      inherit (config.nixpkgs) config;
-    };
+  _module.args.pkgsUnstable = import unstable {
+    inherit (pkgs.stdenv.hostPlatform) system;
+    inherit (config.nixpkgs) config;
   };
 }
diff --git a/modules/system/devices/video/nvidia/default.nix b/modules/system/devices/video/nvidia/default.nix
index 43083ed8..49471b14 100644
--- a/modules/system/devices/video/nvidia/default.nix
+++ b/modules/system/devices/video/nvidia/default.nix
@@ -16,6 +16,6 @@
     services.xserver.videoDrivers = [ "nvidia" ];
     boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
 
-    nixpkgs.allowUnfreePackages = [ "nvidia-x11" ];
+    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "nvidia-x11" ];
   };
 }
diff --git a/modules/system/services/server/minecraft/default.nix b/modules/system/services/server/minecraft/default.nix
index 944eed90..c7ecc810 100644
--- a/modules/system/services/server/minecraft/default.nix
+++ b/modules/system/services/server/minecraft/default.nix
@@ -7,8 +7,8 @@
 
   config = lib.mkIf config.system.server.enable {
     nixpkgs = {
+      config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "minecraft-server" ];
       overlays = [ minecraft.overlay ];
-      allowUnfreePackages = [ "minecraft-server" ];
     };
 
     services.minecraft-servers = {
diff --git a/modules/system/settings/nix/default.nix b/modules/system/settings/nix/default.nix
index 96f33d9b..862bef77 100644
--- a/modules/system/settings/nix/default.nix
+++ b/modules/system/settings/nix/default.nix
@@ -1,25 +1,17 @@
-{ config, lib, pkgs, unstable, ... }:
+{ config, pkgs, unstable, ... }:
 {
   imports = [ ./gc ];
 
-  options.nixpkgs.allowUnfreePackages = lib.mkOption {
-    type = with lib.types; listOf str;
+  nix.settings = {
+    experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
+    auto-optimise-store = true;
   };
 
-  config = {
-    nix.settings = {
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-      auto-optimise-store = true;
-    };
-
-    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowUnfreePackages;
-
-    _module.args.pkgsUnstable = import unstable {
-      inherit (pkgs.stdenv.hostPlatform) system;
-      inherit (config.nixpkgs) config;
-    };
+  _module.args.pkgsUnstable = import unstable {
+    inherit (pkgs.stdenv.hostPlatform) system;
+    inherit (config.nixpkgs) config;
   };
 }