From b6c053fb9775f49df5bb97e0194e78b8186c8e7f Mon Sep 17 00:00:00 2001
From: Stephan Raabe <mail@stephan-raabe.de>
Date: Thu, 13 Apr 2023 15:18:36 +0200
Subject: [PATCH] Updates

---
 .gtkrc-2.0           | 4 ++--
 1-install.sh         | 9 +++++++--
 gtk-3.0/settings.ini | 8 ++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gtkrc-2.0 b/.gtkrc-2.0
index 17faee6..d998e26 100644
--- a/.gtkrc-2.0
+++ b/.gtkrc-2.0
@@ -2,8 +2,8 @@
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
 include "/home/raabe/.gtkrc-2.0.mine"
-gtk-theme-name="Pop-dark"
-gtk-icon-theme-name="ePapirus-Dark"
+gtk-theme-name="Breeze-Dark"
+gtk-icon-theme-name="breeze-dark"
 gtk-font-name="Cantarell 11"
 gtk-cursor-theme-name="Bibata-Modern-Classic"
 gtk-cursor-theme-size=0
diff --git a/1-install.sh b/1-install.sh
index 126cfdf..46e4595 100755
--- a/1-install.sh
+++ b/1-install.sh
@@ -44,9 +44,10 @@ done
 echo ""
 echo "-> Install main packages"
 
-packagesPacman=("alacritty" "scrot" "nitrogen" "picom" "starship" "slock" "neomutt" "neovim" "rofi" "dunst" "ueberzug" "mpv" "freerdp" "spotifyd" "xfce4-power-manager" "python-pip" "thunar" "mousepad" "papirus-icon-theme" "ttf-font-awesome" "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" "figlet" "cmatrix" "lxappearance" "qalculate-gtk" "pop-gtk-theme" "polybar" "chromium");
+packagesPacman=("alacritty" "scrot" "nitrogen" "picom" "starship" "slock" "neomutt" "neovim" "rofi" "dunst" "ueberzug" "mpv" "freerdp" "spotifyd" "xfce4-power-manager" "python-pip" "thunar" "mousepad" "papirus-icon-theme" "ttf-font-awesome" "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" "figlet" "cmatrix" "lxappearance" "qalculate-gtk" "polybar" "chromium" "breeze" "breeze-gtk");
 
 packagesYay=("brave-bin" "pfetch" "bibata-cursor-theme");
+# pywal installation below 
 
 packagesPip=("psutil" "rich" "click");
     
@@ -159,7 +160,11 @@ _installPackagesYay "${packagesYay[@]}";
 _installPackagesPip "${packagesPip[@]}";
 
 # pywal requires dedicated installation
-yay -S pywal
+if [ -f /usr/bin/wal ]; then
+    echo "pywal already installed."
+else
+    yay --noconfirm -S pywal
+fi
 
 # ------------------------------------------------------
 # Enable services
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 3170be3..da9e678 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,13 +1,13 @@
 [Settings]
-gtk-theme-name=Pop-dark
-gtk-icon-theme-name=ePapirus-Dark
+gtk-theme-name=Breeze-Dark
+gtk-icon-theme-name=breeze-dark
 gtk-font-name=Cantarell 11
 gtk-cursor-theme-name="Bibata-Modern-Classic"
 gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_BOTH
+gtk-toolbar-style=GTK_TOOLBAR_ICONS
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=1
-gtk-menu-images=1
+gtk-menu-images=0
 gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=1
 gtk-xft-antialias=1