removed mkbackup script, refactored all script files to use pkgs.writeShellApplication rather than pkgs.writeShellScriptBin

modules/home/scripts/commands/icanhazip.nix

@@ -1,6 +1,23 @@
 { pkgs }:
 
-pkgs.writeShellScriptBin "icanhazip" ''
+pkgs.writeShellApplication {
+  name = "icanhazip";
+  runtimeInputs = with pkgs; [
+    iproute2
+    curl
+    gawk
+    coreutils
+  ];
+  text = ''
+    if [ $# -eq 0 ]; then
       echo "Public IP: $(curl -s icanhazip.com -4)"
       ip route | awk '/default/ {print "Default Gateway: " $3} /src/ {print "Local IP: " $9}' | head -n 2
-''
+    else case $1 in
+      "-p" ) echo "Public IP: $(curl -s icanhazip.com -4)";;
+      "-d" ) ip route | awk '/default/ {print $3}';;
+      "-l" ) ip route | awk '/src/ {print $9}';;
+      * ) echo "Options: -p, -d or -l for public ip, default gateway, and local ip respectively"; echo "i.e. icanhazip -p"
+      esac
+    fi
+  '';
+}

modules/home/scripts/commands/invoke.nix

@@ -1,9 +1,11 @@
 {
-  self,
-  pkgs,
+  pkgs
 }:
-pkgs.writeShellScriptBin "invoke" ''
+pkgs.writeShellApplication {
+  name = "invoke";
+  text = ''
     cmd="$1"
     shift
     nix run nixpkgs#"$cmd" -- "$@"
-''
+  '';
+}

modules/home/scripts/commands/mkbackup.nix

@@ -1,30 +0,0 @@
-{ pkgs }:
-
-pkgs.writeShellScriptBin "mkbackup" ''
-if ! findmnt | grep share; then
-	echo "Mounting shared filesystem..."
-	if ! sshfs pagedmov@192.168.1.200:/home/pagedmov/share $HOME/share; then
-		echo "failed to mount shared storage to $HOME/share" >&2
-		exit 1
-	fi
-	echo "Done"
-fi
-
-echo "Copying files..."
-if printf '%s\0' "$@" | xargs -0 -I {} cp {} -v "$HOME/share"; then
-	echo "Done"
-else
-	echo "Failed to copy files to shared directory."
-	exit 1
-fi
-
-echo "Moving files to backup folder on serverside..."
-if ssh pagedmov@192.168.1.200 "IFS=' ' read -rA files <<< \"$@\"; for file in \''${files[@]}; do echo -n \"\$(whoami)@\$(hostname): \"; mv -v ~/share/\"\$file\" ~/backup; done"; then
-	echo "Backup completed."
-	umount $HOME/share
-else
-	echo "Failed to move files on serverside. Unmounting shared filesystem."
-	umount $HOME/share
-	exit 1
-fi
-''

modules/home/scripts/commands/runbg.nix

@@ -1,17 +1,23 @@
 {
-  self,
   pkgs,
 }:
-pkgs.writeShellScriptBin "runbg" ''
+pkgs.writeShellApplication {
+  name = "runbg";
+  runtimeInputs = with pkgs; [
+    coreutils   # Provides `basename`, `which`, etc.
+    bash        # Provides the Bash shell
+    util-linux  # Provides `tty`
+  ];
+  text = ''
     #!/usr/bin/env bash
 
     [ $# -eq 0 ] && {  # $# is number of args
-      echo "$(basename $0): missing command" >&2
+        echo "$(basename "$0"): missing command" >&2
         exit 1
     }
     prog="$(which "$1")"  # see below
     [ -z "$prog" ] && {
-      echo "$(basename $0): unknown command: $1" >&2
+        echo "$(basename "$0"): unknown command: $1" >&2
         exit 1
     }
     shift  # remove $1, now $prog, from args
@@ -19,4 +25,5 @@ pkgs.writeShellScriptBin "runbg" ''
     tty -s <&1 && exec >/dev/null  # if stdout is a terminal, redirect to null
     tty -s <&2 && exec 2>&1        # stderr to stdout (which might not be null)
     "$prog" "$@" &  # $@ is all args
-''
+  '';
+}

