made minimal dev deployer, moved script sudo calls to doas

10 files changed, 81 insertions, 33 deletions

diff --git a/env/.config/.profile b/env/.config/.profile
index 30a5ec1..6c62f87 100755
--- a/env/.config/.profile
+++ b/env/.config/.profile
@@ -50,6 +50,7 @@ alias ff='fastfetch -c $HOME/.config/fastfetch/10.jsonc 2> /dev/null || fastfetc
 alias ffchar='fastfetch -c $HOME/.config/fastfetch/ascii-char.jsonc'
 # alias fastfetch='fastfetch --localip-show-ipv4 0 --kitty-direct /home/iceyrazor/stuff/media/ICE/Sprite-0009.png --logo-width 40 --logo-height 20'
 [ "$(cat /etc/hostname)" = "Kasino" ] && alias fukn="doas $@"
+[ "$(cat /etc/hostname)" = "Witchen" ] && alias fukn="doas $@"
 [ "$(cat /etc/hostname)" = "Kan" ] && alias fukn="doas $@"
 alias numen="echo key x | fukn dotool && NUMEN_DMENU=rofi NUMEN_DMENU_OPTS='-show drun' LD_LIBRARY_PATH=/usr/lib/ numen & disown"
 
@@ -75,7 +76,7 @@ alias ygg="fukn bash -c 'mkdir /var/run/yggdrasil; yggdrasil -useconf < /etc/ygg
 alias alvr="WINIT_X11_SCALE_FACTOR=\"1\" /home/iceyrazor/stuff/manual-programs/dontsync/alvr_streamer_linux/bin/alvr_dashboard & disown"
 alias obss="obs && obs --enable-media-stream & disown"
 alias get_channel_id="xargs curl -s | grep -Eo 'channel_id=.{0,50}' | sed 's/\".*//g' | fzf | xargs printf \"https://www.youtube.com/feeds/videos.xml?%s\" | xclip -selection clipboard"
-alias dev-run="~/stuff/scripts/iceys-linux-stuffs/run.sh"
+alias dev="~/stuff/scripts/iceys-linux-stuffs/run.sh"
 
 alias killa="~/stuff/killall.sh"
 alias bbackup="~/stuff/scripts/system/backup/backup.sh"
diff --git a/env/.config/dunst/dunstrc b/env/.config/dunst/dunstrc
index c7e2197..0128360 100644
--- a/env/.config/dunst/dunstrc
+++ b/env/.config/dunst/dunstrc
@@ -4,7 +4,8 @@
     ### Display ###
 
     # Which monitor should the notifications be displayed on.
-    monitor = 0
+    # i keep having to change this because hyprland ◔̯◔
+    monitor = 1
 
     # Display notification on focused monitor.  Possible modes are:
     #   mouse: follow mouse pointer
diff --git a/env/.local/bin/scripts/set-pri-java.sh b/env/.local/bin/scripts/set-pri-java.sh
index 35a9769..6371ee0 100755
--- a/env/.local/bin/scripts/set-pri-java.sh
+++ b/env/.local/bin/scripts/set-pri-java.sh
@@ -1 +1 @@
-sudo renice -20 -p $(sudo pidof java)
+doas renice -20 -p $(doas pidof java)
diff --git a/env/.local/bin/system/stbar/killbar.sh b/env/.local/bin/system/stbar/killbar.sh
index 7e76af2..1450a84 100755
--- a/env/.local/bin/system/stbar/killbar.sh
+++ b/env/.local/bin/system/stbar/killbar.sh
@@ -6,5 +6,4 @@ pids=$(ps -AO pid | awk '/stbar.sh|newsboat-fetch.sh/ {print $1}')
 echo $pids
 $(sleep 3 && xsetroot -name "") & disown
 
-sudo kill -KILL $pids
 doas kill -KILL $pids
