From ede764ab59a6c34ea5840ff7b7b0c1a9cd0207a0 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Sat, 30 Jun 2018 21:26:09 -0500
Subject: [PATCH] Polybar, Conky: Color changes, battery module position change
 Battery is now green, Disk is now yellow

---
 .config/conky/conky.conf | 2 +-
 .config/polybar/config   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.config/conky/conky.conf b/.config/conky/conky.conf
index b5ef1c3b..2cb0301a 100644
--- a/.config/conky/conky.conf
+++ b/.config/conky/conky.conf
@@ -24,7 +24,7 @@ conky.config = {
 	color3 = '3c3836', -- Background-alt
 	color4 = 'fb4934', -- Red (Hot, generic)
 	color6 = '8ec07c', -- Cyan (Network)
-	color7 = 'b8bb26', -- Green (Disk)
+	color7 = 'fabd2f', -- Yellow (Disk)
 	color8 = '83a598', -- Blue (CPU)
 	color9 = 'd3869b', -- Magenta (Memory)
 
diff --git a/.config/polybar/config b/.config/polybar/config
index a27092fc..5d1f4418 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -13,11 +13,11 @@ secondary = ${xrdb:color4}
 alert = ${xrdb:color3}
 warning = ${xrdb:color1}
 
-icon-battery = ${res/colors.primary}
+icon-battery = ${xrdb:color10}
 icon-cpu = ${xrdb:color12}
 icon-date = ${res/colors.primary}
 icon-dropbox = ${res/colors.primary}
-icon-fs = ${xrdb:color10}
+icon-fs = ${xrdb:color11}
 icon-memory = ${xrdb:color13}
 icon-volume = ${res/colors.primary}
 icon-wlan = ${xrdb:color14}
@@ -89,9 +89,9 @@ tray-detached = true
 tray-position = center
 tray-maxsize = 16
 
-modules-left = cpu memory
+modules-left = battery cpu memory
 modules-center =
-modules-right = xbacklight volume battery | date
+modules-right = xbacklight volume | date
 
 [bar/primary-2]
 monitor = ${env:PB_MONITOR:eDP-1}