modules/home/scripts/commands/splash.nix

@@ -1,13 +1,18 @@
 {
-  self,
-  pkgs,
+  pkgs
 }:
-pkgs.writeShellScriptBin "splash" ''
-   #!/bin/bash
-
+pkgs.writeShellApplication {
+  name = "splash";
+  runtimeInputs = with pkgs; [
+    lolcat
+    toilet
+    coreutils
+  ];
+  text = ''
     echo "NixOS kernel ver. $(uname -a | awk '{print $3}') x86_64 GNU/Linux"
     date +"%A %B %-d %Y"
     echo
     echo " NixOS" | toilet -f 3d | lolcat -S 25
     echo
-''
+  '';
+}

modules/home/scripts/commands/toolbelt.nix

@@ -1,5 +1,18 @@
-{pkgs, ...}:
-pkgs.writeShellScriptBin "toolbelt" ''
+{pkgs}:
+pkgs.writeShellApplication {
+  name = "toolbelt";
+  runtimeInputs = with pkgs; [
+    cliphist
+    fzf
+    ripgrep
+    gawk
+    wl-clipboard
+    hyprland
+    alsa-utils
+    btop
+    coreutils
+  ];
+  text = ''
     cliphistory() {
       selection=$(cliphist list | fzf --preview="
         index=\$(echo {} | awk '{print \$1}'); \
@@ -13,8 +26,8 @@ pkgs.writeShellScriptBin "toolbelt" ''
       cliphist decode "$selection" | wl-copy
     }
     btop_cmd() {
-    local hostname=$(cat /etc/hostname)
-    if [ "$hostname" = "oganesson" ]; then
+
+      if [ "$(cat /etc/hostname)" = "oganesson" ]; then
         hyprctl dispatch resizeactive 20% 155% &&
         moveonscreen --center &&
         btop &&
@@ -78,4 +91,5 @@ pkgs.writeShellScriptBin "toolbelt" ''
         running=false
       fi
     done
-''
+  '';
+}

modules/home/scripts/commands/viconf.nix

@@ -1,5 +1,13 @@
 {pkgs}:
-pkgs.writeShellScriptBin "viconf" ''
+pkgs.writeShellApplication {
+  name = "viconf";
+  runtimeInputs = with pkgs; [
+    coreutils
+    fd
+    ripgrep
+    fzf
+  ];
+  text = ''
     #!/usr/bin/env bash
 
     [ ! $# -eq 1 ] && echo "Usage: viconf <*.nix>" && exit 1
@@ -19,4 +27,5 @@ pkgs.writeShellScriptBin "viconf" ''
     else
       nvim "$results"
     fi
-''
+  '';
+}

modules/home/scripts/default.nix

@@ -6,16 +6,15 @@
   pkgs,
   ...
 }: let
-  keyring         = import ./wm-controls/keyring.nix { inherit self pkgs; };
-  invoke          = import ./commands/invoke.nix { inherit self pkgs; };
-  splash          = import ./commands/splash.nix { inherit self pkgs; };
-  runbg           = import ./commands/runbg.nix { inherit self pkgs; };
-  mkbackup        = import ./commands/mkbackup.nix { inherit pkgs; };
+  keyring         = import ./wm-controls/keyring.nix { inherit pkgs; };
+  invoke          = import ./commands/invoke.nix { inherit pkgs; };
+  splash          = import ./commands/splash.nix { inherit pkgs; };
+  runbg           = import ./commands/runbg.nix { inherit pkgs; };
   icanhazip       = import ./commands/icanhazip.nix { inherit pkgs; };
-  garbage-collect = import ./nix/garbage-collect.nix { inherit self pkgs; };
-  nsp             = import ./nix/nsp.nix { inherit self pkgs; };
-  scheck          = import ./wm-controls/s_check.nix { inherit self pkgs; };
-  switchmon       = import ./wm-controls/switchmon.nix { inherit self pkgs; };
+  garbage-collect = import ./nix/garbage-collect.nix { inherit pkgs; };
+  nsp             = import ./nix/nsp.nix { inherit pkgs; };
+  scheck          = import ./wm-controls/s_check.nix { inherit pkgs; };
+  switchmon       = import ./wm-controls/switchmon.nix { inherit pkgs; };
   rebuild         = import ./nix/rebuild.nix { inherit host self pkgs; };
   moveonscreen    = import ./wm-controls/moveonscreen.nix { inherit pkgs; };
   toolbelt        = import ./commands/toolbelt.nix { inherit pkgs; };
@@ -44,8 +43,6 @@ in {
       lib.mkEnableOption "Enables all Nix shortcut scripts";
 
     # Individual options using scriptOverride or mkEnableOption directly
-    movScripts.commandScripts.mkbackup.enable =
-      scriptOverride "Enables the mkbackup command" "commandScripts" "mkbackup";
     movScripts.commandScripts.icanhazip.enable =
       scriptOverride "Enables the icanhazip command" "commandScripts" "icanhazip";
     movScripts.commandScripts.invoke.enable =
@@ -86,7 +83,6 @@ in {
   config = lib.mkIf config.movScripts.enable {
     home.packages = lib.optionals config.movScripts.commandScripts.invoke.enable [ invoke ]
                     ++ lib.optionals config.movScripts.commandScripts.runbg.enable [ runbg ]
-                    ++ lib.optionals config.movScripts.commandScripts.mkbackup.enable [ mkbackup ]
                     ++ lib.optionals config.movScripts.commandScripts.icanhazip.enable [ icanhazip ]
                     ++ lib.optionals config.movScripts.commandScripts.splash.enable [ splash ]
                     ++ lib.optionals config.movScripts.commandScripts.toolbelt.enable [ toolbelt ]

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

@@ -1,8 +1,18 @@
 {
-  self,
-  pkgs,
+  pkgs
 }:
-pkgs.writeShellScriptBin "garbage-collect" ''
+pkgs.writeShellApplication {
+  name = "garbage-collect";
+  runtimeInputs = with pkgs; [
+    bash
+    coreutils
+    gnugrep
+    bc
+    alsa-utils
+    findutils
+    nix
+  ];
+  text = ''
     #!/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."
@@ -38,4 +48,5 @@ pkgs.writeShellScriptBin "garbage-collect" ''
     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/nix/nsp.nix

@@ -1,9 +1,11 @@
 {
-  self,
-  pkgs,
+  pkgs
 }:
-pkgs.writeShellScriptBin "nsp" ''
+pkgs.writeShellApplication {
+  name = "nsp";
+  text = ''
     #!/run/current-system/sw/bin/bash
 
     nix-shell -p "$@" --run zsh
-''
+  '';
+}

modules/home/scripts/nix/rebuild.nix

@@ -3,16 +3,16 @@
   self,
   pkgs,
 }:
-pkgs.writeShellScriptBin "rebuild" ''
-   #!/run/current-system/sw/bin/bash
-
+pkgs.writeShellApplication {
+  name = "rebuild";
+  text = ''
     scheck && runbg aplay ${self}/assets/sound/nixswitch-start.wav
     set -e
-  nh os switch -H ${host} $HOME/.sysflake
-   sudo nixos-rebuild switch --flake "$HOME/.sysflake#${host}"
-   if [ $? -eq 0 ]; then
+    nh os switch -H ${host} "$HOME"/.sysflake
+    if sudo nixos-rebuild switch --flake "$HOME/.sysflake#${host}"; then
       scheck && runbg aplay ${self}/assets/sound/update.wav
     else
       scheck && runbg aplay ${self}/assets/sound/error.wav
     fi
-''
+  '';
+}

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

@@ -1,5 +1,14 @@
 {pkgs}:
-pkgs.writeShellScriptBin "chpaper" ''
+pkgs.writeShellApplication {
+  name = "chpaper";
+  runtimeInputs = with pkgs; [
+    chafa
+    fzf
+    ripgrep
+    findutils
+    coreutils
+  ];
+  text = ''
     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"/modules/sys/environment/stylix.nix
@@ -12,4 +21,5 @@ pkgs.writeShellScriptBin "chpaper" ''
           echo "Exiting...";exit 0;;
       esac
     done
-''
+  '';
+}

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

@@ -1,25 +1,30 @@
 { pkgs }:
-pkgs.writeShellScriptBin "chscheme" ''
+pkgs.writeShellApplication {
+  name = "chscheme";
+  runtimeInputs = with pkgs; [
+    fzf
+    coreutils
+  ];
+  text = ''
     selected_scheme=$(/usr/bin/env ls "$(nix-build '<nixpkgs>' -A base16-schemes)"/share/themes | \
         sed 's/\.yaml//g' | \
-      fzf --preview 'cat $(nix-build "<nixpkgs>" -A base16-schemes)/share/themes/{}.yaml | \
-      while IFS=": " read -r key value; do \
-          if [[ $key =~ base0[0-9A-F] ]]; then \
-              clean_value=$(echo $value | tr -d "\""); \
-              r=$((16#''${clean_value:0:2})); \
-              g=$((16#''${clean_value:2:2})); \
-              b=$((16#''${clean_value:4:2})); \
-              printf "\033[48;2;%d;%d;%dm %-20s %s \033[0m\n" $r $g $b $key $clean_value; \
+        fzf --preview "cat \"$(nix-build '<nixpkgs>' -A base16-schemes)/share/themes/{}.yaml\" | \
+        while IFS=\": \" read -r key value; do \
+            if [[ \$key =~ base0[0-9A-F] ]]; then \
+                clean_value=\$(echo \"\$value\" | tr -d '\"'); \
+                r=\$((16#\''${clean_value:0:2})); \
+                g=\$((16#\''${clean_value:2:2})); \
+                b=\$((16#\''${clean_value:4:2})); \
+                printf \"\\033[48;2;%d;%d;%dm %-20s %s \\033[0m\\n\" \$r \$g \$b \$key \$clean_value; \
             fi; \
-      done')
+        done")
 
     if [[ -z "$selected_scheme" ]]; then
         echo "Aborting color scheme change."
         exit 1
     fi
 
-  echo "$selected_scheme" | xargs -I {} sed -i '/^[[:space:]]*scheme\s*=\s*"/s/"[^"]*"/"{}"/' "$FLAKEPATH"/modules/sys/environment/stylix.nix
-  if [ $? -ne 0 ]; then
+    if ! echo "$selected_scheme" | xargs -I {} sed -i '/^[[:space:]]*scheme\s*=\s*"/s/"[^"]*"/"{}"/' "$FLAKEPATH"/modules/sys/environment/stylix.nix; then
         echo "Failed to change color scheme."
         exit 1
     fi
@@ -37,4 +42,5 @@ pkgs.writeShellScriptBin "chscheme" ''
                 ;;
         esac
     done
-''
+  '';
+}

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

@@ -1,9 +1,17 @@
 {
-  self,
-  pkgs,
-  ...
+  pkgs
 }:
-pkgs.writeShellScriptBin "keyring" ''
+pkgs.writeShellApplication {
+  name = "keyring";
+  runtimeInputs = with pkgs; [
+    pass
+    findutils
+    ripgrep
+    fzf
+    wl-clipboard
+    coreutils
+  ];
+  text = ''
     #!/run/current-system/sw/bin/bash
 
       # prevent multiple instances, conditional check happens in the hyprland bind
@@ -11,9 +19,7 @@ pkgs.writeShellScriptBin "keyring" ''
     trap "[ -f /tmp/keyringfile ] && /run/current-system/sw/bin/rm /tmp/keyringfile" EXIT SIGHUP SIGINT
 
       # get passwords from password store, remove .password store/ prefix and .gpg suffix, exlude .gpg-id file, open results in fzf
-  pass_string=$(find $HOME/.password-store -type f | sed 's|.*/.password-store/||; s|\.gpg$||' | sed 's|^\([^/]*\)|\x1b[32m\1\x1b[0m|' | rg -v "\.git|.gpg-id" | sort -r | fzf --border --border-label="$(whoami)'s keyring" --ansi --layout=reverse)
-
-  [ $? = 0 ] || { [ -f /tmp/keyringfile ] && /run/current-system/sw/bin/rm /tmp/keyringfile; exit 1; }
+    pass_string=$(find "$HOME"/.password-store -type f | sed 's|.*/.password-store/||; s|\.gpg$||' | sed 's|^\([^/]*\)|\x1b[32m\1\x1b[0m|' | rg -v "\.git|.gpg-id" | sort -r | fzf --border --border-label="$(whoami)'s keyring" --ansi --layout=reverse)
 
     # prevents cliphist from writing passwords to the clipboard history
     pkill -STOP wl-paste
@@ -32,4 +38,5 @@ pkgs.writeShellScriptBin "keyring" ''
     /run/current-system/sw/bin/rm /tmp/keyringfile
     sleep 0.5
     exit 0
-''
+  '';
+}

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

@@ -1,6 +1,17 @@
 { pkgs }:
 
-pkgs.writeShellScriptBin "mkscreenshots" ''
+pkgs.writeShellApplication {
+  name = "mkscreenshots";
+  runtimeInputs = with pkgs; [
+    jq
+    neofetch
+    kitty
+    coreutils
+    nemo
+    grimblast
+    git
+  ];
+  text = ''
     if [ -n "$(hyprctl clients -j | jq -r '.[] | select(.workspace.name == "4")')" ]; then
       echo "There are windows in workspace 4. This script uses workspace 4, so move those windows and run it again."
       exit 1
@@ -55,4 +66,5 @@ pkgs.writeShellScriptBin "mkscreenshots" ''
     closewindows
 
     hyprctl dispatch workspace "$prev_workspace"
-''
+  '';
+}

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

@@ -1,7 +1,15 @@
 {pkgs}:
-pkgs.writeShellScriptBin "moveonscreen" ''
+pkgs.writeShellApplication {
+  name = "moveonscreen";
+  runtimeInputs = with pkgs; [
+    hyprland
+    jq
+    coreutils
+    gawk
+  ];
+  text = ''
     center_window=false
-  if [[ $1 == "--center" ]]; then
+    if [[ ! $# -eq 0 ]] && [[ $1 == "--center" ]]; then
         center_window=true
     fi
 
@@ -73,4 +81,5 @@ pkgs.writeShellScriptBin "moveonscreen" ''
     fi
 
     hyprctl dispatch moveactive exact "$adjusted_x $adjusted_y" > /dev/null 2>&1
-''
+  '';
+}

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

@@ -1,9 +1,11 @@
 {
-  self,
   pkgs,
 }:
-pkgs.writeShellScriptBin "scheck" ''
+pkgs.writeShellApplication {
+  name = "scheck";
+  text = ''
     #!/run/current-system/sw/bin/bash
 
     [ "$SOUNDS_ENABLED" -eq 1 ]
-''
+  '';
+}

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

@@ -1,9 +1,11 @@
 {
-  self,
   pkgs,
 }:
-pkgs.writeShellScriptBin "switchmon" ''
+pkgs.writeShellApplication {
+  name = "switchmon";
+  text = ''
     #!/bin/zsh
 
-  hyprctl dispatch focusmonitor $(echo "$(hyprctl -j monitors)" | jq -r '.[] | select(.focused == false) | .name')
-''
+    hyprctl dispatch focusmonitor "$(hyprctl -j monitors | jq -r '.[] | select(.focused == false) | .name')"
+  '';
+}