modules/{steam,nvim/plgs/cmp}: Make allowing unfree packages module-local

3 files changed, 19 insertions, 14 deletions

diff --git a/modules/by-name/ni/nixpkgs/module.nix b/modules/by-name/ni/nixpkgs/module.nix
index 84d8e074..1ded8444 100644
--- a/modules/by-name/ni/nixpkgs/module.nix
+++ b/modules/by-name/ni/nixpkgs/module.nix
@@ -22,7 +22,13 @@ in {
       example = "x86_64-linux";
       type = lib.types.str;
     };
+    unfreePackageNames = lib.mkOption {
+      description = "Names of unfree packages to allow";
+      example = "[ steam steam-unwrapped ]";
+      type = lib.types.listOf lib.types.str;
+    };
   };
+
   config = let
     myPkgsOverlay = self: super: packageSets.soispha;
   in
@@ -39,11 +45,7 @@ in {
           hostSystem = cfg.systemName;
 
           allowUnfreePredicate = pkg:
-            builtins.elem (lib.getName pkg) [
-              # the plugin is lacking an license and is thus unfree, effectively
-              # its okay though (TODO: investigate <2026-05-11>)?
-              "cmp-calc"
-            ];
+            builtins.elem (lib.getName pkg) cfg.unfreePackageNames;
         };
       };
     };
diff --git a/modules/by-name/nv/nvim/plgs/nvim-cmp/default.nix b/modules/by-name/nv/nvim/plgs/nvim-cmp/default.nix
index 315f3fc7..48883bd3 100644
--- a/modules/by-name/nv/nvim/plgs/nvim-cmp/default.nix
+++ b/modules/by-name/nv/nvim/plgs/nvim-cmp/default.nix
@@ -14,6 +14,12 @@
 }: let
   cfg = config.soispha.programs.nvim;
 in {
+  soispha.nixpkgs.unfreePackageNames = [
+    # the plugin is lacking an license and is thus unfree, effectively
+    # its okay though (TODO: investigate <2026-05-11>)?
+    "cmp-calc"
+  ];
+
   home-manager.users.soispha.programs.nixvim = lib.mkIf cfg.enable {
     opts.completeopt = [
       "menu" # Show completions in a menu
diff --git a/modules/by-name/st/steam/module.nix b/modules/by-name/st/steam/module.nix
index 87cdc709..aaa36fd3 100644
--- a/modules/by-name/st/steam/module.nix
+++ b/modules/by-name/st/steam/module.nix
@@ -19,15 +19,12 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    nixpkgs.config.allowUnfreePredicate = pkg:
-      builtins.elem (lib.getName pkg) [
-        # NOTE: These are not really applied. Needs to be at
-        # <modules/by-name/ni/nixpkgs/config.nix> for some reason. <2025-04-25>
-        "steam"
-        "steam-unwrapped"
-        "steam-original"
-        "steam-run"
-      ];
+    soispha.nixpkgs.unfreePackageNames = [
+      "steam"
+      "steam-unwrapped"
+      "steam-original"
+      "steam-run"
+    ];
 
     programs.steam = {
       enable = true;