From 29512cc6d7d271de83ed873e88b975c82aed0cb6 Mon Sep 17 00:00:00 2001
From: Stephan Raabe <mail@stephan-raabe.de>
Date: Thu, 30 Mar 2023 15:48:12 +0200
Subject: [PATCH] Update color scheme

---
 polybar/config.ini | 16 ++++++++++++----
 qtile/config.py    |  6 +++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/polybar/config.ini b/polybar/config.ini
index 0d48b05..c06246e 100644
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -12,7 +12,7 @@
 background = #aa000000
 foreground = ${xrdb:color7:#222}
 foreground-alt = ${xrdb:color7:#000}
-primary = ${xrdb:color6:#222}
+primary = ${xrdb:color3:#222}
 secondary = ${xrdb:color7:#222}
 alert = ${xrdb:color3:#222}
 
@@ -31,7 +31,7 @@ separator = ""
 separator-foreground = ${colors.disabled}
 font-0 = "Fira Sans SemiBold:size=11;1"
 font-1 = "Font Awesome 6 Free Solid:pixelsize=12;2"
-modules-left = myarrow xworkspaces
+modules-left = xworkspaces
 modules-center = xwindow
 modules-right = myarrow filesystem pulseaudio xkeyboard memory cpu date
 cursor-click = pointer
@@ -42,7 +42,7 @@ enable-ipc = true
 [module/myarrow]
 type = custom/text
 content-foreground = ${colors.primary}
-content = " "
+content = ""
 
 [module/xworkspaces]
 type = internal/xworkspaces
@@ -61,26 +61,32 @@ label-empty = %name%
 label-empty-foreground =#FFFFFF
 label-empty-background=#99000000
 label-empty-padding = 2
+format-prefix = "   "
+format-prefix-foreground = ${colors.primary}
 
 [module/xwindow]
 type = internal/xwindow
 label = %title:0:60:...%
 format-prefix = "  "
 format-prefix-foreground = ${colors.primary}
+format-foreground = #FFFFFF
 
 [module/filesystem]
 type = internal/fs
 interval = 25
 mount-0 = /
+format-foreground = #FFFFFF
 label-mounted = %mountpoint% %percentage_used%%
+label-mounted-foreground = #FFFFFF
 label-unmounted = %mountpoint% not mounted
-label-unmounted-foreground = ${colors.disabled}
+label-unmounted-foreground = #FFFFFF
 
 [module/pulseaudio]
 type = internal/pulseaudio
 format-volume-prefix = "VOL "
 format-volume-prefix-foreground = ${colors.primary}
 format-volume = <label-volume>
+format-volume-foreground = #FFFFFF
 label-volume = %percentage%%
 label-muted = muted
 label-muted-foreground = ${colors.disabled}
@@ -100,6 +106,7 @@ type = internal/memory
 interval = 2
 format-prefix = "RAM "
 format-prefix-foreground = ${colors.primary}
+format-foreground = #FFFFFF
 label = %percentage_used:2%%
 
 [module/cpu]
@@ -107,6 +114,7 @@ type = internal/cpu
 interval = 2
 format-prefix = "CPU "
 format-prefix-foreground = ${colors.primary}
+format-foreground = #FFFFFF
 label = %percentage:2%%
 
 [network-base]
diff --git a/qtile/config.py b/qtile/config.py
index 454989d..82d5130 100644
--- a/qtile/config.py
+++ b/qtile/config.py
@@ -183,8 +183,8 @@ ColorI=(colordict['colors']['color9'])
 layout_theme = { 
     "border_width": 3,
     "margin": 15,
-    "border_focus": "ffffff",
-    "border_normal": ColorC,
+    "border_focus": ColorC,
+    "border_normal": "FFFFFF",
     "single_border_width": 3
 }
 
@@ -315,7 +315,7 @@ screens = [
 # Screens Gap for PolyBar
 # --------------------------------------------------------
 
-screens = [Screen(top=bar.Gap(size=30))]
+screens = [Screen(top=bar.Gap(size=28))]
 
 # --------------------------------------------------------
 # Drag floating layouts.