Fix unfree predicate by stealing unfreepackages from Majiir

hosts/envy/default.nix

@@ -22,4 +22,6 @@
     libvirtd.enable = true;
     stateVersion = "24.11";
   };
+
+  services.globalprotect.enable = true;
 }

hosts/iso/users/main/default.nix

@@ -1,10 +1,8 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
+  home-manager.users."${config.sysusers.main}".home = {
-    home = {
     desktop.enable = true;
     remote-desktop.enable = true;
-      stateVersion = lib.mkForce "24.11";
+    stateVersion = lib.mkForce config.system.stateVersion;
-    };
   };
 }

hosts/kitty/users/main/default.nix

@@ -1,9 +1,7 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
+  home-manager.users."${config.sysusers.main}".home = {
-    home = {
     desktop.enable = false;
-      stateVersion = lib.mkForce "24.05";
+    stateVersion = lib.mkForce config.system.stateVersion;
-    };
   };
 }

hosts/lacros/users/main/default.nix

@@ -1,10 +1,8 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
+  home-manager.users."${config.sysusers.main}".home = {
-    home = {
     desktop.enable = true;
     remote-desktop.enable = true;
-      stateVersion = lib.mkForce "24.11";
+    stateVersion = lib.mkForce config.system.stateVersion;
-    };
   };
 }

hosts/midas/default.nix

@@ -33,9 +33,7 @@
     ];
   };
 
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+  nixpkgs.allowUnfreePackages = [ "intel-ocl" ];
-    "intel-ocl"
-  ];
 
   services.xserver.videoDrivers = [
     "intel"

hosts/midas/users/main/default.nix

@@ -1,11 +1,9 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
+  home-manager.users."${config.sysusers.main}".home = {
-    home = {
     desktop.enable = true;
     gaming.enable = true;
     production.enable = true;
     stateVersion = lib.mkForce config.system.stateVersion;
   };
-  };
 }

hosts/prophet/users/main/default.nix

@@ -1,9 +1,6 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
+  home-manager.users."${config.sysusers.main}".home = {
-    home = {
+    stateVersion = lib.mkForce config.system.stateVersion;
-      desktop.enable = false;
-      stateVersion = lib.mkForce "24.05";
-    };
   };
 }

hosts/redmond/users/main/default.nix

@@ -1,10 +1,8 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
+  home-manager.users."${config.sysusers.main}".home = {
-    home = {
     desktop.enable = true;
     remote-desktop.enable = true;
-      stateVersion = lib.mkForce "24.05";
+    stateVersion = lib.mkForce config.system.stateVersion;
-    };
   };
 }

hosts/tower/users/main/default.nix

@@ -1,12 +1,9 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
+  home-manager.users."${config.sysusers.main}".home = {
-    home = {
     desktop.enable = true;
     gaming.enable = true;
     production.enable = true;
-      school.enable = true;
+    stateVersion = lib.mkForce config.system.stateVersion;
-      stateVersion = lib.mkForce "24.05";
-    };
   };
 }

modules/home/programs/misc/gaming/default.nix

@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    ./launchers
     ./emulators
+    ./launchers
   ];
 }

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

modules/home/programs/misc/headless/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 {
   home.packages = with pkgs; [
     dua

modules/home/programs/misc/school/default.nix

@@ -4,5 +4,6 @@
     freerdp
     gpauth
     remmina
+    globalprotect-openconnect
   ];
 }

modules/home/settings/nix/default.nix

@@ -1,5 +1,10 @@
 { config, lib, pkgs, unstable, ... }:
 {
+  options.nixpkgs.allowUnfreePackages = lib.mkOption {
+    type = with lib.types; listOf str;
+  };
+
+  config = {
     nix = {
       package = lib.mkForce pkgs.nix;
       settings.experimental-features = [
@@ -9,8 +14,11 @@
       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;
     };
+  };
 }

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

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 = {

modules/system/settings/nix/default.nix

@@ -1,7 +1,12 @@
-{ config, pkgs, unstable, ... }:
+{ config, lib, pkgs, unstable, ... }:
 {
   imports = [ ./gc ];
 
+  options.nixpkgs.allowUnfreePackages = lib.mkOption {
+    type = with lib.types; listOf str;
+  };
+
+  config = {
     nix.settings = {
       experimental-features = [
         "nix-command"
@@ -10,8 +15,11 @@
       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;
     };
+  };
 }