From 30d55ebb5a5e888b440909655182a82989486c6a Mon Sep 17 00:00:00 2001
From: Nathan <nathanblunkall5@gmail.com>
Date: Sat, 10 Jan 2026 19:06:55 -0600
Subject: [PATCH] unfree problems

---
 .../nathan/home-manager/packages/default.nix  | 72 ++++++++++---------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/system/users/nathan/home-manager/packages/default.nix b/system/users/nathan/home-manager/packages/default.nix
index dd0ecdb..6230a70 100644
--- a/system/users/nathan/home-manager/packages/default.nix
+++ b/system/users/nathan/home-manager/packages/default.nix
@@ -12,47 +12,44 @@
 	  ./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 = {
+    config = with lib; mkMerge [
+        {
 
-        nixpkgs.config = lib.mkIf (!config.homeconfig.minimal) {
-            allowUnfree = true;
-        };
+            home.packages = with pkgs; [
 
-        home.packages = with pkgs; [
+                inputs.disko.packages.${pkgs.stdenv.hostPlatform.system}.disko-install 
 
-            inputs.disko.packages.${pkgs.stdenv.hostPlatform.system}.disko-install 
+                kjv
+                openssh
+                sops
+                killall
+                btop
+                zip    
+                unzip
+                rsync
+                curl
+                wget
+                (python313.withPackages (ps: with ps; [
+                    gpustat
+                    numpy
+                    matplotlib
+                    scipy
+                    pandas
+                    pyaudio
+                    pyusb
+                    debugpy
+                    requests
+                ]))
+            ];
 
-            kjv
-            openssh
-            sops
-            killall
-            btop
-            zip    
-            unzip
-            rsync
-            curl
-            wget
-            (python313.withPackages (ps: with ps; [
-                gpustat
-                numpy
-                matplotlib
-                scipy
-                pandas
-                pyaudio
-                pyusb
-                debugpy
-                requests
-            ]))
-        ];
+        }
 
-    } // 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