fixed chscheme and chpaper to work with new colorscheme and wallpaper variable locations

modules/home/environment/hyprland.nix

@@ -134,7 +134,7 @@ in {
         };
 
         decoration = {
-          rounding = 7;
+          rounding = 20;
           # active_opacity = 0.90;
           # inactive_opacity = 0.90;
           # fullscreen_opacity = 1.0;

modules/home/environment/userpkgs.nix

@@ -45,6 +45,7 @@ in
         ripgrep
         toilet-extrafonts
         python3
+        chafa
       ];
     };
 }

modules/home/environment/waybar.nix

@@ -356,7 +356,7 @@ in {
           window#waybar {
             border-radius: 20px;
             border: 3px solid #${colors.color7};
-            background: rgba(46,52,64,0.15);
+            background: rgba(46,52,64,0.66);
             margin: 20px;
           }
           window#waybar.empty #window {

modules/home/environment/zshell.nix

@@ -27,6 +27,7 @@
         svcu = "systemctl --user";
         svc = "sudo systemctl";
         viflake = "nvim flake.nix";
+        iv = "invoke";
 
         #git
         "ga" = "playshellsound ${self}/assets/sound/gitadd.wav; git add";
@@ -204,7 +205,6 @@
         }
         unalias ls
         clear
-        splash
         playshellsound ${self}/assets/sound/sh-source.wav
         [ ! -f $FLAKEPATH/flake.nix ] && echo "WARNING: flake.nix not found at \$FLAKEPATH. Shell aliases for editing config files won't work correctly!" && echo "Edit the FLAKEPATH session variable in zshell.nix to point to the path where you saved the system configuration flake."
       '';

modules/home/scripts/nix/garbage-collect.nix

@@ -5,28 +5,37 @@
 pkgs.writeShellScriptBin "garbage-collect" ''
   #!/run/current-system/sw/bin/bash
 
-
   echo "This will delete all unused paths in the nix store and delete any files in the gtrash folder."
   echo -e "\033[1;4;38;2;243;139;168mThis process is irreversible.\033[0m Are you sure?"
   select yn in "Yes" "No"; do
-  	case $yn in
+    case $yn in
-  		Yes )  echo "Sweeping system...";scheck && runbg aplay "$HOME/assets/sound/sys/collectgarbage.wav";break;;
+      Yes )  echo "Sweeping system..."; scheck && runbg aplay "$HOME/assets/sound/sys/collectgarbage.wav"; break;;
-  		No ) echo "Canceling garbage collection."; return;;
+      No ) echo "Canceling garbage collection."; return;;
-  	esac
+    esac
   done
-  output=$(nix-collect-garbage | tee /dev/tty)
 
+  output=$(nix-collect-garbage | tee /dev/tty)
   nix_freed=$(echo "$output" | grep -oP '\d+(\.\d+)? MiB freed' | cut -d' ' -f1)
 
+  # Get the size of the trash folder before deleting
   if [ "$(ls -A ~/.local/share/Trash/files/ 2>/dev/null)" ]; then
-      rm_freed=$(du ~/.local/share/Trash/files 2> /dev/null | awk '{print $1}')
+    rm_freed=$(du -sm ~/.local/share/Trash/files | awk '{print $1}')
-  	rm_freed=$(echo "scale=2; $rm_freed / 1000" | bc)
+    /run/current-system/sw/bin/rm -rfv ~/.local/share/Trash/files/*  # Verbose output
-  	/run/current-system/sw/bin/rm -rfv ~/.local/share/Trash/files
+    mkdir -p ~/.local/share/Trash/files
-  	mkdir ~/.local/share/Trash/files
   else
-  	rm_freed="0"
+    rm_freed="0"
   fi
+
   total_freed=$(echo "$nix_freed + $rm_freed" | bc)
-  echo -e "System cleaning complete, freed \033[1;4;38;2;166;227;161m$total_freed MiB\033[0m in total"
+
+  units=("MB" "GB" "TB" "PB")
+  divisions=0
+  while [ "$(echo "$total_freed >= 1024.0" | bc -l)" -eq 1 ]; do
+      total_freed=$(echo "scale=2; $total_freed / 1024" | bc -l)
+      divisions=$((divisions + 1))
+  done
+
+  echo -e "System cleaning complete, freed \033[1;4;38;2;166;227;161m$total_freed ''${units[$divisions]}\033[0m in total"
+
   scheck && runbg aplay "$HOME/assets/sound/sys/rm.wav"
 ''

modules/home/scripts/wm-controls/chpaper.nix

@@ -2,7 +2,7 @@
 pkgs.writeShellScriptBin "chpaper" ''
   paper="$\{self}/assets/wallpapers/$(find "$FLAKEPATH"/assets/wallpapers -exec basename {} \; | rg "\.\w+$" | fzf --preview "chafa -s 30x40 $FLAKEPATH/assets/wallpapers/{}")"
   [ "$paper" = "$\{self}/assets/wallpapers/" ] && echo "Cancelling wallpaper change" && exit 1
-  echo "$paper" | xargs -I {} sed -i '/wallpaper =/s|"[^"]*"|"{}"|' "$FLAKEPATH"/flake.nix
+  echo "$paper" | xargs -I {} sed -i '/wallpaper =/s|"[^"]*"|"{}"|' "$FLAKEPATH"/modules/sys/environment/stylix.nix
   echo "Successfully changed wallpaper. Rebuild now?" && \
   select choice in "Yes" "No"; do
   	case $choice in

modules/home/scripts/wm-controls/chscheme.nix

@@ -18,7 +18,7 @@ pkgs.writeShellScriptBin "chscheme" ''
       exit 1
   fi
 
-  echo "$selected_scheme" | xargs -I {} sed -i '/base16scheme\s*=\s*"/s/"[^"]*"/"{}"/' "$FLAKEPATH"/flake.nix
+  echo "$selected_scheme" | xargs -I {} sed -i '/^[[:space:]]*scheme\s*=\s*"/s/"[^"]*"/"{}"/' "$FLAKEPATH"/modules/sys/environment/stylix.nix
   if [ $? -ne 0 ]; then
       echo "Failed to change color scheme."
       exit 1

modules/home/scripts/wm-controls/keyring.nix

@@ -23,7 +23,7 @@ pkgs.writeShellScriptBin "keyring" ''
   echo "Password copied. Clearing clipboard in 10 seconds."
 
   # start a timer for 10 seconds, clear clipboard, resume cliphist tracking
-  nohup bash <<- EOF &
+  nohup bash <<-EOF > /dev/null &
     sleep 10
     wl-copy -c
     pkill -CONT wl-paste

modules/sys/environment/stylix.nix

@@ -7,7 +7,8 @@
 }:
 
 let
-  scheme = "black-metal-venom";
+  scheme = "tokyo-night-dark";
+  wallpaper = "${self}/assets/wallpapers/nord-balloons.png";
 in
 {
   options = {
@@ -18,7 +19,7 @@ in
       enable = true;
       base16Scheme = "${pkgs.base16-schemes}/share/themes/${scheme}.yaml";
       override.base00 = "030303";
-      image =  "${self}/assets/wallpapers/sleeping-blackmetal.png";
+      image = wallpaper;
       homeManagerIntegration = {
         autoImport = true;
         followSystem = true;

modules/sys/software/packages.nix

@@ -36,6 +36,7 @@
       wine
       uhk-agent
       obs-studio
+      jq
       wl-clipboard
       libnotify
       file