unfree problems

system/users/nathan/home-manager/packages/default.nix

@@ -12,16 +12,13 @@
 	  ./scripts
 	];
 
-    options.homeconfig.minimal = lib.options.mkOption {
-        type = lib.types.bool;
+    options.homeconfig.minimal = with lib; options.mkOption {
+        type = with types; bool;
         default = false;
     };
 
-    config = {
-
-        nixpkgs.config = lib.mkIf (!config.homeconfig.minimal) {
-            allowUnfree = true;
-        };
+    config = with lib; mkMerge [
+        {
 
             home.packages = with pkgs; [
 
@@ -50,9 +47,9 @@
                 ]))
             ];
 
-    } // lib.mkMerge [
+        }
 
-        (lib.mkIf config.homeconfig.graphical {
+        (mkIf config.homeconfig.graphical {
             home.packages = with pkgs; [
             
             grim
@@ -63,7 +60,7 @@
             ];
         })
 
-        (lib.mkIf (!config.homeconfig.minimal) {
+        (mkIf (!config.homeconfig.minimal) {
             home.packages = with pkgs; [
             cava 
             android-tools
@@ -78,7 +75,12 @@
             ];
         })
 
-        (lib.mkIf (!config.homeconfig.minimal && config.homeconfig.graphical) {
+        (mkIf (!config.homeconfig.minimal && config.homeconfig.graphical) {
+
+            nixpkgs.config = mkIf (!config.homeconfig.minimal) {
+                allowUnfree = true;
+            };
+
             home.packages = with pkgs; [
             
             handbrake