From a6f071cce2a73deaae6c078aaab922e67dd2ac96 Mon Sep 17 00:00:00 2001
From: Aleksander Cynarski <aleksander@cynarski.pl>
Date: Thu, 8 Jul 2021 18:28:40 +0200
Subject: [PATCH] mako i waybar pywal templates

---
 .config/mako/config                     |  8 +++---
 .config/wal/templates/colors-waybar.css |  2 +-
 .config/wal/templates/mako              |  8 +++---
 .config/waybar/style.css                | 35 ++++++++++++-------------
 .zshrc                                  |  9 ++++---
 5 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/.config/mako/config b/.config/mako/config
index 0e7a44c..626c1b9 100644
--- a/.config/mako/config
+++ b/.config/mako/config
@@ -1,9 +1,9 @@
 # https://github.com/altercation/solarized#the-values
 font=Terminus 10
-background-color=#0C130C
-text-color=#dedbcb
-border-color=#606855
+background-color=#946634
+text-color=#0C130C
+border-color=#0C130C
 default-timeout=5000
 
 [urgency=high]
-text-color=#CB4B16
\ No newline at end of file
+text-color=#CB4B16
diff --git a/.config/wal/templates/colors-waybar.css b/.config/wal/templates/colors-waybar.css
index 761f7f4..a73b8a9 100644
--- a/.config/wal/templates/colors-waybar.css
+++ b/.config/wal/templates/colors-waybar.css
@@ -1,6 +1,6 @@
 @define-color fore {cursor};
 @define-color back {background};
 
-@define-color inactive {color1};
+@define-color inactive {color6};
 @define-color dark {color2};
 @define-color active {color7};
diff --git a/.config/wal/templates/mako b/.config/wal/templates/mako
index 2926f26..ddbc838 100644
--- a/.config/wal/templates/mako
+++ b/.config/wal/templates/mako
@@ -1,9 +1,9 @@
 # https://github.com/altercation/solarized#the-values
 font=Terminus 10
-background-color={background}
-text-color={foreground}
-border-color={color1}
+background-color={color2}
+text-color={background}
+border-color={background}
 default-timeout=5000
 
 [urgency=high]
-text-color=#CB4B16
\ No newline at end of file
+text-color=#CB4B16
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 1661768..de63f1f 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -6,19 +6,19 @@
 }
 
 window#waybar {
-	background: @dark;
-	color: @back;
+	background: none;
+	color: @dark;
 }
 
 #custom-right-arrow-dark,
 #custom-left-arrow-dark {
-	color: @back;
-	background: @dark;
+	color: @dark;
+	background: none;
 }
 #custom-right-arrow-light,
 #custom-left-arrow-light {
-	color: @dark;
-	background: @back;
+	color: @back;
+	background: @dark;
 }
 
 #workspaces,
@@ -31,8 +31,8 @@ window#waybar {
 #battery,
 #disk,
 #tray {
-	background: @back;
-	color: @dark;
+	background: @dark;
+	color: @back;
 }
 
 #workspaces {
@@ -40,7 +40,7 @@ window#waybar {
 }
 
 #tray {
-	background: @back;
+	background: @dark;
 	padding: 0 10px 0 10px;
 }
 
@@ -49,8 +49,8 @@ window#waybar {
 #custom-pressure,
 #custom-pm_25,
 #custom-pm_10 {
-	background: @back;
-	color: @dark;
+	background: @dark;
+	color: @back;
 	padding: 2px 5px;
 }
 
@@ -60,32 +60,31 @@ window#waybar {
 }
 
 #workspaces button.focused {
-	color: @invactive;
+	color: @back;
 }
 #workspaces button:hover {
 	box-shadow: inherit;
 	text-shadow: inherit;
 }
 #workspaces button:hover {
-	background: @background;
 	border: @foreground;
 	padding: 0 3px;
 }
 
 #pulseaudio {
-	color: @dark;
+	color: @back;
 }
 #memory {
-	color: @dark;
+	color: @back;
 }
 #cpu {
-	color: @dark;
+	color: @back;
 }
 #battery {
-	color: @dark;
+	color: @back;
 }
 #disk {
-	color: @dark;
+	color: @back;
 }
 
 #clock,
diff --git a/.zshrc b/.zshrc
index f8ae68e..bcd05eb 100644
--- a/.zshrc
+++ b/.zshrc
@@ -209,9 +209,12 @@ mattermost-desktop () { # launch telegram and send it to scratchpad
 }
 
 theme () {
-    (wal -qi $WALLPAPER)
-    (swaybg --bg-scale $WALLPAPER)
-    (~/bin/alawal.sh)
+    wal -qi $WALLPAPER
+    swaybg --bg-scale $WALLPAPER
+    cp ~/.cache/wal/mako ~/.config/mako/config
+    systemctl --user restart mako
+    systemctl --user restart waybar
+    ~/bin/alawal.sh
 }
 
 alias tf=terraform