From 86b15eb32cdfe3687fe8b9496d0b34dc403757be Mon Sep 17 00:00:00 2001
From: Harri Lahtinen <lahtinen.harri@gmail.com>
Date: Sun, 19 May 2019 09:31:18 +0300
Subject: [PATCH] updated wpg and st

---
 .Xresources                                   |  2 +-
 .config/Scripts/pywall-circle.sh              |  2 +-
 .config/i3/config                             |  2 +-
 .config/polybar/config                        | 62 ++++---------------
 .config/ranger/rc.conf                        |  2 +-
 .../wpg/templates/config_twmn_twmn.conf.base  |  2 +-
 ..._config_dmenuExtended_preferences.txt.base | 16 ++---
 .xinitrc                                      |  2 +-
 8 files changed, 27 insertions(+), 63 deletions(-)

diff --git a/.Xresources b/.Xresources
index 3ac01f7..aef3167 100644
--- a/.Xresources
+++ b/.Xresources
@@ -16,7 +16,7 @@
 *.color14: #8ec07c
 *.color15: #ebdbb2
 !! Transparency (0-255):
-st.alpha: 230
+st.alpha: 0.92
 !! Set a default font and font size as below:
 *.font: 		            TamzenForPowerline:pixelsize=14:antialias=true:autohint=true;
 *.boldFont: 	            TamzenForPowerline:pixelsize=14:bold:antialias=true:autohint=true;
diff --git a/.config/Scripts/pywall-circle.sh b/.config/Scripts/pywall-circle.sh
index 7c9e43c..24fe731 100755
--- a/.config/Scripts/pywall-circle.sh
+++ b/.config/Scripts/pywall-circle.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Source generated colors.
-. "${HOME}/.config/wpg/formats/colors.sh"
+. "${HOME}/.cache/wal/colors.sh"
 
 while [ true ]
 do
diff --git a/.config/i3/config b/.config/i3/config
index 118cc4b..f706ea1 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -82,7 +82,7 @@ exec_always --no-startup-id ~/.config/polybar/launch.sh
 #Start udiskie
 exec --no-startup-id udiskie &
 #Restore wpg
-exec --no-startup-id ~/.config/wpg/wp_init.sh
+#exec --no-startup-id ~/.config/wpg/wp_init.sh
 #exec --no-startup-id wal -R
 #Add wallpaper:
 exec --no-startup-id systemctl --user start wallpaper.service
