reworking

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

@@ -17,96 +17,82 @@
         default = false;
     };
 
-    config = lib.mkMerge [
+    config = {
 
-        {
-            home.packages = with pkgs; [
-                killall
-                btop
-                zip    
-                unzip
-                gcc
-                zulu
-                rsync
-                lxqt.lxqt-policykit
-                blueberry
-                wl-clipboard
-                xfce.thunar
-                grim
-                slurp
-                curl
-                wget
-            ];
-        }
-        
-        (lib.mkIf (!config.homeconfig.minimal) {
+        nixpkgs.config = lib.mkIf (!config.homeconfig.minimal) {
+            allowUnfree = true;
+        };
 
-            nixpkgs.config = {
-                allowUnfree = true;
-            };
+        home.packages = with pkgs; [
+            killall
+            btop
+            zip    
+            unzip
+            gcc
+            zulu
+            rsync
+            curl
+            wget
+        ] ++ (if config.homeconfig.graphical then [
+            grim
+            slurp
+            xfce.thunar
+            wl-clipboard
+            blueberry
+            lxqt.lxqt-policykit
+        ] else []) ++ (if !config.homeconfig.minimal then [
+            cava 
+            android-tools
+            neovim-remote
 
-            home.packages = with pkgs; let
-                pypkgs = ps: with ps; [
-                    numpy
-                    matplotlib
-                    scipy
+            (python312.withPackages (ps: with ps; [
+                numpy
+                matplotlib
+                scipy
+                pandas
+                pyaudio
+                pyusb
+                debugpy
+                requests
+            ]))
 
-                    pandas
-                    pyaudio
-                    pyusb
-                    debugpy
-                    requests
-                ];
+            fastfetch
+            ncmpcpp
+            playerctl
+            mpc-cli
+            ffmpeg
 
-            in [
+        ] else []) ++ (if !config.homeconfig.minimal && config.homeconfig.graphical then [
+            handbrake
+            quickemu
+            bottles
+            
+            brightnessctl
+            libdbusmenu-gtk3
+            lmms
 
-                cava 
-                android-tools
-                neovim-remote
-                handbrake
-                quickemu
-                bottles
+#unfree {
+            geogebra
+            spotify
+            pkgs-us.rustdesk-flutter
+#}
+            pkgs-us.mpv
+            vlc
+            pavucontrol
+            rpi-imager
+            tigervnc
+            keepassxc
 
-                (pkgs.python312.withPackages pypkgs)
+#3D modeling/printing
+            blender
+            freecad-wayland
+            cura-appimage
 
-                brightnessctl
-                libdbusmenu-gtk3
-                lmms
-                #unfree {
-                geogebra
-                spotify
-                pkgs-us.rustdesk-flutter
-                #}
-
-                neofetch
-                pkgs-us.mpv
-                ncmpcpp
-                playerctl
-                mpc-cli
-                vlc
-                pavucontrol
-                yewtube
-                ytmdl
-                ffmpeg
-                rpi-imager
-                tigervnc
-                keepassxc
-                httplz
-
-                #3D modeling/printing
-                blender
-                freecad-wayland
-                cura-appimage
-
-                #productivity
-                libreoffice
-                super-productivity
-
-                #games
-                prismlauncher
-            ];
-
-        })
-    ];
+#productivity
+            libreoffice
 
+#games
+            prismlauncher
+        ] else []);
+    };
 }