modular unfree whitelist

modules/base.nix

@@ -1,18 +1,33 @@
-{ config, pkgs, mainDisk, ... }:
+{ config, pkgs, mainDisk, lib, ... }:
 
+let 
+    cfg = config.my.allowUnfree;
+in
 {
-    nix.settings = {
+    options = {
-        experimental-features = [ "nix-command" "flakes" ];
+        my.allowUnfree.names = lib.mkOption {
-        auto-optimise-store = true;
+            type = lib.types.listOf lib.types.str;
+            default = [];
+            description = "Package names allowed by allowUnfreePredicate";
+        };
     };
+    config = {
+        nix.settings = {
+            experimental-features = [ "nix-command" "flakes" ];
+            auto-optimise-store = true;
+        };
 
-    programs.zsh.enable = true;
+        programs.zsh.enable = true;
+        environment.systemPackages = with pkgs; [
+            git
+            curl
+            htop
+            tmux
+            neovim
+        ];
 
-    environment.systemPackages = with pkgs; [
+        nixpkgs.config.allowUnfreePredicate = 
-        git
+            pkg: builtins.elem (lib.getName pkg) cfg.names;
-        curl
+    };
-        htop
+    
-        tmux
-        neovim
-    ];
 }

modules/gaming.nix

@@ -1,7 +1,7 @@
 { config, pkgs, myUser, release, lib, ... }:
 
 {
-    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    my.allowUnfree.names = lib.mkAfter [
         "steam"
         "steam-unwrapped"
     ];

modules/plasma.nix

@@ -12,8 +12,9 @@
 
     # Nvidia
 
-    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    my.allowUnfree.names = lib.mkAfter [
         "nvidia-x11"
+        "nvidia-settings"
     ];
     hardware.graphics.enable = true;
     services.xserver.videoDrivers = [ "nvidia" ];