diff --git a/run.sh b/run.sh
index 628c39c..4897b98 100755
--- a/run.sh
+++ b/run.sh
@@ -2,20 +2,49 @@
 echo DEV_ENV "$DEV_ENV"
 [ ! -d "$DEV_ENV" ] && echo DEV_ENV DIRECTORY IS NOT FOUND && exit 1
 
+run_runs_all=0
+list_runs=0
+while getopts "al" opt; do
+    case "$opt" in
+        a) run_runs_all=1
+            ;;
+        l) list_runs=1
+            ;;
+    esac
+done
+
+shift $((OPTIND-1))
+[ "${1:-}" = "--" ] && shift
+
 
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 runs_dir="$(find $script_dir/runs -mindepth 1 -maxdepth 1 -type f -executable)"
+runs_dir_all="$(find $script_dir/runs-all -mindepth 1 -maxdepth 1 -type f -executable)"
+
+if [ $list_runs == 1 ]; then
+    printf "  runs --------------\n"
+    ls "$script_dir/runs"
+    printf "\n  runs-all ----------\n"
+    ls "$script_dir/runs-all"
+    exit 0
+fi
 
 if [ "$1" != "" ]; then
-    if [ "$1" == "ls" ]; then
-        ls "$script_dir/runs"
-    else
-        . "$script_dir/runs/$1.sh"
+    . "$script_dir/runs/$1.sh"
+    if [ $run_runs_all == 1 ]; then
+        . "$script_dir/../runs-all/$1.sh"
     fi
 else
     for s in $runs_dir; do
         echo running $s
         . "$s"
     done
+
+    if [ $run_runs_all == 1 ]; then
+        for s in $runs_dir_all; do
+            echo running $s
+            . "$s"
+        done
+    fi
 fi
diff --git a/runs-all/env.sh b/runs-all/env.sh
new file mode 100755
index 0000000..22f3138
--- /dev/null
+++ b/runs-all/env.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+echo RUNNING ENV ALL
+cp -r $script_dir/../env/. "$DEV_ENV"
+[ -d "$script_dir/../env_private/env/" ] && cp -r $script_dir/../env_private/env/. "$DEV_ENV"
+
+path_dirs="$(find $DEV_ENV/.local/bin/scripts -type d)"
+
+if [ ! -f "/etc/profile" ]; then
+    echo NO /etc/profile
+    echo SKIPPING SETTING \$PATH
+else
+    export PATH=""
+    source /etc/profile
+    paths="$PATH"
+    path_dirs="$path_dirs
+$(find ~/stuff/scripts/**/theme-setter -maxdepth 0 -type d)
+$(find ~/stuff/scripts/**/youtube-playlist-cli -maxdepth 0 -type d)
+$(find ~/stuff/scripts/system -maxdepth 2 -type d)"
+    for s in $path_dirs; do
+        echo "adding $s to path"
+        paths="$paths:$s"
+    done
+    echo "export PATH=\"$paths:\"" > "$DEV_ENV/.local/bin/system/paths.sh"
+    chmod u+x "$DEV_ENV/.local/bin/system/paths.sh"
+
+fi
+echo -----------------
diff --git a/runs/get-reqs-B-current-arch.sh b/runs-all/get-reqs-arch.sh
index d7134b6..6ad86be 100755
--- a/runs/get-reqs-B-current-arch.sh
+++ b/runs-all/get-reqs-arch.sh
@@ -8,7 +8,7 @@ sudo="sudo"
 echo GETTING CURRENT REQS ARCH
 
 $sudo pacman -S xorg-server libxft libxinerama pipewire-pulse pipewire-alsa pipewire-jack qpwgraph wezterm ttf-inconsolata sddm wayland hyprland waybar xdg-desktop-portal xdg-desktop-portal-hyprland xdg-desktop-portal-gtk zsh vlc v4l2loopback-dkms qt6-wayland qt5-wayland ntfs-3g gnome-keyring inetutils doas cowsay fastfetch yt-dlp ttf-jetbrains-mono ttf-jetbrains-mono-nerd noto-fonts-emoji font-manager atuin gvfs-mtp bat lxappearance cmus grim btop htop rxvt-unicode lf inetutils openrgb reflector steam rofi-wayland
