From 1102720daa0b884b8fb53dc098d03af1aa19030f Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Fri, 31 Mar 2023 13:05:02 +0100
Subject: [PATCH] Add zathura theme

---
 Xdefaults             | 28 ++++++++++++++++++++--------
 config/bspwm/bspwmrc  | 12 ++++++++----
 config/polybar/config | 14 +++++++++-----
 config/sxhkd/sxhkdrc  |  4 ++--
 deploy.sh             |  4 ++--
 scripts/toggle-gap.sh |  2 +-
 6 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/Xdefaults b/Xdefaults
index 308c8b0..ae6f395 100644
--- a/Xdefaults
+++ b/Xdefaults
@@ -1,12 +1,23 @@
 #define FG #fefefe
 #define BG #191919
+
+! #define font1 xft:minecraft enchantment:minispace=False:size=10:antialias=true
+! #define spacing -2
+
 #define font1 xft:mononoki:minispace=False:size=10:antialias=true
+#define spacing 1
+
 #define font2 xft:MesloLGM Nerd Font Mono:minispace=False:size=10
 #define font3 xft:Noto Sans Mono CJK TC:minispace=False:size=10
 #define font4 xft:Noto Color Emoji:style=regular:size=10
-*.foreground: FG 
-URxvt.background: BG
-URxvt.borderColor: BG
+URxvt.letterSpace: spacing
+URxvt.lineSpace: 0
+
+dzen2.font: mononoki
+
+*.foreground: FG
+*.background: BG
+*.borderColor: BG
 *.cursorColor: FG 
 
 ! black
@@ -44,17 +55,16 @@ URxvt.borderColor: BG
 ! Set depth to make transparency work.
 URxvt*depth: 32
 
+*.font: font1
 URxvt.font: font1,font2,font3,font4
 URxvt.boldFont: font1:style=bold,font2:style=bold,font3:style=bold,font4
 URxvt.italicFont:font1:style=italic,font2:style=italic,font3:style=italic,font4
 URxvt.boldItalicfont: font1:style=bolditalic,font2:style=bolditalic,font3:style=bolditalic,font4
-URxvt.letterSpace: 0
-URxvt.lineSpace: 0
 
 URxvt.internalBorder: 20
-URxvt.cursorBlink: true
+*.cursorBlink: true
 URxvt.cursorUnderline: true
-URxvt.saveline: 2048
+URxvt.saveline: 4096
 URxvt.scrollBar: false
 URxvt.scrollBar_right: false
 URxvt.pointerBlank: true
@@ -64,6 +74,8 @@ URxvt.urgentOnBell: true
 URxvt.iso14755: false
 urxvt*dynamicColors: on
 
+XTerm*faceName: font1,font2,font3,font4
+
 
 
 !-- Xft settings -- !
@@ -73,7 +85,7 @@ Xft.rgba:       rgb
 Xft.hinting:    true
 Xft.hintstyle:  hintfull
 
-URxvt.perl-ext-common: resize-font
+URxvt.perl-ext-common: resize-font,config-reload
 
 URxvt.url-launcher: /usr/bin/xdg-open
 URxvt.matcher.button: 1
diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index af256db..b78963a 100755
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -3,7 +3,7 @@ setup=0
 
 COLOR_BACKGROUND="#282a2e"
 COLOR_PRIMARY="#fefefe"
-COLOR_SECONDARY="#81a2be"
+COLOR_SECONDARY="#707880"
 BORDER=2
 
 hsetroot -solid $COLOR_BACKGROUND &
@@ -36,11 +36,15 @@ bspc config border_width	$BORDER
 bspc config window_gap		0
 $HOME/.scripts/toggle-gap.sh
 
+## individual rules
+bspc rule -a Zathura state=tiled
+bspc rule -a feh state=fullscreen
+
 bspc config focus_follows_pointer false
  
-bspc config normal_border_color "$COLOR_PRIMARY"
-bspc config active_border_color "$COLOR_PRIMARY"
-bspc config focused_border_color "$COLOR_SECONDARY"
+bspc config normal_border_color "$COLOR_SECONDARY"
+bspc config active_border_color "$COLOR_SECONDARY"
+bspc config focused_border_color "$COLOR_PRIMARY"
 wmname bspwm 
 
 $HOME/.scripts/start-mpd
diff --git a/config/polybar/config b/config/polybar/config
index 9bd217a..8b16e9b 100644
--- a/config/polybar/config
+++ b/config/polybar/config
@@ -7,7 +7,7 @@ bg = #191919
 bga = #191919
 fg4= #f58d44
 fg2 = #5f819d
-fg3 = #373b41
+fg3 = #707880
 fg1 = #fefefe
 
 
@@ -40,13 +40,15 @@ modules-right		      = time
 
 [bar/ws]
 inherit                   = bar/base
-width                     = 100%
-offset-x                  = 0 
+width                     = 1870
+offset-x                  = 25
+offset-y                  = 10
 modules-left              = workspaces xwindow
 modules-right		      = mpd temperature memory network battery pulseaudio microphone time
 tray-position		      = right
 background		          = ${color.bga}
-border-size		          = 0
+border-size		          = 2
+border-color              = ${color.fg3}
 fg			              = ${color.fg1}
 
 
@@ -81,6 +83,8 @@ label-occupied            = %{T2}ﲭ%{T-}
 label-occupied-padding    = 1
 label-empty               = %{T2}ﱤ%{T-}
 label-empty-padding       = 1
+label-urgent            = %{T2}ﲭ%{T-}
+label-urgent-padding    = 1
 
 
 [module/time]
@@ -199,5 +203,5 @@ format-disconnected = <label-disconnected>
 
 format-packetloss = <label-connected>
 
-label-connected = %essid% 
+label-connected =  
 
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index 751e118..4869fc5 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -18,9 +18,9 @@ super + ctrl + alt + f
 	amixer -D pulse set Master 1+ toggle
 
 {_, super} + XF86MonBrightnessDown
-    xbacklight - {10,1}
+    light -U {10,1}
 {_, super} + XF86MonBrightnessUp
-    xbacklight + {10,1}
+    light -A {10,1}
     
 
 
diff --git a/deploy.sh b/deploy.sh
index ba475ae..3cbaea2 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-configurations="iocane bg bg.gif bspwm cava neofetch mpd mpv ncmpcpp vim sxhkd polybar picom rofi user-dirs.dirs gtk-3.0"
+configurations="iocane bg bg.gif bspwm cava neofetch mpd mpv ncmpcpp vim sxhkd polybar picom rofi user-dirs.dirs gtk-3.0 zathura"
 
 
 save () {
@@ -41,7 +41,7 @@ save () {
     rm config/mpd/password
     rm config/mpd/database
     rm config/mpd/sticker.sql
-    rm config/vim/viminfo
+    rm config/vim/viminfo*
     rm -r config/mpv/shaders
 
 }
diff --git a/scripts/toggle-gap.sh b/scripts/toggle-gap.sh
index 210dac3..fbdb992 100755
--- a/scripts/toggle-gap.sh
+++ b/scripts/toggle-gap.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-GAP=40; bspc config window_gap | grep -q $GAP && bspc config window_gap 0 || bspc config window_gap $GAP
+GAP=25; bspc config window_gap | grep -q $GAP && bspc config window_gap 0 || bspc config window_gap $GAP