Modify installation scripts to use new paths

arch-config/install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-#DO NOT MAKE CHANGES TO THE INSTALL SCRIPT HERE. USE arcolinux-config.sh IN ~/scripts FOR THAT
+#DO NOT MAKE CHANGES TO THE INSTALL SCRIPT HERE. USE arch-config.sh IN ~/scripts FOR THAT
 
 #change to home (does not show in terminal)
 cd $HOME
@@ -9,6 +9,6 @@ cd $HOME
 echo Launching arch-config.sh
 
 #make executable & launch arch-config.sh
-chmod +x ~/config/scripts/arch-config.sh
+chmod +x ~/configs/arch-config/scripts/arch-config.sh
-bash ~/config/scripts/arch-config.sh
+bash ~/configs/arch-config/scripts/arch-config.sh
 exit 0

arch-config/scripts/arch-config.sh

@@ -42,23 +42,18 @@ EOF
 cd "$HOME"
 
 # remove old installs
-rm -rf ~/config
+rm -rf ~/configs
 
 echo "Checking config file"
 
 #clone this repo
-git clone https://gitlab.com/RealStickman-arch/config.git &>/dev/null
+git clone https://gitea.exu.li/realstickman/configs.git &>/dev/null
-
-# make sure to use master branch
-#cd config
-#git checkout master &>/dev/null
-#cd ..
 
 # check if the install scripts are the same
 # NOTE Arguments get passed automatically now
-if ! cmp --silent "$HOME/scripts/arch-config.sh" "$HOME/config/scripts/arch-config.sh"; then
+if ! cmp --silent "$HOME/scripts/arch-config.sh" "$HOME/configs/arch-config/scripts/arch-config.sh"; then
     echo Removed old config file and launched new one.
-    rm "$HOME/scripts/arch-config.sh" && cp "$HOME/config/scripts/arch-config.sh" "$HOME/scripts/" && bash ~/scripts/arch-config.sh "$@"
+    rm "$HOME/scripts/arch-config.sh" && cp "$HOME/configs/arch-config/scripts/arch-config.sh" "$HOME/scripts/" && bash ~/scripts/arch-config.sh "$@"
 fi
 
 # if no seltheme file exists, ask to select a theme
@@ -192,6 +187,21 @@ if [[ -d ~/scripts/in_path ]]; then
     rm -r ~/scripts/in_path
 fi
 
+# remove old script pieces
+if [[ -d ~/scripts/pieces ]]; then
+    rm -r ~/scripts/pieces
+fi
+
+# remove old polybar scripts
+if [[ -d ~/scripts/polybar ]]; then
+    rm -r ~/scripts/polybar
+fi
+
+# remove archived scripts
+if [[ -d ~/scripts/archive ]]; then
+    rm -r ~/scripts/archive
+fi
+
 echo
 cat <<EOF
 ########################################
@@ -200,47 +210,48 @@ cat <<EOF
 EOF
 
 #copy folders
-cp -r ~/config/.config/ ~/
+cp -r ~/configs/arch-config/.config/ ~/
-cp -r ~/config/.local/ ~/
+cp -r ~/configs/arch-config/.local/ ~/
 #cp -r ~/config/Dokumente ~/
 #cp -r ~/config/.mozilla/firefox/default-release/* ~/.mozilla/firefox/*.default-release/
 #cp -r ~/config/.easystroke ~/
 #cp -r ~/config/.elvish ~/
