16 files changed, 39 insertions, 22 deletions
diff --git a/runs-all/env.sh b/runs-all/env.sh
index 970fe3f..a3ae7e7 100755
--- a/runs-all/env.sh
+++ b/runs-all/env.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 echo DEPLOYING ENV ALL
-cp -r $script_dir/env/. "$DEV_ENV"
-[ -d "$script_dir/env_private/env/" ] && cp -r $script_dir/env_private/env/. "$DEV_ENV"
+cp -r "$script_dir/env/." "$DEV_ENV"
+[ -d "$script_dir/env_private/env/" ] && cp -r "$script_dir/env_private/env/." "$DEV_ENV"
 
 
 if [ ! -f "/etc/profile" ]; then
@@ -9,17 +9,17 @@ if [ ! -f "/etc/profile" ]; then
     echo SKIPPING SETTING \$PATH
 else
     export PATH=""
-    source /etc/profile
+    . /etc/profile
     paths="$PATH"
-    path_dirs="$(find $DEV_ENV/.local/bin/scripts -type d)"
+    path_dirs="$(find "$DEV_ENV/.local/bin/scripts" -type d)"
     yt_cli_dir="$(find ~/stuff/ -name youtube-playlist-cli -type d)"
 
     path_dirs="$path_dirs
 $yt_cli_dir
 $(find ~/stuff/ -name theme-setter -type d)
 $(find ~/.local/bin/blender* -maxdepth 0 -type d)
-$(find $script_dir/keep/scripts -type d)
-$(find $script_dir/env_private/keep/scripts -type d)"
+$(find "$script_dir/keep/scripts" -type d)
+$(find "$script_dir/env_private/keep/scripts" -type d)"
 
     for s in $path_dirs; do
         echo "adding $s to path"
diff --git a/runs-all/get-reqs-arch.sh b/runs-all/get-reqs-arch.sh
index 1292cdc..abc25d6 100755
--- a/runs-all/get-reqs-arch.sh
+++ b/runs-all/get-reqs-arch.sh
@@ -1,37 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 . /etc/os-release
-if [ "$ID" == "artix" ] || [ "$ID" == "arch" ]; then
+if [ "$ID" = "artix" ] || [ "$ID" = "arch" ]; then
     sudo="sudo"
-    [ doas ] && sudo="doas"
+    which doas && sudo="doas"
 
     echo GETTING ALL REQS ARCH
 
     #aur
     install_aur=0
-    read -p "install aur manager? [y/N]" uin
-    if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then
+    printf "install aur manager? [y/N]"
+    read -r uin
+    if [ "$uin" = "y" ] || [ "$uin" = "Y" ]; then
         install_aur=1
     fi
 
-    aurm="paru"
-    if [ $install_aur == 1 ]; then
-        git clone https://aur.archlinux.org/paru.git
-        cd paru
-        makepkg -si
-    fi
+    export aurm="paru"
 
     #ask what to install
-    reqs_dir="$(find $script_dir/runs-all/get-reqs-arch -mindepth 1 -maxdepth 1 -type f -executable)"
+    reqs_dir="$(find "$script_dir/runs-all/get-reqs-arch" -mindepth 1 -maxdepth 1 -type f -executable)"
     reqs_list=()
 
     for s in $reqs_dir; do
-        read -p "$s? [y/N]" uin
-        if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then
+        printf -- "%s? [y/N]" "$s"
+        read -r uin
+        if [ "$uin" = "y" ] || [ "$uin" = "Y" ]; then
             reqs_list+=("$s")
         fi
     done
     echo --------------
 
+    if [ $install_aur = 1 ]; then
+        git clone https://aur.archlinux.org/paru.git
+        cd paru || exit
+        makepkg -si
+    fi
+
     #install
     for s in "${reqs_list[@]}"; do
         echo "running $s"
diff --git a/runs-all/get-reqs-arch/audio.sh b/runs-all/get-reqs-arch/audio.sh
index f5588ab..ce4747d 100755
--- a/runs-all/get-reqs-arch/audio.sh
+++ b/runs-all/get-reqs-arch/audio.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm pipewire-pulse pipewire-alsa pipewire-jack
 $sudo pacman -S --noconfirm qpwgraph
diff --git a/runs-all/get-reqs-arch/fonts.sh b/runs-all/get-reqs-arch/fonts.sh
index 6fa3410..595a230 100755
--- a/runs-all/get-reqs-arch/fonts.sh
+++ b/runs-all/get-reqs-arch/fonts.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm font-manager ttf-inconsolata ttf-jetbrains-mono ttf-jetbrains-mono-nerd noto-fonts-emoji
 $aurm -S --noconfirm ttf-b612
diff --git a/runs-all/get-reqs-arch/for-vr.sh b/runs-all/get-reqs-arch/for-vr.sh
index 486c8e7..1d8634d 100755
--- a/runs-all/get-reqs-arch/for-vr.sh
+++ b/runs-all/get-reqs-arch/for-vr.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm cli11 eigen glib2 glib2-devel nlohmann-json patch
 # $sudo pacman -S --noconfirm boost-libs boost #solarxr
