continue refactor

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

@@ -3,7 +3,6 @@
 
     pkgs-us = import inputs.nixpkgs-us {
       inherit system;
-      config.allowUnfree = true;
     };
 
     in {
@@ -28,8 +27,6 @@
             btop
             zip    
             unzip
-            gcc
-            zulu
             rsync
             curl
             wget
@@ -44,6 +41,8 @@
             cava 
             android-tools
             neovim-remote
+            gcc
+            zulu
 
             (python312.withPackages (ps: with ps; [
                 numpy
@@ -74,8 +73,9 @@
 #unfree {
             geogebra
             spotify
-            pkgs-us.rustdesk-flutter
+            discord
 #}
+            pkgs-us.rustdesk-flutter
             pkgs-us.mpv
             vlc
             pavucontrol

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

@@ -16,11 +16,7 @@
 	            echo //////Enter to close//////
 	            read
 	        '')
-	        (pkgs.writeShellScriptBin "_homeRebuild" ''
-	            ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/Olympus
-	            echo //////Enter to close//////
-	            read
-	        '')
+	        
 
 	        (pkgs.writeShellScriptBin "randWallpaper" ''
                 file=$(ls /home/nathan/Pictures/Wallpaper/ | shuf -n 1)
@@ -62,8 +58,6 @@
             
 	            pywalfox update &
             
-	            themecord > ~/.cache/_.txt && rm ~/.cache/_.txt
-            
 	            [[ $(pidof cava) != "" ]] && pkill -USR1 cava &
 	    
 	            for i in $(ls /run/user/1000 | grep nvim); do nvr -s --servername /run/user/1000/$i --remote-send '<cmd>colorscheme pywal<CR>'; done
@@ -71,25 +65,35 @@
 	            pkill -USR1 kitty
 	        '')
 
-	        (pkgs.writeShellScriptBin "onSystemStart" ''
+	        (pkgs.writeShellScriptBin "onSystemStart" 
+            (if config.homeconfig.ags.enable then ''
                 ${pkgs.swww}/bin/swww-daemon &
-		        randWallpaper &
                 ags &
+            '' else if config.homeconfig.hyprpanel.enable then ''
+                ${pkgs.hyprpanel}/bin/hyprpanel &
+            '' else '''' + ''
+		        randWallpaper &
 	            pypr &
 	            lxqt-policykit-agent &
-	           # nmcli device wifi connect EagleNet password '~?C#@ZiH' &
                 hyprctl setcursor Bibata-Modern-Classic 16 &
                 sleep 3
 		        hyprctl reload &
                 #tmux new-session -s hyprland 
-	        '')
+	        ''))
 
 	        (pkgs.writeShellScriptBin "colorPrefix" ''
                 exec -a "$0" "$@" &
 	            sleep 0.4 && changeColors &
 	        '')
 
-        ];
+        ] ++ (if config.homeconfig.standalone then [
+
+            (pkgs.writeShellScriptBin "_homeRebuild" ''
+	            ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/Olympus
+	            echo //////Enter to close//////
+	            read
+	        '')
+        ] else []);
     };
 }
 

home-manager/users/nathan/programs/pywal/default.nix

@@ -8,9 +8,6 @@
     config = lib.mkIf config.homeconfig.wal.enable {
 
         home.packages = with pkgs; [
-
-            inputs.themecord.packages.${pkgs.system}.default
-            vesktop
             
             inputs.nixvim.packages.${pkgs.system}.pywal