From e95677b4afdeb1993f6700aa8656908d2926303d Mon Sep 17 00:00:00 2001
From: Wiktor Zykubek <dev@wzykubek.xyz>
Date: Sat, 23 May 2020 15:12:26 +0200
Subject: [PATCH] Rebuild Xresources file structure

Also edit rofi config and one binging
in sxhkd config.
---
 .config/Xresources       | 33 ++++++++++++++-------------------
 .config/rofi/config.rasi |  2 +-
 .config/sxhkd/sxhkdrc    |  4 ++--
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/.config/Xresources b/.config/Xresources
index b0bb81b..e1f61f8 100644
--- a/.config/Xresources
+++ b/.config/Xresources
@@ -1,25 +1,20 @@
+#define bg #0e0f14
+#define sbg #282a38
+#define fg #dfdfdf
+#define sfg #eeeeee
+
 ! special
-*.foreground: #dfdfdf
-*.background: #0e0f14
-*.border_unfocused: #262323
-*.border_focused: #353131
+*.foreground: fg
+*.normfgcolor: fg
+*.selfgcolor: sfg
+*.selforeground: sfg
 
-! dwm
-dwm.normfgcolor: #bbbbbb
-dwm.normbgcolor: #0a0a0c
-dwm.normbordercolor: #444444
+*.background: bg
+*.normbgcolor: bg
+*.selbgcolor: sbg
+*.selbackground: sbg
 
-dwm.selfgcolor: #eeeeee
-dwm.selbgcolor: #282a38
-dwm.selbordercolor: #1b1b1b
-
-! dmenu
-dmenu.selbackground: #353131
-dmenu.selforeground: #dfdfdf
-dmenu.font: Monospace:pixelsize=13:antialias=true:autohint=true:hintstyle=hintmedium
-
-! st
-st.font: Monospace:pixelsize=13:antialias=true:autohint=true:hintstyle=hintmedium
+*.font: Monospace:pixelsize=13:antialias=true:autohint=true:hintstyle=hintmedium
 
 ! black
 *.color0: 	  #000000
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index ca35af1..4eaf111 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -5,6 +5,7 @@ configuration {
   location: 2;
   yoffset: 60;
   xoffset: 0;
+  show-icons: false;
 }
 
 * {
@@ -17,7 +18,6 @@ configuration {
   background: @maincolor;
   background-color: @background;
   blackselect: #363b47;
-  show-icons: false;
 }
 
 window {
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index a0a1afe..d50dd02 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -21,7 +21,7 @@ super + shift + o; {g,k,l,i}
 super + m
 	rofi-mpd -a
 super + x
-	lockscreen
+	slock
 super + z
 	powermenu
 super + u
@@ -48,7 +48,7 @@ F10
 F11
 	[ $(pgrep ffmpeg) ] && blaze -s || blaze
 End
-	lockscreen; systemctl suspend
+	slock; systemctl suspend
 Pause
 	syncnow