diff --git a/Installation/arch.sh b/Installation/arch.sh index faea508..c5d8b3a 100644 --- a/Installation/arch.sh +++ b/Installation/arch.sh @@ -13,10 +13,6 @@ SYS_REMOVE='sudo pacman -Rns --noconfirm' # Desktop Specific # ## Gnome ## gnome_install() { - # All System Commands - SYS_INSTALL='sudo pacman -Sy --noconfirm' - FLH_INSTALL='sudo flatpak install -y' - # Installing System Packages $SYS_INSTALL gparted $SYS_INSTALL fractal @@ -29,9 +25,6 @@ gnome_install() { $FLH_INSTALL flathub net.ankiweb.Anki } gnome_debloat() { - # All System Commands - SYS_REMOVE='sudo pacman -Rns --noconfirm' - # Bloat Programs $SYS_REMOVE gnome-music $SYS_REMOVE gnome-system-monitor @@ -60,10 +53,6 @@ gnome() { } ## KDE Plasma ## kde_install() { - # All System Commands - SYS_INSTALL='sudo pacman -Sy --noconfirm' - AUR_INSTALL='yay -S --noconfirm' - # Installing System Packages $SYS_INSTALL korganizer kaddressbook $SYS_INSTALL kvantum @@ -87,11 +76,6 @@ kde() { } ## SWAY ## sway_install() { - # All System Commands - SYS_INSTALL='sudo pacman -Sy --noconfirm' - FLH_INSTALL='sudo flatpak install -y' - AUR_INSTALL='yay -S --noconfirm' - # Installing System Packages $SYS_INSTALL alacritty rclone yazi rofi wl-clipboard btop pacman-contrib $SYS_INSTALL galculator 7zip @@ -102,28 +86,25 @@ sway_install() { $AUR_INSTALL qimgv } sway_debloat() { - # All System Commands - SYS_REMOVE='sudo pacman -Rns --noconfirm' - # Removing System Packages $SYS_REMOVE foot } sway_system() { # Copying the Sway Config File to somewhere Useful mkdir -p ~/.config/sway - wget http://server.lan:3003/OBJNULL/LinuxScripts/raw/branch/main/Configs/sway.conf -O ~/.config/sway/config + wget $HOME_SERVER/sway.conf -O ~/.config/sway/config # Copying the Alacritty Config File to somewhere Useful mkdir -p ~/.config/alacritty - wget http://server.lan:3003/OBJNULL/LinuxScripts/raw/branch/main/Configs/alacritty.toml -O ~/.config/alacritty/alacritty.toml + wget $HOME_SERVER/alacritty.toml -O ~/.config/alacritty/alacritty.toml # Copying the GTK Config File to somewhere Useful mkdir -p ~/.config/gtk-3.0 - wget http://server.lan:3003/OBJNULL/LinuxScripts/raw/branch/main/Configs/gtk.ini -O ~/.config/gtk-3.0/settings.ini + wget $HOME_SERVER/gtk.ini -O ~/.config/gtk-3.0/settings.ini # Copying the Rofi Config File to somewhere Useful mkdir -p ~/.config/rofi - wget http://server.lan:3003/OBJNULL/LinuxScripts/raw/branch/main/Configs/rofi.rasi -O ~/.config/rofi/config.rasi + wget $HOME_SERVER/rofi.rasi -O ~/.config/rofi/config.rasi # Adding variables to Path echo "EDITOR=vim" | sudo tee -a /etc/environment @@ -145,9 +126,6 @@ sway() { # Functions install_yay() { - # System Install Command - SYS_INSTALL='sudo pacman -S --noconfirm' - # Installing Git $SYS_INSTALL git @@ -155,9 +133,6 @@ install_yay() { cd /tmp && git clone https://aur.archlinux.org/yay.git && cd yay && makepkg --noconfirm -si } install_pacman() { - # System Install Command - SYS_INSTALL='sudo pacman -S --noconfirm' - # Base Deps $SYS_INSTALL net-tools flatpak fish $SYS_INSTALL sof-firmware @@ -190,9 +165,6 @@ install_pacman() { $SYS_INSTALL blender gimp inkscape } install_aur() { - # AUR Install Command - AUR_INSTALL='yay -S --noconfirm' - # Base Dependencies $AUR_INSTALL zen-browser-bin @@ -206,9 +178,6 @@ install_aur() { $AUR_INSTALL flashpoint-launcher-bin } install_flat() { - # FLH Install Command - FLH_INSTALL='sudo flatpak install -y' - # Engineering (OrcaSlicer) wget https://github.com/SoftFever/OrcaSlicer/releases/download/v2.3.0/OrcaSlicer-Linux-flatpak_V2.3.0_x86_64.flatpak -O /tmp/orcaslicer.flatpak $FLH_INSTALL /tmp/orcaslicer.flatpak