From d2f0e626840d384f04d3c1695b7501e925aba802 Mon Sep 17 00:00:00 2001
From: Wiktor Zykubek <dev@wzykubek.xyz>
Date: Tue, 24 Mar 2020 14:20:57 +0100
Subject: [PATCH] Update theme switcher, change icons to papirus

---
 botfiles/.config/gtk-2.0/gtkfilechooser.ini |  4 ++--
 botfiles/.config/gtk-3.0/settings.ini       |  2 +-
 botfiles/.config/picom/picom.conf           | 10 ++++------
 botfiles/.scripts/get-local-wificard-ip.sh  |  1 +
 botfiles/.scripts/themeswitcher             | 21 ++++++++++++++++++---
 dotman                                      |  4 ++--
 6 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100755 botfiles/.scripts/get-local-wificard-ip.sh

diff --git a/botfiles/.config/gtk-2.0/gtkfilechooser.ini b/botfiles/.config/gtk-2.0/gtkfilechooser.ini
index 374b384..1de1f4d 100644
--- a/botfiles/.config/gtk-2.0/gtkfilechooser.ini
+++ b/botfiles/.config/gtk-2.0/gtkfilechooser.ini
@@ -6,6 +6,6 @@ GeometryX=538
 GeometryY=223
 GeometryWidth=840
 GeometryHeight=630
-SortColumn=name
-SortOrder=ascending
+SortColumn=modified
+SortOrder=descending
 StartupMode=recent
diff --git a/botfiles/.config/gtk-3.0/settings.ini b/botfiles/.config/gtk-3.0/settings.ini
index 339e36c..60dcfe7 100644
--- a/botfiles/.config/gtk-3.0/settings.ini
+++ b/botfiles/.config/gtk-3.0/settings.ini
@@ -1,5 +1,5 @@
 [Settings]
-gtk-theme-name=AdwaitaDark
+gtk-theme-name=Adwaita
 gtk-icon-theme-name=Papirus-Dark
 gtk-font-name=Cantarell 11
 gtk-cursor-theme-name=Adwaita
diff --git a/botfiles/.config/picom/picom.conf b/botfiles/.config/picom/picom.conf
index 20e8516..a5599eb 100644
--- a/botfiles/.config/picom/picom.conf
+++ b/botfiles/.config/picom/picom.conf
@@ -100,12 +100,10 @@ frame-opacity = 1;
 inactive-opacity-override = false;
 
 opacity-rule = [
-  "95:class_g = 'St' && focused",
-  "95:class_g = 'Tabbed' && focused",
-  "93:class_g = 'St' && !focused",
-  "93:class_g = 'Tabbed' && !focused",
-  "93:class_g = 'Polybar'",
-  "93:class_g = 'Rofi'"
+  "92:class_g = 'St' && focused",
+  "90:class_g = 'St' && !focused",
+  "90:class_g = 'Polybar'",
+  "90:class_g = 'Rofi'"
 ];
 
 # Dim inactive windows. (0.0 - 1.0)
diff --git a/botfiles/.scripts/get-local-wificard-ip.sh b/botfiles/.scripts/get-local-wificard-ip.sh
new file mode 100755
index 0000000..4fd3755
--- /dev/null
+++ b/botfiles/.scripts/get-local-wificard-ip.sh
@@ -0,0 +1 @@
+ip a show wlp8s0 | grep -Eo '(inet)?*([0-9]*\.){3}[0-9]*' | grep -v '**\.255'
diff --git a/botfiles/.scripts/themeswitcher b/botfiles/.scripts/themeswitcher
index e42e8a2..e5635e7 100644
--- a/botfiles/.scripts/themeswitcher
+++ b/botfiles/.scripts/themeswitcher
@@ -2,24 +2,39 @@
 
 xfile="$HOME/.Xresources"
 
-theme="$(printf "cyan\nmagenta" | rofi -dmenu -i -p "Theme" -l 2)"
+theme="$(printf "cyan\nmagenta\ndark\norange\nred" | rofi -dmenu -i -p "Theme" -l 5)"
 
 case "$theme" in
 	cyan)
 		bg="#071616"
 		bunfoc="#353234"
 		bfoc="#144949"
-		dselb="#144949"
 		;;
 	magenta)
 		bg="#211019"
 		bunfoc="#2d060e"
 		bfoc="#4c1139"
-		dselb="#4c1139"
+		;;
+	dark)
+		bg="#0a0200"
+		bunfoc="#262323"
+		bfoc="#353131"
+		;;
+	orange)
+		bg="#351909"
+		bunfoc="#1e0e05"
+		bfoc="#51250c"
+		;;
+	red)
+		bg="#680e10"
+		bunfoc="#380a0b"
+		bfoc="#a31619"
 		;;
 	*) exit;;
 esac
 
+dselb="$bfoc"
+
 sed -i \
 	-e "s/\*\.background:.*/\*\.background: $bg/" \
 	-e "s/\*\.border_unfocused:.*/\*\.border_unfocused: $bunfoc/" \
diff --git a/dotman b/dotman
index ac3169c..0c0b954 100755
--- a/dotman
+++ b/dotman
@@ -33,7 +33,7 @@ install_repo_packages() {
 	# Packages
 	FONTS="otf-ipafont noto-fonts-emoji gnu-free-fonts ttf-arphic-uming ttf-indic-otf ttf-joypixels ttf-font-awesome ttf-dejavu"
 	UTILS="neovim qutebrowser telegram-desktop htop mpd ncmpcpp rofi transmission-cli vlc zsh youtube-dl grc curl wget xclip figlet w3m vifm feh alsa-utils tmux networkmanager maim fzf exfat-utils fuse2 udiskie udisks2 imagemagick i3lock-color man pacman-contrib ncdu mpc neomutt bc clipmenu xdotool"
-	WM="dunst bspwm sxhkd picom xorg-server xorg-xinit xorg-xsetroot"
+	WM="dunst bspwm sxhkd picom xorg-server xorg-xinit xorg-xsetroot papirus-icon-theme"
 	DEV="python-pip yarn gradle ccls eslint flake8 shellcheck prettier python-black hub git"
 
 	sudo pacman -S --noconfirm --needed $FONTS $UTILS $WM $DEV
@@ -281,7 +281,7 @@ fi
 
 greeter
 
-printf "\nDo you want to copy configs? (Y/n): "; read CHOICE
+printf "\nDo you want to copy configs? (y/n): "; read CHOICE
 if [ "$CHOICE" = "Y" ] || [ "$CHOICE" = "y" ]; then 
 	printf "Moving configs..." 
 	copy_configs &>$LOG_DIR/copy_configs.log