From 792bf963abe9d0f05158184120e58102ebaaf324 Mon Sep 17 00:00:00 2001
From: Harri Lahtinen <lahtinen.harri@gmail.com>
Date: Sat, 5 Jan 2019 19:17:16 +0200
Subject: [PATCH] added polybar config as wpg template

---
 .config/i3/config                           |  6 ++---
 .config/polybar/config                      | 25 ++++++++++++---------
 .config/ranger/rc.conf                      |  8 +++----
 .config/wpg/templates/config_polybar_config |  1 +
 .xinitrc                                    |  1 -
 .zshrc                                      |  4 ++--
 6 files changed, 24 insertions(+), 21 deletions(-)
 create mode 120000 .config/wpg/templates/config_polybar_config

diff --git a/.config/i3/config b/.config/i3/config
index 9573918..6e8ea1e 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -81,14 +81,14 @@ exec_always --no-startup-id ~/.config/polybar/launch.sh
 #exec --no-startup-id python ~/.config/Scripts/offlineimap-daemon.py
 #Start udiskie
 exec --no-startup-id udiskie &
-#Start wal
-exec --no-startup-id wal -R &
+#Restore wpg
+exec --no-startup-id ~/.config/wpg/wp-init.sh
 #Add wallpaper:
 exec --no-startup-id systemctl --user start wallpaper.service
 #Unclutter makes the mouse invisible after a brief period
 exec --no-startup-id unclutter
 # set desktop background with custom effect
-bindsym $mod+Shift+x exec betterlockscreen -l dim
+bindsym $mod+Shift+g exec betterlockscreen -l dim
 exec --no-startup-id betterlockscreen -w dim
 #Twmn Gmail notifier
 exec --no-startup-id python ~/.config/Scripts/gmail_notifier.py
diff --git a/.config/polybar/config b/.config/polybar/config
index 634b725..6737f1a 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -10,15 +10,16 @@ background = #00FFFFFF
 ;background = #8a8061
 background-alt = ${xrdb:color2:#7B8349}
 ;foreground = ${xrdb:color7}
-foreground = ${xrdb:color15:#2A1A17}
-foreground-alt = ${xrdb:color15:#2A1A17}
-highlight = ${xrdb:color6:#E1B959}
-error = ${xrdb:color9:#DD712E}
-red = #CC6666
-yellow = #F0C674
-green = #B3BB67
-blue = #7FA0BC
-alert = #bd2c40
+foreground = #8FBCBB
+foreground-alt = #5E81AC
+highlight = #BF616A
+;error = ${xrdb:color9:#DD712E}
+error = #BF616A
+red = #BF616A
+yellow = #EBCB8B
+green = #A3BE8C
+blue = #5E81AC
+alert = #BF616A
 
 [bar/top]
 monitor = ${env:MONITOR:eDP-1}
@@ -72,6 +73,7 @@ exec = ~/.config/Scripts/backlight.sh
 scroll-up = exec light -A 5
 scroll-down = exec light -U 5
 format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
 label = %output%
 label-foreground = ${colors.foreground}
 format-padding = 1
@@ -132,6 +134,7 @@ exec = "~/.config/Scripts/arch-updates.sh -s"
 tail = true
 format = <label>
 format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
 ;click-right = "~/.config/Scripts/arch-updates.sh -u&"
 click-left = urxvt -e yay --noconfirm -Syu
 click-right = "~/.config/Scripts/arch-updates.sh -c&"
@@ -331,7 +334,7 @@ interval = 60
 exec = echo "$(date +%a) $(date +%d) $(date +%b)"
 format = <label>
 format-prefix = " "
-format-prefix-foreground = ${colors.highlight}
+format-prefix-foreground = ${colors.foreground-alt}
 label = %{A1:gsimplecal &:}%output%%{A}
 
 [module/clock]
@@ -340,7 +343,7 @@ interval = 5
 exec = echo "$(date +%R)"
 format = <label>
 ;format-prefix = " "
-format-foreground = ${colors.highlight}
+format-foreground = ${colors.foreground-alt}
 label = %{A1:gsimplecal &:}%output%%{A}
 
 [module/volume]
diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf
index fc9f6b0..4ba71e4 100644
--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@@ -502,10 +502,10 @@ map ya shell yadm add %f
 #Image commands
 map bk shell cp %f ~/.config/wall.png && feh --bg-scale %f
 map bg shell wpg -an %f && wpg -s %f
-map bt shell wal -g -f %f
-map bc shell wal --backend colorz -g -i %f && systemctl --user restart wallpaper.service
-map bw shell wal -c -a "90" -g -i %f && cp %f ~/.config/wall.png && ~/.config/Scripts/wal-set
-map bv shell wal -c -a "90" -g -l -i %f && cp %f ~/.config/wall.png && ~/.config/Scripts/wal-set
+map bt shell wpg --pywal %f
+map bc shell wal --backend colorz -i %f && systemctl --user restart wallpaper.service
+map bw shell wal -a "90" -i %f && cp %f ~/.config/wall.png && ~/.config/Scripts/wal-set
+map bv shell wal -c -a "90" -l -i %f && cp %f ~/.config/wall.png && ~/.config/Scripts/wal-set
 map C shell killall w3mimgdisplay && convert -rotate 90 %s %s
 map F shell killall w3mimgdisplay && convert -flop %s %s
 map bl shell killall w3mimgdisplay && convert %s -resize 1920x1080\> bl_%s
diff --git a/.config/wpg/templates/config_polybar_config b/.config/wpg/templates/config_polybar_config
new file mode 120000
index 0000000..57c0176
--- /dev/null
+++ b/.config/wpg/templates/config_polybar_config
@@ -0,0 +1 @@
+/home/hate/.config/polybar/config
\ No newline at end of file
diff --git a/.xinitrc b/.xinitrc
index 1c2fb95..d0eaab9 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,6 +1,5 @@
 #!/bin/bash
 [[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
-wal -R
 xset +fp ~/.local/share/fonts &
 xset fp rehash &
 exec i3
diff --git a/.zshrc b/.zshrc
index 19e23e9..247d444 100644
--- a/.zshrc
+++ b/.zshrc
@@ -137,10 +137,10 @@ export ARCHFLAGS="-arch x86_64"
 # Import colorscheme from 'wal' asynchronously
 # &   # Run the process in the background.
 # ( ) # Hide shell job control messages.
-(cat ~/.cache/wal/sequences &)
+#(cat ~/.cache/wal/sequences &)
 
 # Wpg restore on terminals
-#(cat $HOME/.config/wpg/sequences &)
+(cat $HOME/.config/wpg/sequences &)
 
 # To add support for TTYs this line can be optionally added.
 #source ~/.cache/wal/colors-tty.sh