From d32d0cf64f452c5d8b26ac1f1c5330b0b0ddcc5d Mon Sep 17 00:00:00 2001
From: Michael Housh <michael@mhoush.com>
Date: Fri, 3 Oct 2025 23:43:29 -0400
Subject: [PATCH] feat: Moves hyprland scripts into it's own directory.

---
 dev-env                                       | 21 ++++++++++++++-----
 env/.config/hypr/keybinds.conf                |  4 ++--
 env/.config/zsh/.zshrc                        |  1 +
 env/.local/scripts/{ => hypr}/close-windows   |  0
 env/.local/scripts/{ => hypr}/install-webapp  |  2 +-
 env/.local/scripts/{ => hypr}/launch          |  0
 env/.local/scripts/{ => hypr}/launch-webapp   |  6 +++---
 .../{ => hypr}/mv-all-workspaces-to-monitor   |  0
 env/.local/scripts/{ => hypr}/toggle-desktop  |  0
 .../{ => hypr}/toggle-internal-monitor        |  0
 .../scripts/{ => hypr}/uninstall-desktop-app  |  0
 env/.local/scripts/{ => hypr}/waybar-restart  |  0
 env/.local/scripts/{ => hypr}/window-table    |  0
 .../scripts/{ => hypr}/window-toggle-floating |  0
 gen                                           |  2 +-
 webapp                                        |  4 ++--
 16 files changed, 26 insertions(+), 14 deletions(-)
 rename env/.local/scripts/{ => hypr}/close-windows (100%)
 rename env/.local/scripts/{ => hypr}/install-webapp (98%)
 rename env/.local/scripts/{ => hypr}/launch (100%)
 rename env/.local/scripts/{ => hypr}/launch-webapp (96%)
 rename env/.local/scripts/{ => hypr}/mv-all-workspaces-to-monitor (100%)
 rename env/.local/scripts/{ => hypr}/toggle-desktop (100%)
 rename env/.local/scripts/{ => hypr}/toggle-internal-monitor (100%)
 rename env/.local/scripts/{ => hypr}/uninstall-desktop-app (100%)
 rename env/.local/scripts/{ => hypr}/waybar-restart (100%)
 rename env/.local/scripts/{ => hypr}/window-table (100%)
 rename env/.local/scripts/{ => hypr}/window-toggle-floating (100%)

