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