diff --git a/runs-all/get-reqs-arch/fun.sh b/runs-all/get-reqs-arch/fun.sh
index 2299334..55c727d 100755
--- a/runs-all/get-reqs-arch/fun.sh
+++ b/runs-all/get-reqs-arch/fun.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm fastfetch steam mpv mpv-mpris mpd
 $sudo pacman -S --noconfirm mpd-mpris rmpc cowsay openrgb 
diff --git a/runs-all/get-reqs-arch/hyprland.sh b/runs-all/get-reqs-arch/hyprland.sh
index 78f9b8a..4925a40 100755
--- a/runs-all/get-reqs-arch/hyprland.sh
+++ b/runs-all/get-reqs-arch/hyprland.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm hyprland xdg-desktop-portal-hyprland wlogout hyprlock 
 . wayland.sh
diff --git a/runs-all/get-reqs-arch/i3.sh b/runs-all/get-reqs-arch/i3.sh
index 873ba51..ecdac9b 100755
--- a/runs-all/get-reqs-arch/i3.sh
+++ b/runs-all/get-reqs-arch/i3.sh
@@ -1,6 +1,7 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm i3 i3blocks
 
 git clone --depth 1 https://github.com/vivien/i3blocks-contrib "$DEV_ENV/.config/i3blocks/git-dir"
 
-mv $DEV_ENV/.config/i3blocks/git-dir/* "$DEV_ENV/.config/i3blocks/"
+mv "$DEV_ENV/.config/i3blocks/git-dir/*" "$DEV_ENV/.config/i3blocks/"
 $sudo rm -r "$DEV_ENV/.config/i3blocks/git-dir"
diff --git a/runs-all/get-reqs-arch/ime.sh b/runs-all/get-reqs-arch/ime.sh
index a389271..4dc1821 100755
--- a/runs-all/get-reqs-arch/ime.sh
+++ b/runs-all/get-reqs-arch/ime.sh
@@ -1 +1,2 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm fcitx5-im fcitx5-mozc fcitx5-im-emoji-picker-git
diff --git a/runs-all/get-reqs-arch/misc.sh b/runs-all/get-reqs-arch/misc.sh
index b85e738..7053c12 100755
--- a/runs-all/get-reqs-arch/misc.sh
+++ b/runs-all/get-reqs-arch/misc.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm v4l2loopback-dkms sddm lxappearance reflector gnome-keyring seahorse yt-dlp grim slurp libnotify
 $aurm -S --noconfirm obs-studio-git gpu-screen-recorder gpu-screen-recorder-gtk urlview 
diff --git a/runs-all/get-reqs-arch/sway.sh b/runs-all/get-reqs-arch/sway.sh
index 14f5aa1..77ca5ee 100755
--- a/runs-all/get-reqs-arch/sway.sh
+++ b/runs-all/get-reqs-arch/sway.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm xdg-desktop-portal-wlr sway
 . wayland.sh
diff --git a/runs-all/get-reqs-arch/tools.sh b/runs-all/get-reqs-arch/tools.sh
index 0722b43..7ef85c8 100755
--- a/runs-all/get-reqs-arch/tools.sh
+++ b/runs-all/get-reqs-arch/tools.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm zsh ntfs-3g inetutils doas gvfs-mtp btop htop wezterm rxvt-unicode lf ripgrep rofi-wayland networkmanager bat 
 $sudo pacman -S --noconfirm atuin
 $aurm -S librewolf-bin
diff --git a/runs-all/get-reqs-arch/vpn-stuff.sh b/runs-all/get-reqs-arch/vpn-stuff.sh
index 3c8529a..b7e4529 100755
--- a/runs-all/get-reqs-arch/vpn-stuff.sh
+++ b/runs-all/get-reqs-arch/vpn-stuff.sh
@@ -1 +1,2 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm openvpn networkmanager-openvpn openresolv
diff --git a/runs-all/get-reqs-arch/wayland.sh b/runs-all/get-reqs-arch/wayland.sh
index a1fd2f6..2d5efcd 100755
--- a/runs-all/get-reqs-arch/wayland.sh
+++ b/runs-all/get-reqs-arch/wayland.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm wayland waybar xdg-desktop-portal xdg-desktop-portal-gtk qt6-wayland qt5-wayland xorg-xwayland
 $aurm -S --noconfirm dunst-git sddm-theme-tokyo-night-git
diff --git a/runs-all/get-reqs-arch/web.sh b/runs-all/get-reqs-arch/web.sh
index bd392fa..3c6e34a 100755
--- a/runs-all/get-reqs-arch/web.sh
+++ b/runs-all/get-reqs-arch/web.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
 $sudo pacman -S --noconfirm asciidoc asciidoctor
 $aurm -S --noconfirm ruby-asciidoctor-diagram ruby-asciidoctor-diagram-plantuml
diff --git a/runs-all/get-reqs-arch/xorg.sh b/runs-all/get-reqs-arch/xorg.sh
index 2a37188..15177b1 100755
--- a/runs-all/get-reqs-arch/xorg.sh
+++ b/runs-all/get-reqs-arch/xorg.sh
@@ -1 +1,2 @@
-$sudo pacman -S --noconfirm xorg-server xorg-xinit libxft libxinerama
+#!/bin/sh
+$sudo pacman -S --noconfirm xlibre-server xorg-xinit libxft libxinerama