From 0574377182f28a8449b1955d287bfa27cfc3fe88 Mon Sep 17 00:00:00 2001 From: iceyrazor Date: Tue, 29 Jul 2025 19:08:43 -0500 Subject: [PATCH] Squashed commit of the following: - the splittening. get reqs are now seperate files. and im using a loop --- env/.config/dunst/dunstrc | 2 +- env/.config/nvim/lua/yourmom/remap.lua | 4 +- runs-all/get-reqs-arch.sh | 126 ++++--------------------- runs-all/get-reqs-arch/audio.sh | 1 + runs-all/get-reqs-arch/fonts.sh | 2 + runs-all/get-reqs-arch/for-vr.sh | 1 + runs-all/get-reqs-arch/fun.sh | 1 + runs-all/get-reqs-arch/hyprland.sh | 2 + runs-all/get-reqs-arch/ime.sh | 1 + runs-all/get-reqs-arch/misc.sh | 2 + runs-all/get-reqs-arch/sway.sh | 2 + runs-all/get-reqs-arch/tools.sh | 1 + runs-all/get-reqs-arch/vpn-stuff.sh | 1 + runs-all/get-reqs-arch/wayland.sh | 2 + runs-all/get-reqs-arch/xorg.sh | 1 + 15 files changed, 40 insertions(+), 109 deletions(-) create mode 100755 runs-all/get-reqs-arch/audio.sh create mode 100755 runs-all/get-reqs-arch/fonts.sh create mode 100755 runs-all/get-reqs-arch/for-vr.sh create mode 100755 runs-all/get-reqs-arch/fun.sh create mode 100755 runs-all/get-reqs-arch/hyprland.sh create mode 100755 runs-all/get-reqs-arch/ime.sh create mode 100755 runs-all/get-reqs-arch/misc.sh create mode 100755 runs-all/get-reqs-arch/sway.sh create mode 100755 runs-all/get-reqs-arch/tools.sh create mode 100755 runs-all/get-reqs-arch/vpn-stuff.sh create mode 100755 runs-all/get-reqs-arch/wayland.sh create mode 100755 runs-all/get-reqs-arch/xorg.sh diff --git a/env/.config/dunst/dunstrc b/env/.config/dunst/dunstrc index 73b8868..0128360 100644 --- a/env/.config/dunst/dunstrc +++ b/env/.config/dunst/dunstrc @@ -5,7 +5,7 @@ # Which monitor should the notifications be displayed on. # i keep having to change this because hyprland ◔̯◔ - monitor = 0 + monitor = 1 # Display notification on focused monitor. Possible modes are: # mouse: follow mouse pointer diff --git a/env/.config/nvim/lua/yourmom/remap.lua b/env/.config/nvim/lua/yourmom/remap.lua index 131eff9..895203a 100755 --- a/env/.config/nvim/lua/yourmom/remap.lua +++ b/env/.config/nvim/lua/yourmom/remap.lua @@ -66,8 +66,8 @@ vim.keymap.set('n', 'tp', ':tabp') vim.keymap.set("n", "ee", "oif err != nil {}Oreturn err") -- terminal niceites -vim.keymap.set("n", "", ":", { desc = "Enter command mode" }) -vim.keymap.set("v", "", ":", { desc = "Enter command mode (visual)" }) +-- vim.keymap.set("n", "", ":", { desc = "Enter command mode" }) +-- vim.keymap.set("v", "", ":", { desc = "Enter command mode (visual)" }) vim.keymap.set("t", "", "", { desc = "Exit terminal" }) diff --git a/runs-all/get-reqs-arch.sh b/runs-all/get-reqs-arch.sh index 8ae0961..4f404d4 100755 --- a/runs-all/get-reqs-arch.sh +++ b/runs-all/get-reqs-arch.sh @@ -6,123 +6,37 @@ if [ "$ID" == "artix" ] || [ "$ID" == "arch" ]; then echo GETTING ALL REQS ARCH - # may split later. this will work for now - # cant think of a way of using loops other than awk or something or splitting it into files and doing the same thing i did with runs - # which i may do - doall=0 - xorg=0 - audio=0 - hyprland=0 - vpn=0 - ime=0 - fonts=0 - vr=0 - tools=0 - misc=0 - fun=0 - paru=0 - - read -p "do all? [y/N]" uin + #aur + install_aur=0 + read -p "install aur manager? [y/N]" uin if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then - doall=1 - else - read -p "paru? [y/N]" uin - if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then - paru=1 - fi - - read -p "xorg? [y/N]" uin - if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then - xorg=1 - fi - - read -p "audio? [y/N]" uin - if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then - audio=1 - fi - - read -p "hyprland? [y/N]" uin - if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then - hyprland=1 - fi - - read -p "vpn? [y/N]" uin - if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then - vpn=1 - fi - - read -p "ime? [y/N]" uin - if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then - ime=1 - fi - - read -p "fonts? [y/N]" uin - if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then - fonts=1 - fi - - read -p "vr? [y/N]" uin - if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then - vr=1 - fi - - read -p "tools? [y/N]" uin - if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then - tools=1 - fi - - read -p "misc? [y/N]" uin - if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then - misc=1 - fi - - read -p "fun? [y/N]" uin - if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then - fun=1 - fi + install_aur=1 fi - # aur manager aurm="paru" - if [ $doall == 1 ] || [ $paru == 1 ]; then + if [ $install_aur == 1 ]; then git clone https://aur.archlinux.org/paru.git cd paru makepkg -si fi + #ask what to install + reqs_dir="$(find $script_dir/runs-all/get-reqs-arch -mindepth 1 -maxdepth 1 -type f -executable)" + reqs_list=() - # xorg - [ $doall == 1 ] || [ $xorg == 1 ] && $sudo pacman -S --noconfirm xorg-server xorg-xinit libxft libxinerama + for s in $reqs_dir; do + read -p "$s? [y/N]" uin + if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then + reqs_list+=("$s") + fi + done + echo -------------- - # audio - [ $doall == 1 ] || [ $audio == 1 ] && $sudo pacman -S --noconfirm pipewire-pulse pipewire-alsa pipewire-jack qpwgraph - - # hyprland - [ $doall == 1 ] || [ $hyprland == 1 ] && $sudo pacman -S --noconfirm wayland hyprland waybar wlogout hyprlock xdg-desktop-portal xdg-desktop-portal-hyprland xdg-desktop-portal-gtk xdg-desktop-portal-wlr qt6-wayland qt5-wayland sway - [ $doall == 1 ] || [ $hyprland == 1 ] && $aurm -S --noconfirm dunst-git sddm-theme-tokyo-night-git - - # vpn stuff - [ $doall == 1 ] || [ $vpn == 1 ] && $sudo pacman -S --noconfirm openvpn networkmanager-openvpn openresolv - - # ime - [ $doall == 1 ] || [ $ime == 1 ] && $sudo pacman -S --noconfirm fcitx5-im fcitx5-mozc fcitx5-im-emoji-picker-git - - # fonts - [ $doall == 1 ] || [ $fonts == 1 ] && $sudo pacman -S --noconfirm font-manager ttf-inconsolata ttf-jetbrains-mono ttf-jetbrains-mono-nerd noto-fonts-emoji - [ $doall == 1 ] || [ $fonts == 1 ] && $aurm -S --noconfirm ttf-b612 - - # for vr - [ $doall == 1 ] || [ $vr == 1 ] && $sudo pacman -S --noconfirm cli11 eigen glib2 glib2-devel nlohmann-json patch - - # tools - [ $doall == 1 ] || [ $tools == 1 ] && $sudo pacman -S --noconfirm zsh bat ntfs-3g inetutils doas atuin gvfs-mtp btop htop wezterm rxvt-unicode lf ripgrep rofi-wayland networkmanager - - # misc - [ $doall == 1 ] || [ $misc == 1 ] && $sudo pacman -S --noconfirm v4l2loopback-dkms sddm lxappearance reflector gnome-keyring seahorse yt-dlp grim slurp libnotify - [ $doall == 1 ] || [ $misc == 1 ] && $aurm -S --noconfirm obs-studio-git gpu-screen-recorder gpu-screen-recorder-gtk urlview - - # fun - [ $doall == 1 ] || [ $fun == 1 ] && $sudo pacman -S --noconfirm fastfetch cmus vlc cowsay openrgb steam + #install + for s in "${reqs_list[@]}"; do + echo "running $s" + . "$s" + done echo --------------- fi diff --git a/runs-all/get-reqs-arch/audio.sh b/runs-all/get-reqs-arch/audio.sh new file mode 100755 index 0000000..1662941 --- /dev/null +++ b/runs-all/get-reqs-arch/audio.sh @@ -0,0 +1 @@ +$sudo pacman -S --noconfirm pipewire-pulse pipewire-alsa pipewire-jack qpwgraph diff --git a/runs-all/get-reqs-arch/fonts.sh b/runs-all/get-reqs-arch/fonts.sh new file mode 100755 index 0000000..6fa3410 --- /dev/null +++ b/runs-all/get-reqs-arch/fonts.sh @@ -0,0 +1,2 @@ +$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 new file mode 100755 index 0000000..938f030 --- /dev/null +++ b/runs-all/get-reqs-arch/for-vr.sh @@ -0,0 +1 @@ +$sudo pacman -S --noconfirm cli11 eigen glib2 glib2-devel nlohmann-json patch diff --git a/runs-all/get-reqs-arch/fun.sh b/runs-all/get-reqs-arch/fun.sh new file mode 100755 index 0000000..fec9793 --- /dev/null +++ b/runs-all/get-reqs-arch/fun.sh @@ -0,0 +1 @@ +$sudo pacman -S --noconfirm fastfetch cmus vlc cowsay openrgb steam diff --git a/runs-all/get-reqs-arch/hyprland.sh b/runs-all/get-reqs-arch/hyprland.sh new file mode 100755 index 0000000..7810582 --- /dev/null +++ b/runs-all/get-reqs-arch/hyprland.sh @@ -0,0 +1,2 @@ +$sudo pacman -S --noconfirm hyprland xdg-desktop-portal-hyprland +. wayland.sh diff --git a/runs-all/get-reqs-arch/ime.sh b/runs-all/get-reqs-arch/ime.sh new file mode 100755 index 0000000..a389271 --- /dev/null +++ b/runs-all/get-reqs-arch/ime.sh @@ -0,0 +1 @@ +$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 new file mode 100755 index 0000000..b85e738 --- /dev/null +++ b/runs-all/get-reqs-arch/misc.sh @@ -0,0 +1,2 @@ +$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 new file mode 100755 index 0000000..14f5aa1 --- /dev/null +++ b/runs-all/get-reqs-arch/sway.sh @@ -0,0 +1,2 @@ +$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 new file mode 100755 index 0000000..5fa807f --- /dev/null +++ b/runs-all/get-reqs-arch/tools.sh @@ -0,0 +1 @@ +$sudo pacman -S --noconfirm zsh bat ntfs-3g inetutils doas atuin gvfs-mtp btop htop wezterm rxvt-unicode lf ripgrep rofi-wayland networkmanager diff --git a/runs-all/get-reqs-arch/vpn-stuff.sh b/runs-all/get-reqs-arch/vpn-stuff.sh new file mode 100755 index 0000000..3c8529a --- /dev/null +++ b/runs-all/get-reqs-arch/vpn-stuff.sh @@ -0,0 +1 @@ +$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 new file mode 100755 index 0000000..3455bc3 --- /dev/null +++ b/runs-all/get-reqs-arch/wayland.sh @@ -0,0 +1,2 @@ +$sudo pacman -S --noconfirm wayland waybar wlogout hyprlock xdg-desktop-portal xdg-desktop-portal-gtk qt6-wayland qt5-wayland +$aurm -S --noconfirm dunst-git sddm-theme-tokyo-night-git diff --git a/runs-all/get-reqs-arch/xorg.sh b/runs-all/get-reqs-arch/xorg.sh new file mode 100755 index 0000000..2a37188 --- /dev/null +++ b/runs-all/get-reqs-arch/xorg.sh @@ -0,0 +1 @@ +$sudo pacman -S --noconfirm xorg-server xorg-xinit libxft libxinerama