From 7c1c62a75d2483915c07d1da2b263e66ffadcbc0 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <kristians.cagulis@gmail.com>
Date: Mon, 28 Nov 2022 00:11:52 +0200
Subject: [PATCH] Minor fixes

---
 karbs.sh | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/karbs.sh b/karbs.sh
index 47a7a24..40b9e03 100755
--- a/karbs.sh
+++ b/karbs.sh
@@ -22,39 +22,39 @@ fi
 if pacman -Q paru; then
     :
 else
-    sudo pacman -S --noconfirm rust-src
-    git clone "https://aur.archlinux.org/paru-bin"
+    sudo pacman -S --noconfirm rust-src git wget
+    git clone https://aur.archlinux.org/paru-bin
     cd paru-bin || exit
     makepkg -si
     cd ..
     rm -rf paru-bin
 fi
 
-FILE="pkg-files/$DISPLAY_SERVER-pkgs.txt"
+FILE="pkg-files/$DISPLAY_SERVER-pkgs"
 
 if [ -f "$FILE" ]; then
-    paru -Syu --noconfirm --needed - < "pkg-files/$DISPLAY_SERVER-pkgs"
+    paru -Syu --noconfirm --needed - < $FILE
 else
-    curl -LO "https://raw.githubusercontent.com/kristoferssolo/karbs/main/pkg-files/$DISPLAY_SERVER-pkgs"
-    paru -Syu --noconfirm --needed - < "$DISPLAY_SERVER-pkgs"
-    rm -f "$DISPLAY_SERVER-pkgs"
+    curl -LO https://raw.githubusercontent.com/kristoferssolo/karbs/main/$FILE
+    paru -Syu --noconfirm --needed - < $DISPLAY_SERVER-pkgs
+    rm -f $DISPLAY_SERVER-pkgs
 fi
 
-git clone "https://github.com/kristoferssolo/solorice" "$HOME"
-git clone "https://github.com/kristoferssolo/SoloVim" "$HOME/.config/nvim"
-rm -rf "$HOME/{LICENSE,readme.md}"
-mkdir -p "$HOME/{Downloads,Documents,Videos,Music,Pictures/screenshots}"
+git clone https://github.com/kristoferssolo/solorice "$HOME"
+git clone https://github.com/kristoferssolo/SoloVim "$HOME"/.config/nvim
+rm -rf "$HOME"/{LICENSE,readme.md,.gitignore}
+mkdir -p "$HOME"/{Downloads,Documents,Videos,Music,Pictures/screenshots}
 
 if [ $DISPLAY_SERVER = "wayland" ]; then
-    rm -rf "$HOME/.config/{awesome,picom,sx,zsh/.zprofile-X11}"
-    mv "$HOME/.config/zsh/zprofile-wayland" "$HOME/.config/zsh/.zprofile"
+    rm -rf "$HOME"/.config/{awesome,picom,sx,zsh/.zprofile-X11}
+    mv "$HOME"/.config/zsh/zprofile-wayland "$HOME"/.config/zsh/.zprofile
     chsh -s /bin/zsh
     zsh
     Hyprland
 else
-    rm -rf "$HOME/.config/{hypr,waybar,zsh/.zprofile-wayland}"
-    mv "$HOME/.config/zsh/zprofile-X11" "$HOME/.config/zsh/.zprofile"
-    git clone "https://github.com/streetturtle/awesome-wm-widgets" "$HOME/.config/awesome/awesome-wm-widgets"
+    rm -rf "$HOME"/.config/{hypr,waybar,zsh/.zprofile-wayland}
+    mv "$HOME"/.config/zsh/zprofile-X11 "$HOME"/.config/zsh/.zprofile
+    git clone https://github.com/streetturtle/awesome-wm-widgets "$HOME"/.config/awesome/awesome-wm-widgets
     chsh -s /bin/zsh
     zsh
     echo -e "\n\n\033[1;31mFor weather widget to work, enter API-key from https://openweathermap.org, latitude and longitude in '~/.config/awesome/weather' file, each on seperate line.\033[0m"