-$sudo pacman -S fcitx5-im fcitx5-mozc
+$sudo pacman -S fcitx5-im fcitx5-mozc networkmanager openvpn networkmanager-openvpn openresolv
 
 # for vr
 $sudo pacman -S cli11 eigen glib2 glib2-devel nlohmann-json patch fcitx5-im-emoji-picker-git
@@ -17,7 +17,7 @@ $sudo pacman -S cli11 eigen glib2 glib2-devel nlohmann-json patch fcitx5-im-emoj
 # cd paru
 # makepkg -si
 
-paru -S dunst-git ttf-b612 sddm-theme-tokyo-night-git obs-studio-git gpu-screen-recorder gpu-screen-recorder-gtk
+paru -S dunst-git ttf-b612 sddm-theme-tokyo-night-git obs-studio-git gpu-screen-recorder gpu-screen-recorder-gtk urlview
 
 
 echo ---------------
diff --git a/runs/mimes.sh b/runs-all/mimes.sh
index 76f0f6c..76f0f6c 100755
--- a/runs/mimes.sh
+++ b/runs-all/mimes.sh
diff --git a/runs/env.sh b/runs/env.sh
index ce8aeca..b7da2e4 100755
--- a/runs/env.sh
+++ b/runs/env.sh
@@ -1,29 +1,18 @@
 #!/bin/bash
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
-echo DEPLOYING FILES
-cp -r $script_dir/../env/. "$DEV_ENV"
-[ -d "$script_dir/../env_private/env/" ] && cp -r $script_dir/../env_private/env/. "$DEV_ENV"
+echo RUNNING ENV
 
-path_dirs="$(find $DEV_ENV/.local/bin/scripts -type d)"
+cp -r $script_dir/../env/.bashrc "$DEV_ENV"
+cp -r $script_dir/../env/.bash_profile "$DEV_ENV"
+cp -r $script_dir/../env/.vimrc "$DEV_ENV"
+mkdir "$DEV_ENV/.config"
+cp -r $script_dir/../env/.config/.profile "$DEV_ENV/.config"
+mkdir "$DEV_ENV/.config/nvim"
+cp -r $script_dir/../env/.config/nvim "$DEV_ENV/.config/nvim"
+mkdir "$DEV_ENV/.config/tmux"
+cp -r $script_dir/../env/.config/tmux "$DEV_ENV/.config/tmux"
+mkdir "$DEV_ENV/.config/wezterm"
+cp -r $script_dir/../env/.config/wezterm "$DEV_ENV/.config/wezterm"
 
-if [ ! -f "/etc/profile" ]; then
-    echo NO /etc/profile
-    echo SKIPPING SETTING \$PATH
-else
-    export PATH=""
-    source /etc/profile
-    paths="$PATH"
-    path_dirs="$path_dirs
-$(find ~/stuff/scripts/**/theme-setter -maxdepth 0 -type d)
-$(find ~/stuff/scripts/**/youtube-playlist-cli -maxdepth 0 -type d)
-$(find ~/stuff/scripts/system -maxdepth 2 -type d)"
-    for s in $path_dirs; do
-        echo "adding $s to path"
-        paths="$paths:$s"
-    done
-    echo "export PATH=\"$paths:\"" > "$DEV_ENV/.local/bin/system/paths.sh"
-    chmod u+x "$DEV_ENV/.local/bin/system/paths.sh"
-
-fi
 echo -----------------
diff --git a/runs/get-reqs-A-min-arch.sh b/runs/get-reqs-arch.sh
index f054d89..f054d89 100755
--- a/runs/get-reqs-A-min-arch.sh
+++ b/runs/get-reqs-arch.sh