project!: disambiguate nix,nixpkgs options

7 files changed, 6 insertions, 41 deletions

diff --git a/home/modules/programs/nixpkgs/default.nix b/home/modules/programs/nixpkgs/default.nix
deleted file mode 100644
index 3220844..0000000
--- a/home/modules/programs/nixpkgs/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ config, lib, ... }:
-
-let
-  allowedUnf = config.nixpkgs.allowedUnfree;
-  allowedIns = config.nixpkgs.allowedInsecure;
-in
-
-{
-  options.nixpkgs.allowedUnfree = lib.mkOption {
-    type = lib.types.listOf lib.types.str;
-    default = [ ];
-    description = ''
-      Allows for unfree packages by their name.
-    '';
-  };
-
-  options.nixpkgs.allowedInsecure = lib.mkOption {
-    type = lib.types.listOf lib.types.str;
-    default = [ ];
-    description = ''
-      Allows for insercure packages by their name.
-    '';
-  };
-
-
-  config.nixpkgs.config.allowUnfreePredicate =
-    if (allowedUnf == [ ])
-    then (_: false)
-    else (pkg: __elem (lib.getName pkg) allowedUnf);
-
-  config.nixpkgs.config.allowInsecurePredicate =
-    if (allowedIns == [ ])
-    then (_: false)
-    else (pkg: __elem (lib.getName pkg) allowedIns);
-}
diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix
index f654bd4..7405aac 100644
--- a/home/profiles/base/default.nix
+++ b/home/profiles/base/default.nix
@@ -6,7 +6,7 @@ let
 in
 {
   imports = [
-    ../../modules/programs/nixpkgs
+    ../../../modules/nixpkgs.nix
     ../../modules/programs/zshell
     #../../modules/programs/zellij
   ];
diff --git a/home/profiles/communication/default.nix b/home/profiles/communication/default.nix
index 32dbb72..d257c8d 100644
--- a/home/profiles/communication/default.nix
+++ b/home/profiles/communication/default.nix
@@ -17,7 +17,7 @@ let
   fixSopsPrefix = x: y: builtins.replaceStrings [ "%r" ] [ "/run/user/${toString x}" ] y;
 in
 {
-  imports = [ ../../modules/programs/nixpkgs ];
+  imports = [ ../../../modules/nixpkgs.nix ];
 
   options.profiles.communication = {
     enable = lib.mkEnableOption
diff --git a/home/profiles/creative/default.nix b/home/profiles/creative/default.nix
index 60c8ce2..a119a8f 100644
--- a/home/profiles/creative/default.nix
+++ b/home/profiles/creative/default.nix
@@ -3,7 +3,7 @@ let cfg = config.profiles.creative;
 in
 {
   imports = [
-    ../../modules/programs/nixpkgs
+    ../../../modules/nixpkgs.nix
   ];
 
   options.profiles.creative = {
diff --git a/home/profiles/gaming/default.nix b/home/profiles/gaming/default.nix
index 403f0dd..9885fac 100644
--- a/home/profiles/gaming/default.nix
+++ b/home/profiles/gaming/default.nix
@@ -3,7 +3,7 @@ let
   cfg = config.profiles.gaming;
 in
 {
-  imports = [ ../../modules/programs/nixpkgs ];
+  imports = [ ../../../modules/nixpkgs.nix ];
 
   options.profiles.gaming = {
     enable = lib.mkEnableOption
diff --git a/home/profiles/multimedia/default.nix b/home/profiles/multimedia/default.nix
index 2159eb2..b6c645f 100644
--- a/home/profiles/multimedia/default.nix
+++ b/home/profiles/multimedia/default.nix
@@ -3,7 +3,7 @@ let cfg = config.profiles.multimedia;
 in
 {
   imports = [
-    ../../modules/programs/nixpkgs
+    ../../../modules/nixpkgs.nix
   ];
 
   options.profiles.multimedia = {
diff --git a/home/profiles/research/default.nix b/home/profiles/research/default.nix
index 06fb14f..12afc0b 100644
--- a/home/profiles/research/default.nix
+++ b/home/profiles/research/default.nix
@@ -3,7 +3,7 @@ let
   cfg = config.profiles.research;
 in
 {
-  imports = [ ../../modules/programs/nixpkgs ];
+  imports = [ ../../../modules/nixpkgs.nix ];
 
   options.profiles.research = {
     enable = lib.mkEnableOption