made get-reqs prettier. fixed script_dir overwrite

5 files changed, 61 insertions, 31 deletions

diff --git a/run.sh b/run.sh
index 4897b98..1f1f912 100755
--- a/run.sh
+++ b/run.sh
@@ -33,7 +33,7 @@ fi
 if [ "$1" != "" ]; then
     . "$script_dir/runs/$1.sh"
     if [ $run_runs_all == 1 ]; then
-        . "$script_dir/../runs-all/$1.sh"
+        . "$script_dir/runs-all/$1.sh"
     fi
 else
     for s in $runs_dir; do
diff --git a/runs-all/env.sh b/runs-all/env.sh
index fc2f99f..55dc4e1 100755
--- a/runs-all/env.sh
+++ b/runs-all/env.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+script_dir_2="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 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_2/../env/. "$DEV_ENV"
+[ -d "$script_dir_2/../env_private/env/" ] && cp -r $script_dir_2/../env_private/env/. "$DEV_ENV"
 
 path_dirs="$(find $DEV_ENV/.local/bin/scripts -type d)"
 
diff --git a/runs-all/get-reqs-arch.sh b/runs-all/get-reqs-arch.sh
index f54e322..8f1a4e8 100755
--- a/runs-all/get-reqs-arch.sh
+++ b/runs-all/get-reqs-arch.sh
@@ -2,24 +2,50 @@
 arch="$(uname -r | grep arch)"
 artix="$(uname -r | grep artix)"
 if [ $artix ] || [ $arch ]; then
-sudo="sudo"
-[ doas ] && sudo="doas"
+    sudo="sudo"
+    [ doas ] && sudo="doas"
 
-echo GETTING CURRENT REQS ARCH
+    echo GETTING ALL 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 ripgrep
-$sudo pacman -S fcitx5-im fcitx5-mozc networkmanager openvpn networkmanager-openvpn openresolv
-$sudo pacman -S wlogout hyprlock
+    git clone https://aur.archlinux.org/paru.git
+    cd paru
+    makepkg -si
 
-# for vr
-$sudo pacman -S cli11 eigen glib2 glib2-devel nlohmann-json patch fcitx5-im-emoji-picker-git
+    # read -p "continue? [Y/n]" uin
+    # [ "$uin" == "n" ] || [ "$uin" == "N" ] && exit 0
 
-# git clone https://aur.archlinux.org/paru.git
-# cd paru
-# makepkg -si
+    # xorg
+    $sudo pacman -S --noconfirm xorg-server libxft libxinerama
 
-paru -S dunst-git ttf-b612 sddm-theme-tokyo-night-git obs-studio-git gpu-screen-recorder gpu-screen-recorder-gtk urlview
+    # audio
+    $sudo pacman -S --noconfirm pipewire-pulse pipewire-alsa pipewire-jack qpwgraph
 
+    # hyprland
+    $sudo pacman -S --noconfirm wayland hyprland waybar wlogout hyprlock xdg-desktop-portal xdg-desktop-portal-hyprland xdg-desktop-portal-gtk qt6-wayland qt5-wayland
+    paru -S --noconfirm dunst-git sddm-theme-tokyo-night-git
 
-echo ---------------
+    #vpn stuff
+    $sudo pacman -S --noconfirm openvpn networkmanager-openvpn openresolv
+
+    #ime
+    $sudo pacman -S --noconfirm fcitx5-im fcitx5-mozc fcitx5-im-emoji-picker-git
+
+    # fonts
+    $sudo pacman -S --noconfirm font-manager ttf-inconsolata ttf-jetbrains-mono ttf-jetbrains-mono-nerd noto-fonts-emoji
+    paru -S --noconfirm ttf-b612
+
+    # for vr
+    $sudo pacman -S --noconfirm cli11 eigen glib2 glib2-devel nlohmann-json patch
+
+    # tools
+    $sudo pacman -S --noconfirm zsh bat ntfs-3g inetutils doas atuin gvfs-mtp btop htop wezterm rxvt-unicode lf ripgrep rofi-wayland networkmanager
+
+    # misc
+    $sudo pacman -S --noconfirm v4l2loopback-dkms sddm lxappearance reflector gnome-keyring yt-dlp grim
+    paru -S --noconfirm obs-studio-git gpu-screen-recorder gpu-screen-recorder-gtk urlview flameshot-git
+
+    # fun
+    $sudo pacman -S --noconfirm fastfetch cmus vlc cowsay openrgb steam
+
+    echo ---------------
 fi
diff --git a/runs/env.sh b/runs/env.sh
index 7d42323..a08be0a 100755
--- a/runs/env.sh
+++ b/runs/env.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
-script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+script_dir_2="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 echo DEPLOYING ENV
 
-cp $script_dir/../env/.bashrc "$DEV_ENV"
-cp $script_dir/../env/.bash_profile "$DEV_ENV"
-cp $script_dir/../env/.vimrc "$DEV_ENV"
-cp $script_dir/../env/.markdownlint.yaml "$DEV_ENV"
+cp $script_dir_2/../env/.bashrc "$DEV_ENV"
+cp $script_dir_2/../env/.bash_profile "$DEV_ENV"
+cp $script_dir_2/../env/.vimrc "$DEV_ENV"
+cp $script_dir_2/../env/.markdownlint.yaml "$DEV_ENV"
 mkdir "$DEV_ENV/.config"
-cp $script_dir/../env/.config/.profile "$DEV_ENV/.config"
-cp -r $script_dir/../env/.config/nvim "$DEV_ENV/.config"
-cp -r $script_dir/../env/.config/tmux "$DEV_ENV/.config"
-cp -r $script_dir/../env/.config/wezterm "$DEV_ENV/.config"
+cp $script_dir_2/../env/.config/.profile "$DEV_ENV/.config"
+cp -r $script_dir_2/../env/.config/nvim "$DEV_ENV/.config"
+cp -r $script_dir_2/../env/.config/tmux "$DEV_ENV/.config"
+cp -r $script_dir_2/../env/.config/wezterm "$DEV_ENV/.config"
 
 echo -----------------
diff --git a/runs/get-reqs-arch.sh b/runs/get-reqs-arch.sh
index f054d89..f81c958 100755
--- a/runs/get-reqs-arch.sh
+++ b/runs/get-reqs-arch.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
-sudo="sudo"
-[ doas ] && sudo="doas"
+arch="$(uname -r | grep arch)"
+artix="$(uname -r | grep artix)"
+if [ $artix ] || [ $arch ]; then
+    sudo="sudo"
+    [ doas ] && sudo="doas"
 
-echo GETTING MIN REQS
+    echo GETTING MIN REQS
 
-$sudo pacman -S neovim rsync man-db wget git lf fzf grep
+    $sudo pacman -S neovim rsync man-db wget git lf fzf grep
 
-echo -------------
+    echo -------------
+fi