diff --git a/dev-env b/dev-env
index 9378e9a..7e7b0b4 100755
--- a/dev-env
+++ b/dev-env
@@ -43,7 +43,11 @@ update_dirs() {
   pushd $1 &>/dev/null
   (
     # Copy everything except systemd, share, and zsh folders, they need treated differently.
-    configs=$(find . -mindepth 1 -maxdepth 1 -type d \( -name "systemd" -o -name "zsh" -o -name "share" \) -prune -o -type d -print)
+    configs=$(
+      find . -mindepth 1 -maxdepth 1 -type d \
+        \( -name "systemd" -o -name "zsh" -o -name "share" -o -name "scripts" \) \
+        -prune -o -type d -print
+    )
     for c in $configs; do
       directory=${2%/}/${c#./}
       log "    removing: rm -rf $directory"
@@ -102,6 +106,11 @@ copy_files() {
 update_dirs $DEV_ENV/env/.config $XDG_CONFIG_HOME
 update_dirs $DEV_ENV/env/.local $HOME/.local
 
+# SCRIPTS
+mkdir -p ~/.local/scripts >/dev/null 2>&1
+update_dirs $DEV_ENV/env/.local/scripts $HOME/.local/scripts
+copy_files $DEV_ENV/env/.local/scripts $HOME/.local/scripts
+
 # SYSTEMD
 mkdir -p $XDG_CONFIG_HOME/systemd/user >/dev/null 2>&1
 copy_files $DEV_ENV/env/.config/systemd/user $XDG_CONFIG_HOME/systemd/user
@@ -134,7 +143,9 @@ mkdir -p $XDG_DATA_HOME/applications/icons
 copy_files $DEV_ENV/env/.local/share/applications $XDG_DATA_HOME/applications
 copy_files $DEV_ENV/env/.local/share/applications/icons $XDG_DATA_HOME/applications/icons
 
-systemctl --user daemon-reload
-hyprctl reload
-espanso service restart
-exec zsh -l
+if [[ $dry_run == "0" ]]; then
+  systemctl --user daemon-reload
+  hyprctl reload
+  espanso service restart
+  exec zsh -l
+fi
diff --git a/env/.config/hypr/keybinds.conf b/env/.config/hypr/keybinds.conf
index 762561a..2c1fc1a 100644
--- a/env/.config/hypr/keybinds.conf
+++ b/env/.config/hypr/keybinds.conf
@@ -14,9 +14,9 @@ $browser = uwsm app -- zen-browser
 $fileManager = $terminal -e yazi
 $fileBrowser = uwsm app -- nautilus
 $menu = uwsm app -- walker
-$scripts = ~/.local/scripts
+$scripts = ~/.local/scripts/hypr
 $pwa = $scripts/launch-webapp
-$tmuxSessionator = $scripts/tmux-sessionator
+$tmuxSessionator = ~/.local/scripts/tmux-sessionator
 $clipboardHistory = com.ghostty.clipse $terminal --class=com.ghostty.clipse -e clipse
 $uninstallDesktop = $terminal --class=com.ghostty.float -e $scripts/uninstall-desktop-app
 $housecallPro = https://pro.housecallpro.com/app/calendar_new
diff --git a/env/.config/zsh/.zshrc b/env/.config/zsh/.zshrc
index bd2c6bb..7b7f6f4 100755
--- a/env/.config/zsh/.zshrc
+++ b/env/.config/zsh/.zshrc
@@ -65,6 +65,7 @@ path_prepend \
   "$XDG_DATA_HOME/bin" \
   "$HOME/.local/bin" \
   "$SCRIPTS" \
+  "$SCRIPTS/hypr" \
   "$HOME/.local/pnpm" \
   "$CARGO_HOME/bin" \
   "$HOME/.local/bin"
diff --git a/env/.local/scripts/close-windows b/env/.local/scripts/hypr/close-windows
similarity index 100%
rename from env/.local/scripts/close-windows
rename to env/.local/scripts/hypr/close-windows
diff --git a/env/.local/scripts/install-webapp b/env/.local/scripts/hypr/install-webapp
similarity index 98%
rename from env/.local/scripts/install-webapp
rename to env/.local/scripts/hypr/install-webapp
index af48a6c..911f151 100755
--- a/env/.local/scripts/install-webapp
+++ b/env/.local/scripts/hypr/install-webapp
@@ -160,7 +160,7 @@ fi
 if [[ -n $CUSTOM_EXEC ]] && [[ ! $CUSTOM_EXEC == "null" ]]; then
   EXEC_COMMAND="$CUSTOM_EXEC"
 else
-  EXEC_COMMAND="${SCRIPTS:-$HOME/.local/scripts}/launch-webapp $APP_URL"
+  EXEC_COMMAND="${SCRIPTS:-$HOME/.local/scripts}/hypr/launch-webapp $APP_URL"
 fi
 
 # Create application .desktop file
diff --git a/env/.local/scripts/launch b/env/.local/scripts/hypr/launch
similarity index 100%
rename from env/.local/scripts/launch
rename to env/.local/scripts/hypr/launch
diff --git a/env/.local/scripts/launch-webapp b/env/.local/scripts/hypr/launch-webapp
similarity index 96%
rename from env/.local/scripts/launch-webapp
rename to env/.local/scripts/hypr/launch-webapp
index fd319a3..d7abcc6 100755
--- a/env/.local/scripts/launch-webapp
+++ b/env/.local/scripts/hypr/launch-webapp
@@ -1,11 +1,11 @@
-#!/usr/bin/env bash
+# /usr/bin/env bash
 
 # Adapted from https://github.com/basecamp/omarchy/tree/master?tab=readme-ov-file
 
 usage() {
   cat <<EOF
 
-Launches a url as a web application. This script relys on the 'launch-or' script. This
+Launches a url as a web application. This script relys on the 'launch' script. This
 essentially just generates the pattern and launch command to pass into that script.
 
 USAGE:
@@ -92,5 +92,5 @@ echo "URL: $url"
 echo "Launch args: ${launch_args[@]}"
 echo "App args: ${app_args}"
 
-$SCRIPTS/launch "${launch_args[@]}" "$(pattern)" \
+$SCRIPTS/hypr/launch "${launch_args[@]}" "$(pattern)" \
   setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$browser 2>/dev/null | head -1) --app="$url" "$app_args"
diff --git a/env/.local/scripts/mv-all-workspaces-to-monitor b/env/.local/scripts/hypr/mv-all-workspaces-to-monitor
similarity index 100%
rename from env/.local/scripts/mv-all-workspaces-to-monitor
rename to env/.local/scripts/hypr/mv-all-workspaces-to-monitor
diff --git a/env/.local/scripts/toggle-desktop b/env/.local/scripts/hypr/toggle-desktop
similarity index 100%
rename from env/.local/scripts/toggle-desktop
rename to env/.local/scripts/hypr/toggle-desktop
diff --git a/env/.local/scripts/toggle-internal-monitor b/env/.local/scripts/hypr/toggle-internal-monitor
similarity index 100%
rename from env/.local/scripts/toggle-internal-monitor
rename to env/.local/scripts/hypr/toggle-internal-monitor
diff --git a/env/.local/scripts/uninstall-desktop-app b/env/.local/scripts/hypr/uninstall-desktop-app
similarity index 100%
rename from env/.local/scripts/uninstall-desktop-app
rename to env/.local/scripts/hypr/uninstall-desktop-app
diff --git a/env/.local/scripts/waybar-restart b/env/.local/scripts/hypr/waybar-restart
similarity index 100%
rename from env/.local/scripts/waybar-restart
rename to env/.local/scripts/hypr/waybar-restart
diff --git a/env/.local/scripts/window-table b/env/.local/scripts/hypr/window-table
similarity index 100%
rename from env/.local/scripts/window-table
rename to env/.local/scripts/hypr/window-table
diff --git a/env/.local/scripts/window-toggle-floating b/env/.local/scripts/hypr/window-toggle-floating
similarity index 100%
rename from env/.local/scripts/window-toggle-floating
rename to env/.local/scripts/hypr/window-toggle-floating
diff --git a/gen b/gen
index 6f128a0..b9c5ea1 100755
--- a/gen
+++ b/gen
@@ -67,7 +67,7 @@ generate_webapp() {
 }
 
 generate_script() {
-  local dest="$DEV_ENV/env/.local/scripts/$file"
+  local dest="$DEV_ENV/env/.local/scripts/hypr/$file"
   fail_if_exists $dest
   log "Creating new script: $dest"
   printf "#!/usr/bin/env bash\n\n" >$dest
diff --git a/webapp b/webapp
index 336e78f..25d83e4 100755
--- a/webapp
+++ b/webapp
@@ -45,7 +45,7 @@ log() {
 
 install() {
   local file=$DEV_ENV/env/webapps/$(basename $1)
-  local script="$DEV_ENV/env/.local/scripts/install-webapp"
+  local script="$DEV_ENV/env/.local/scripts/hypr/install-webapp"
 
   if [[ ! -x $script ]]; then
     log "Failed to find install web app script."
@@ -69,7 +69,7 @@ install() {
 
 uninstall() {
   local file=$DEV_ENV/env/webapps/$(basename $1)
-  local script="$DEV_ENV/env/.local/scripts/uninstall-desktop-app"
+  local script="$DEV_ENV/env/.local/scripts/hypr/uninstall-desktop-app"
 
   if [[ ! -x $script ]]; then
     log "Failed to find uninstall web app script."