-cp -r ~/config/.doom.d ~/
+cp -r ~/configs/arch-config/.doom.d ~/
-cp -r ~/config/.ssh ~/
+cp -r ~/configs/arch-config/.ssh ~/
+if [[ -d ~/.mozilla/firefox ]]; then
+    # NOTE check if firefox default-release directory exists. 1 is good, 0 is bad
+    firefoxdir=$(find ~/.mozilla/firefox/ -name \*.default-release | wc -l)
+    if [[ $firefoxdir -eq 1 ]]; then
+        cp -r ~/config/.mozilla/firefox/default-release/* ~/.mozilla/firefox/*.default-release/
+    else
+        echo "Please launch firefox and then update the config again"
+    fi
+else
+    echo "Please launch firefox and then update the config again"
+fi
 echo Copied folders
 
 #copy single files
-cp -r ~/config/.bashrc ~/
+cp -r ~/configs/arch-config/.bashrc ~/
-cp -r ~/config/.face ~/
+cp -r ~/configs/arch-config/.face ~/
-cp -r ~/config/.gtkrc-2.0 ~/
+cp -r ~/configs/arch-config/.gtkrc-2.0 ~/
-cp -r ~/config/.gitconfig ~/
+cp -r ~/configs/arch-config/.gitconfig ~/
-cp -r ~/config/.tmux.conf ~/
+cp -r ~/configs/arch-config/.tmux.conf ~/
-cp -r ~/config/.xinitrc ~/
+cp -r ~/configs/arch-config/.xinitrc ~/
-cp -r ~/config/.kopiaignore ~/
+cp -r ~/configs/arch-config/.kopiaignore ~/
 echo Copied files
 
 # make .xinitrc executable
 chmod +x ~/.xinitrc
 
 #copy scripts
-cp -r ~/config/scripts/ ~/
+cp -r ~/configs/arch-config/scripts/ ~/
 
 # copy cache
-cp -r ~/config/.cache ~/
+cp -r ~/configs/arch-config/.cache ~/
 
 #copy stuff to /etc
-sudo cp -r ~/config/etc /
+sudo cp -r ~/configs/arch-config/etc /
-#sudo rsync --exclude=default/grub ~/config/etc /etc/
-
-#read -r -p "Do you want to overwrite the grub config? [y/N] " response
-#if [[ "$response" =~ ^([yY][eE][sS][jJ]|[yY])$ ]]
-#then
-# copy config
-#    sudo cp ~/config/etc/default/grub /etc/default/
-# update grub
-#    sudo grub-mkconfig -o /boot/grub/grub.cfg
-#fi
 
 # NOTE Distro specific stuff
 distro=$(cat /etc/*-release | grep "^ID=")
@@ -251,41 +262,32 @@ if [ "$distro" == "ID=arch" ]; then
     sudo mv /etc/arch-pacman.conf /etc/pacman.conf
 fi
 
-# NOTE only for webkit2gtk version of lightdm
-#copy old lightdm themes (and maybe other stuff, idk)
-#sudo cp -r ~/config/var /
-
 #copy usr stuff
-sudo cp -r ~/config/usr /
+sudo cp -r ~/configs/arch-config/usr /
 
 # copy xresources
-cp ~/config/.Xresources ~/
+cp ~/configs/arch-config/.Xresources ~/
 
 ####################
 ###### Theme  ######
 ####################
 
-# remove old themes folder
-rm -rf ./themes
-
 # install theme selected in themes file
-git clone https://gitlab.com/RealStickman-arch/themes.git &>/dev/null
 seltheme="$(cat "$HOME/.seltheme")"
 if [[ "$seltheme" == "nyarch" ]]; then
     #cp -r "./themes/nyarch/i3" "$HOME/.config/"
-    cat "./themes/nyarch/i3/color" >>"$HOME/.config/i3/config"
+    cat "$HOME/configs/arch-themes/nyarch/i3/color" >>"$HOME/.config/i3/config"
-    cp -r "./themes/nyarch/polybar" "$HOME/.config/"
+    cp -r "$HOME/configs/arch-themes/nyarch/polybar" "$HOME/.config/"
     #cp -r "./themes/nyarch/neofetch/lowpoly_flamegirl_blue.txt" "$HOME/.config/neofetch/lowpoly_flamegirl.txt"
     #cp "./themes/.fehbg-nyarch" "$HOME/.fehbg"
     #sed -i 's/^NAME=".*"/NAME="Rawrch Linyux"/' /etc/os-release
 elif [[ "$seltheme" == "space-pink" ]]; then
     #cp -r "./themes/space-pink/i3" "$HOME/.config/"
-    cat "./themes/space-pink/i3/color" >>"$HOME/.config/i3/config"
+    cat "$HOME/configs/arch-themes/space-pink/i3/color" >>"$HOME/.config/i3/config"
-    cp -r "./themes/space-pink/polybar" "$HOME/.config/"
+    cp -r "$HOME/configs/arch-themes/space-pink/polybar" "$HOME/.config/"
     #cp -r "./themes/space-pink/neofetch/lowpoly_flamegirl_orange.txt" "$HOME/.config/neofetch/lowpoly_flamegirl.txt"
     #cp "./themes/.fehbg-space-pink" "$HOME/.fehbg"
 fi
-rm -rf ./themes
 
 # make fehbg executable
 chmod +x ~/.fehbg
@@ -310,16 +312,6 @@ git clone https://github.com/RealStickman/PSipcalc &>/dev/null
 cp ./PSipcalc/PSipcalc.ps1 "$HOME/scripts/in_path/sc-psipcalc"
 rm -rf ./PSipcalc
 
-####################
-####### Gimp #######
-####################
-
-#gimp plugins
-#mkdir ~/.config/GIMP/ || echo Not creating directory
-#mkdir ~/.config/GIMP/2.10/ || echo Not creating directory
-#mkdir -p ~/.config/GIMP/2.10/plug-ins/ || echo Not creating directory
-#rsync -ah ~/config/gimp-plugins/* ~/.config/GIMP/2.10/plug-ins/
-
 echo
 cat <<EOF
 ########################################
@@ -424,20 +416,10 @@ cat <<EOF
 ########################################
 EOF
 
-# automatically add ssh keys to agent
-#if ! grep -q "AddKeysToAgent yes" "$HOME/.ssh/config"; then
-#    echo 'AddKeysToAgent yes' | cat - "$HOME/.ssh/config" > temp && mv temp "$HOME/.ssh/config"
-#fi
-
 # set permissions for sudoers.d to root only
 sudo chown root:root -R /etc/sudoers.d/
 sudo chmod 600 -R /etc/sudoers.d/
 
-# unzip gimp plugins
-#echo Unzipping gimp plugins
-#unzip -o ~/.config/GIMP/2.10/plug-ins/export_layers-3.3.1.zip -d ~/.config/GIMP/2.10/plug-ins/ >/dev/null
-#rm ~/.config/GIMP/2.10/plug-ins/export_layers-3.3.1.zip >/dev/null
-
 # xfce settings
 # disable screensaver & locker
 /usr/bin/xfconf-query -c xfce4-session -n -t bool -p /startup/screensaver/enabled -s false
@@ -450,9 +432,6 @@ chmod +x -R ~/scripts
 # make applications executable
 chmod +x -R ~/.local/share/applications
 
-# set settings for nemo
-#bash ~/config/scripts/nemo-config.sh
-
 #remove downloaded folder
 rm -rf ~/config
 
@@ -488,11 +467,6 @@ fi
 # execute feh
 "$HOME/.fehbg"
 
-# NOTE working now
-# if [[ "$(ps aux | grep "FIXME")" ]]; then ...
-# ps aux | grep "\si3\s" breaks if i3 hasn't been restarted yet
-# ps aux | grep "\si3" works for both, not certain if other stuff could be detected as well
-# ps aux | grep "\si3\$" breaks if i3 has been restarted already in this session
 if ps aux | grep -E "\si3(\s|$)" &>/dev/null; then
     i3-msg restart 1>/dev/null
 fi
@@ -522,5 +496,4 @@ fi
 exec "$(getent passwd $LOGNAME | cut -d: -f7)"
 
 # exit successfully
-$(exit 0)
+exit 0
-echo "$?"

arch-config/scripts/dunst-backlight.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # You can call this script like this:
 # $./dunst-backlight.sh up
@@ -13,28 +13,28 @@ send_notification() {
     light=$(get_light)
     # Make the bar with the special character ─ (it's not dash -)
     # https://en.wikipedia.org/wiki/Box-drawing_character
-    bar=$(seq -s "─" $(($light/ 5)) | sed 's/[0-9]//g')
+    bar=$(seq -s "─" $(($light / 5)) | sed 's/[0-9]//g')
     # Send the notification
     dunstify -i whitebalance -r 2489 -a backlight-script "$light    $bar    "
 }
 
 case $1 in
     up)
-    # Increase backlight
+        # Increase backlight
-    xbacklight -inc 10 > /dev/null
+        xbacklight -inc 10 >/dev/null
-    #xbacklight -inc 10% > /dev/null # legacy xorg-xbacklight
+        #xbacklight -inc 10% > /dev/null # legacy xorg-xbacklight
-    send_notification
+        send_notification
-    #backlightraw=$(xbacklight -get)
+        #backlightraw=$(xbacklight -get)
-    #backlight=${backlightraw::-8}
+        #backlight=${backlightraw::-8}
-    #xbacklight -set "${backlight}0"
+        #xbacklight -set "${backlight}0"
-	;;
+        ;;
     down)
-    # Decrease backlight
+        # Decrease backlight
-    xbacklight -dec 10 > /dev/null
+        xbacklight -dec 10 >/dev/null
-    #xbacklight -dec 9% > /dev/null # legacy xorg-xbacklight
+        #xbacklight -dec 9% > /dev/null # legacy xorg-xbacklight
-    send_notification
+        send_notification
-    #backlightraw=$(xbacklight -get)
+        #backlightraw=$(xbacklight -get)
-    #backlight=${backlightraw::-8}
+        #backlight=${backlightraw::-8}
-    #xbacklight -set "${backlight}0"
+        #xbacklight -set "${backlight}0"
-	;;
+        ;;
 esac

arch-config/scripts/dunst-volume.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 
@@ -12,7 +12,7 @@ get_volume() {
 }
 
 is_mute() {
-    amixer -D pulse get Master | grep '%' | grep -oE '[^ ]+$' | grep off > /dev/null
+    amixer -D pulse get Master | grep '%' | grep -oE '[^ ]+$' | grep off >/dev/null
 }
 
 send_notification() {
@@ -26,24 +26,24 @@ send_notification() {
 
 case $1 in
     up)
-	# Set the volume on (if it was muted)
+        # Set the volume on (if it was muted)
-	amixer -D pulse set Master on > /dev/null
+        amixer -D pulse set Master on >/dev/null
-	# Up the volume (+ 5%)
+        # Up the volume (+ 5%)
-	amixer -D pulse sset Master 5%+ > /dev/null
+        amixer -D pulse sset Master 5%+ >/dev/null
-	send_notification
+        send_notification
-	;;
+        ;;
     down)
-	amixer -D pulse set Master on > /dev/null
+        amixer -D pulse set Master on >/dev/null
-	amixer -D pulse sset Master 5%- > /dev/null
+        amixer -D pulse sset Master 5%- >/dev/null
-	send_notification
+        send_notification
-	;;
+        ;;
     mute)
-    	# Toggle mute
+        # Toggle mute
-	amixer -D pulse set Master 1+ toggle > /dev/null
+        amixer -D pulse set Master 1+ toggle >/dev/null
-	if is_mute ; then
+        if is_mute; then
-	    dunstify -i audio-volume-muted -r 2593 -u normal "Mute"
+            dunstify -i audio-volume-muted -r 2593 -u normal "Mute"
-	else
+        else
-	    send_notification
+            send_notification
-	fi
+        fi
-	;;
+        ;;
 esac

arch-config/scripts/startup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 

arch-setup/install.sh

@@ -20,9 +20,6 @@ fi
 sudo pacman -Syu
 sudo pacman -S --needed python-pip
 
-#in_xfce=0
-#in_i3gaps=0
-
 cmd=(dialog --separate-output --checklist "Select Desktop environment/Window manager:" 22 76 16)
 options=(0 "[DE] xfce4" off # any option can be set to default to "on"
     100 "[WM] i3-gaps" off)
@@ -31,20 +28,14 @@ clear
 for choice in $choices; do
     case $choice in
         0)
-            #in_xfce=1
             echo "xfce4" >>"$setupdir/selectedpkgs.txt"
             ;;
         100)
-            #in_i3gaps=1
             echo "i3-gaps" >>"$setupdir/selectedpkgs.txt"
             ;;
     esac
 done
 
-#in_firefox=0
-#in_chromium=0
-#in_tor=0
-
 cmd=(dialog --separate-output --checklist "Select browsers:" 22 76 16)
 options=(0 "Firefox" on # any option can be set to default to "on"
     10 "Chromium" off
@@ -54,39 +45,17 @@ clear
 for choice in $choices; do
     case $choice in
         0)
-            #in_firefox=1
             echo "firefox" >>"$setupdir/selectedpkgs.txt"
             ;;
         10)
-            #in_chromium=1
             echo "chromium" >>"$setupdir/selectedpkgs.txt"
             ;;
         20)
-            #in_tor=1
             echo "torbrowser-launcher" >>"$setupdir/selectedpkgs.txt"
             ;;
     esac
 done
 
-#in_virtmanager=0
-#in_vmware15=0
-#in_steam=0
-#in_lutris=0
-#in_blender=0
-#in_krita=0
-#in_youtubedl=0
-#in_discord=0
-#in_handbrake=0
-#in_gimp=0
-#in_audacity=0
-#in_mangohud=0
-#in_liferea=0
-#in_fractal=0
-#in_bettergram=0
-#in_waifu2x=0
-#in_telegram=0
-#in_element=0
-
 cmd=(dialog --separate-output --checklist "Select other programs:" 22 76 16)
 options=(0 "VirtManager" off # any option can be set to default to "on"
     1 "VMWare Workstation" off
@@ -96,7 +65,6 @@ options=(0 "VirtManager" off # any option can be set to default to "on"
     13 "Minigalaxy" off
     20 "Krita" off
     21 "Gimp" off
-    #30 "Youtube-dl" off
     31 "YT-dlp" on
     32 "Megatools" off
     40 "Handbrake" off
@@ -112,19 +80,15 @@ clear
 for choice in $choices; do
     case $choice in
         0)
-            #in_virtmanager=1
             printf '%s\n' 'qemu' 'virt-manager' 'ebtables' 'dnsmasq' >>"$setupdir/selectedpkgs.txt"
             ;;
         1)
-            #in_vmware15=1
             echo "vmware-workstation" >>"$setupdir/aurselectedpkgs.txt"
             ;;
         10)
-            #in_steam=1
             printf '%s\n' 'steam' 'steam-native-runtime' >>"$setupdir/selectedpkgs.txt"
             ;;
         11)
-            #in_lutris=1
             echo "lutris" >>"$setupdir/selectedpkgs.txt"
             ;;
         12)
@@ -134,17 +98,11 @@ for choice in $choices; do
             echo "minigalaxy" >>"$setupdir/aurselectedpkgs.txt"
             ;;
         20)
-            #in_krita=1
             echo "krita" >>"$setupdir/selectedpkgs.txt"
             ;;
         21)
-            #in_gimp=1
             echo "gimp" >>"$setupdir/selectedpkgs.txt"
             ;;
-        30)
-            #in_youtubedl=1
-            echo "youtube-dl" >>"$setupdir/selectedpkgs.txt"
-            ;;
         31)
             printf '%s\n' 'yt-dlp' 'yt-dlp-drop-in' >>"$setupdir/aurselectedpkgs.txt"
             ;;
@@ -152,29 +110,21 @@ for choice in $choices; do
             echo "megatools-bin" >>"$setupdir/aurselectedpkgs.txt"
             ;;
         40)
-            #in_handbrake=1
             echo "handbrake" >>"$setupdir/selectedpkgs.txt"
             ;;
         41)
-            # TODO
+            echo "audacity" >>"$setupdir/selectedpkgs.txt"
-            #in_audacity=1
-            #echo "audacity" >> "$setupdir/selectedpkgs.txt"
-            echo "The situation with audacity is unknown right now. Check for FOSS no-telemetry forks"
             ;;
         42)
             printf '%s\n' 'k3b' 'cdparanoia' 'cdrdao' 'cdrtools' 'dvd+rw-tools' 'emovix' 'transcode' 'vcdimager' >>"$setupdir/selectedpkgs.txt"
             ;;
         60)
-            #in_discord=1
+            echo "discord" >>"$setupdir/selectedpkgs.txt"
-            #echo "discord" >> "$setupdir/selectedpkgs.txt"
-            echo "discord_arch_electron" >>"$setupdir/aurselectedpkgs.txt"
             ;;
         61)
-            #in_element=1
             echo "element-desktop" >>"$setupdir/selectedpkgs.txt"
             ;;
         62)
-            #in_telegram=1
             echo "telegram-desktop" >>"$setupdir/selectedpkgs.txt"
             ;;
         70)
@@ -186,31 +136,7 @@ for choice in $choices; do
     esac
 done
 
-: '
-in_acpufreq=0
-
-cmd=(dialog --separate-output --checklist "Performance and Battery life" 22 76 16)
-options=(0 "auto-cpufreq" off)
-choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
-clear
-for choice in $choices
-do
-    case $choice in
-        0)
-            in_acpufreq=1
-            echo "auto-cpufreq-git" >> "$setupdir/aurselectedpkgs.txt"
-            # TODO Handle rest of installation
-            ;;
-        1)
-            #in_corectrl=1
-            echo "corectrl" >> "$setupdir/aurselectedpkgs.txt"
-            ;;
-    esac
-done
-'
-
 in_doomemacs=0
-#in_vscodium=0
 in_podman=0
 
 cmd=(dialog --separate-output --checklist "Devtools" 22 76 16)
@@ -229,7 +155,6 @@ for choice in $choices; do
             # TODO handle rest of installation
             ;;
         1)
-            #in_vscodium=1
             echo "vscodium-bin" >>"$setupdir/aurselectedpkgs.txt"
             ;;
         10)
@@ -238,34 +163,22 @@ for choice in $choices; do
     esac
 done
 
-#in_teams=0
-#in_slack=0
-
 cmd=(dialog --separate-output --checklist "School and work communication" 22 76 16)
 options=(0 "Teams" off
-    1 "Slack" off
     10 "OneNote" off)
 choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
 clear
 for choice in $choices; do
     case $choice in
         0)
-            #in_teams=1
             echo "teams" >>"$setupdir/aurselectedpkgs.txt"
             ;;
-        1)
-            #in_slack=1
-            #echo "slack-desktop" >> "$setupdir/aurselectedpkgs.txt"
-            echo "slack-electron" >>"$setupdir/aurselectedpkgs.txt"
-            ;;
         10)
             echo "p3x-onenote" >>"$setupdir/aurselectedpkgs.txt"
             ;;
     esac
 done
 
-#in_pkgstats=0
-
 cmd=(dialog --separate-output --checklist "Report installed packages?" 22 76 16)
 options=(0 "pkgstats" off)
 choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
@@ -273,7 +186,6 @@ clear
 for choice in $choices; do
     case $choice in
         0)
-            #in_pkgstats=1
             echo "pkgstats" >>"$setupdir/selectedpkgs.txt"
             ;;
     esac
@@ -317,18 +229,6 @@ echo Installing default pacman programs
 sudo pacman -S --needed - <"$setupdir/packages/officialpkgs.txt"
 echo Installed official programs
 
-# pip
-#echo Installing python programs
-#pip install --user autotrash
-#echo Installed python programs
-
-# REVIEW Patched neofetch version to remove Color codes
-#git clone https://github.com/RealStickman/neofetch
-#cd neofetch
-#sudo make install
-#cd ..
-#rm -rf neofetch
-
 # install paru-bin with yay, or download paru from github
 if [[ $(pacman -Q | grep yay) ]] && [[ ! $(pacman -Q | grep paru) ]]; then
     echo "Installing paru"
@@ -374,249 +274,6 @@ sudo pacman -S --needed - <"$setupdir/selectedpkgs.txt"
 echo Installing from AUR
 paru -S --needed - <"$setupdir/aurselectedpkgs.txt"
 
-: '
-if [ $in_vmware15 -eq 1 ]; then
-    echo "Installing VMWare Workstation 15"
-    paru -S --needed vmware-workstation15
-else
-    echo "Skipping VMWare Workstation 15"
-fi
-'
-
-#DEs & WMs
-: '
-if [ $in_xfce -eq 1 ]; then
-    echo "Installing xfce"
-    sudo pacman -S --needed xfce4
-else
-    echo "Skipping xfce"
-fi
-'
-
-: '
-if [ $in_i3gaps -eq 1 ]; then
-    echo "Installing i3-gaps"
-    sudo pacman -S --needed i3-gaps
-else   
-    echo "Skipping i3-gaps"
-fi
-'
-
-: '
-#browsers
-if [ $in_firefox -eq 1 ]; then
-    echo "Installing Firefox"
-    sudo pacman -S --needed firefox
-else
-    echo "Skipping Firefox"
-fi
-'
-
-: '
-if [ $in_chromium -eq 1 ]; then
-    echo "Installing Chromium"
-    sudo pacman -S --needed chromium
-else
-    echo "Skipping Chromium"
-fi
-'
-
-: '
-if [ $in_netsurf -eq 1 ]; then
-    echo "Installing Netsurf"
-    sudo pacman -S --needed netsurf
-else
-    echo "Skipping Netsurf"
-fi
-'
-
-: '
-if [ $in_icecat -eq 1 ]; then
-    echo "Installing Icecat"
-    paru -S --needed icecat-bin
-else
-    echo "Skipping Icecat"
-fi
-'
-
-: '
-if [ $in_tor -eq 1 ]; then
-    echo "Installing Tor"
-    sudo pacman -S --needed torbrowser-launcher
-else
-    echo "Skipping Tor"
-fi
-'
-
-#other programs
-: '
-if [ $in_virtmanager -eq 1 ]; then
-    echo "Installing VirtManager"
-    sudo pacman -S --needed qemu virt-manager
-else
-    echo "Skipping VirtManager"
-fi
-'
-
-: '
-if [ $in_steam -eq 1 ]; then
-    echo "Installing Steam"
-    sudo pacman -S --needed steam steam-native-runtime
-else
-    echo "Skipping Steam"
-fi
-'
-
-: '
-if [ $in_lutris -eq 1 ]; then
-    echo "Installing Lutris"
-    sudo pacman -S --needed lutris
-else
-    echo "Skipping Lutris"
-fi
-'
-
-: '
-if [ $in_blender -eq 1 ]; then
-    echo "Installing Blender"
-    sudo pacman -S --needed blender
-else
-    echo "Skipping Blender"
-fi
-'
-
-: '
-if [ $in_krita -eq 1 ]; then
-    echo "Installing Krita"
-    sudo pacman -S --needed krita
-else
-    echo "Skipping Krita"
-fi
-'
-
-: '
-if [ $in_youtubedl -eq 1 ]; then
-    echo "Installing Youtube-dl"
-    sudo pacman -S --needed youtube-dl
-else
-    echo "Skipping Youtube-dl"
-fi
-'
-
-: '
-if [ $in_discord -eq 1 ]; then
-    echo "Installing Discord"
-    #sudo pacman -S --needed discord
-    paru -S discord_arch_electron
-else
-    echo "Skipping Discord"
-fi
-'
-
-: '
-if [ $in_handbrake -eq 1 ]; then
-    echo "Installing Handbrake"
-    sudo pacman -S --needed handbrake
-else
-    echo "Skipping Handbrake"
-fi
-'
-
-: '
-if [ $in_gimp -eq 1 ]; then
-    echo "Installing Gimp"
-    sudo pacman -S --needed gimp
-else
-    echo "Skipping Gimp"
-fi
-'
-
-: '
-if [ $in_audacity -eq 1 ]; then
-    echo "Installing Audacity"
-    sudo pacman -S --needed audacity
-else
-    echo "Skipping Audacity"
-fi
-'
-
-: '
-if [ $in_mangohud -eq 1 ]; then
-    echo "Installing MangoHud"
-    git clone --recurse-submodules https://github.com/flightlessmango/MangoHud.git
-    ./MangoHud/build.sh install
-else
-    echo "Skipping MangoHud"
-fi
-'
-
-: '
-if [ $in_liferea -eq 1 ]; then
-    echo "Installing Liferea"
-    paru -S --needed liferea
-else
-    echo "Skipping Liferea"
-fi
-'
-
-: '
-if [ $in_fractal -eq 1 ]; then
-    echo "Installing Fractal"
-    sudo pacman -S --needed fractal
-else
-    echo "Skipping Fractal"
-fi
-'
-
-: '
-if [ $in_bettergram -eq 1 ]; then
-    echo "Installing Bettergram"
-    paru -S --needed bettergram
-else
-    echo "Skipping Bettergram"
-fi
-'
-
-: '
-if [ $in_waifu2x -eq 1 ]; then
-    echo "Installing Waifu2x"
-    paru -S --needed waifu2x-ncnn-vulkan
-else
-    echo "Skipping Waifu2x"
-fi
-'
-
-: '
-if [ $in_telegram -eq 1 ]; then
-    echo "Installing Telegram"
-    sudo pacman -S --needed telegram-desktop
-else
-    echo "Skipping Telegram"
-fi
-'
-
-: '
-if [ $in_element -eq 1 ]; then
-    echo "Installing Element"
-    sudo pacman -S --needed element-desktop
-else
-    echo "Skipping Element"
-fi
-'
-
-: '
-#performance and battery life
-if [ $in_acpufreq -eq 1 ]; then
-    echo "Installing auto-cpufreq"
-    paru -S --needed auto-cpufreq-git
-    sudo auto-cpufreq --install
-    sudo systemctl start auto-cpufreq
-    sudo systemctl enable auto-cpufreq
-else
-    echo "Skipping auto-cpufreq"
-fi
-'
-
 #devtools
 if [ $in_doomemacs -eq 1 ]; then
     echo "Installing doom-emacs"
@@ -630,15 +287,6 @@ else
     echo "Skipping doom-emacs"
 fi
 
-: '
-if [ $in_vscodium -eq 1 ]; then
-    echo "Installing vscodium"
-    paru -S --needed vscodium-bin
-else
-    echo "Skipping vscodium"
-fi
-'
-
 if [ $in_podman -eq 1 ]; then
     echo "Installing podman"
     sudo pacman -S --needed podman podman-dnsname fuse-overlayfs buildah
@@ -650,36 +298,6 @@ else
     echo "Skipping podman"
 fi
 
-: '
-#other social stuff
-if [ $in_teams -eq 1 ]; then
-    echo "Installing teams"
-    paru -S --needed teams
-else
-    echo "Skipping teams"
-fi
-'
-
-: '
-if [ $in_slack -eq 1 ]; then
-    echo "Installing slack"
-    #paru -S --needed slack-desktop
-    paru -s --needed slack-electron
-else
-    echo "Skipping slack"
-fi
-'
-
-: '
-#stats
-if [ $in_pkgstats -eq 1 ]; then
-    echo "Installing pkgstats"
-    sudo pacman -S --needed pkgstats
-else
-    echo "Skipping pkgstats"
-fi
-'
-
 # other system configs
 # arco pc
 if [ $in_arco_pc -eq 1 ]; then
@@ -717,9 +335,6 @@ sudo systemctl enable betterlockscreen@$USER
 
 # enable firewall
 echo "Enabling Firewall"
-#sudo ufw enable
-#sudo systemctl enable ufw
-#sudo systemctl start ufw
 sudo systemctl enable --now firewalld
 sudo firewall-cmd --zone=public --permanent --remove-service=ssh
 
@@ -740,20 +355,8 @@ sudo bash install.sh
 # go back
 cd ../../
 
-#Changes to home folder automatically now, no need to be extra careful anymore.
-git clone https://gitlab.com/RealStickman-arch/config
-echo Finished downloading config
-
-# Download git repos
-bash ~/config/scripts/sc-git-pull
-
-#cleanup
-rm -rf ~/setup
-echo Removed setup files
-
-#downloading config
 echo Setting config
-bash ~/config/install.sh
+bash ~/configs/arch-config/install.sh
 
 if [[ $(pacman -Q pkgstats 2>/dev/null >/dev/null) ]]; then
     pkgstats