diff --git a/.config/polybar/config b/.config/polybar/config
index dbac283..9c78fa3 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -10,23 +10,23 @@ background = #00FFFFFF
 ;background = #8a8061
 background-alt = ${xrdb:color2:#7B8349}
 ;foreground = ${xrdb:color7}
-foreground = #fbf1c7
-foreground-alt = #fabd2f
-highlight = #b8bb26
+foreground = #faf0a5
+foreground-alt = #a88339
+highlight = #18974e
 ;error = ${xrdb:color9:#DD712E}
-error = #b8bb26
-red = #b8bb26
-yellow = #83a598
-green = #d3869b
-blue = #fabd2f
-alert = #b8bb26
+error = #18974e
+red = #18974e
+yellow = #477ca1
+green = #8868b3
+blue = #a88339
+alert = #18974e
 
 [bar/top]
 monitor = ${env:MONITOR:eDP-1}
 include-file = ~/.config/polybar/top-bar
 modules-left = i3
 modules-center = term chrome editor fm music vpn
-modules-right = wlan networkmanager p1 pkg p2 pulseaudio-rofi-output p3 battery p4 backlight p5 popup-calendar powermenu
+modules-right = pkg pulseaudio-rofi-output battery backlight wlan networkmanager popup-calendar date clock
 
 ;tray-position = right
 ;tray-padding = 2
@@ -110,8 +110,8 @@ format-prefix = " "
 type = custom/script
 interval = 256
 format = "<label> "
-;format-prefix = " "
-format-prefix = " "
+format-prefix = " "
+;format-prefix = " "
 format-prefix-foreground = ${colors.foreground-alt}
 exec = echo "$(uname -nr)"
 
@@ -139,8 +139,7 @@ type = custom/script
 exec = "~/.config/Scripts/arch-updates.sh -s"
 tail = true
 format = <label>
-;format-prefix = " "
-format-prefix = " " 
+format-prefix = " "
 format-prefix-foreground = ${colors.foreground-alt}
 click-left = st -e yay --noconfirm -Syu
 click-right = "~/.config/Scripts/arch-updates.sh -c&"
@@ -464,41 +463,6 @@ format-prefix-foreground = ${colors.foreground-alt}
 exec = ~/.config/Scripts/mail.sh
 click-left = chromium https://inbox.google.com &
 
-[module/p1]
-type = custom/text
-content = "|"
-content-font = 2
-content-foreground = ${colors.foreground}
-content-background = #00FFFFFF
-
-[module/p2]
-type = custom/text
-content = "|"
-content-font = 2
-content-foreground = ${colors.foreground}
-content-background = #00FFFFFF
-
-[module/p3]
-type = custom/text
-content = "|"
-content-font = 2
-content-foreground = ${colors.foreground}
-content-background = #00FFFFFF
-
-[module/p4]
-type = custom/text
-content = "|"
-content-font = 2
-content-foreground = ${colors.foreground}
-content-background = #00FFFFFF
-
-[module/p5]
-type = custom/text
-content = "|"
-content-font = 2
-content-foreground = ${colors.foreground}
-content-background = #00FFFFFF
-
 [settings]
 screenchange-reload = true
 ;compositing-background = xor
diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf
index 33e1abf..3ca33f7 100644
--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@@ -502,7 +502,7 @@ 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 wpg --pywal %f && systemctl --user restart wallpaper.service
+map bt shell wpg --theme %f && systemctl --user restart wallpaper.service
 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
diff --git a/.config/wpg/templates/config_twmn_twmn.conf.base b/.config/wpg/templates/config_twmn_twmn.conf.base
index dea96ec..f6461c1 100644
--- a/.config/wpg/templates/config_twmn_twmn.conf.base
+++ b/.config/wpg/templates/config_twmn_twmn.conf.base
@@ -1,7 +1,7 @@
 [gui]
 absolute_position=
 always_on_top=true
-background_color=#<COLOR0>
+background_color={color0}
 bounce=true
 bounce_duration=500
 font=TamzenForPowerline
diff --git a/.config/wpg/templates/dmenu-extended_config_dmenuExtended_preferences.txt.base b/.config/wpg/templates/dmenu-extended_config_dmenuExtended_preferences.txt.base
index 9cbe306..749c6f4 100644
--- a/.config/wpg/templates/dmenu-extended_config_dmenuExtended_preferences.txt.base
+++ b/.config/wpg/templates/dmenu-extended_config_dmenuExtended_preferences.txt.base
@@ -1,6 +1,6 @@
-{
+{{
     "alias_applications": true,
-    "alias_display_format": "{name}",
+    "alias_display_format": "{{name}}",
     "exclude_items": [],
     "filebrowser": "xdg-open",
     "fileopener": "xdg-open",
@@ -22,13 +22,13 @@
         "-b",
         "-i",
         "-nf",
-        "#<COLOR6>",
+        "{color6}",
         "-nb",
-        "#<COLOR0>",
+        "{color0}",
         "-sf",
-        "#<COLOR2>",
+        "{color2}",
         "-sb",
-        "#<COLOR8>",
+        "{color8}",
         "-fn",
         "TamzenForPowerline",
         "-l",
@@ -37,7 +37,7 @@
     "password_helper": [
         "zenity",
         "--password",
-        "--title={prompt}"
+        "--title={{prompt}}"
     ],
     "path_aliasFile": "",
     "path_shellCommand": "~/.dmenuEextended_shellCommand.sh",
@@ -76,4 +76,4 @@
         "~/"
     ],
     "webbrowser": "xdg-open"
-}
+}}
diff --git a/.xinitrc b/.xinitrc
index d0eaab9..81a761d 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,5 +1,5 @@
 #!/bin/bash
-[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
+#[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
 xset +fp ~/.local/share/fonts &
 xset fp rehash &
 exec i3