Merge branch 'reverse-layout' into i3-remap-experimental

conky/conky

@@ -3,7 +3,7 @@ conky.config = {
 	background = true,
 	cpu_avg_samples = 2,
 	default_color = 'd3d3d3',
-	color2 = '566161',
+	color2 = '07eded',
 	double_buffer = true,
 	font = 'Bitstream Vera Sans:size=8',
 	draw_shades = false,

conky/conky_shortcuts

@@ -2,7 +2,7 @@ conky.config = {
 	alignment = 'bottom_left',
 	background = true,
 	cpu_avg_samples = 2,
-	default_color = '566161',
+	default_color = '07eded',
 	color2 = 'd3d3d3',
 	double_buffer = true,
 	font = 'Bitstream Vera Sans:size=8',

i3/config

@@ -12,50 +12,28 @@ set $border_normal border normal 3
 set $i3inputfont \\"-*-*-*-*-*-*-24-*-*-*-*-*-*-*\\"  
 
 # Theme options (comment/uncomment theme group)
+# Theme 5 "fluorescent blue"
+set $accent-bg #07eded
+# Theme 5 "french pink"
+#set $accent-bg #f57a9d
 # Theme 1 "paradise pink"
-set $accent-bg #d64161
-set $accent-txt #F9FAF9
-set $indicator #109648
-
+#set $accent-bg #eb5ca3
 # Theme 2 "sheen green"
 #set $accent-bg #8ae234
-#set $accent-txt #363636
-#set $indicator #d64161
-
-# Theme 3 "french lilac"
-#set $accent-bg #8f5f95
-#set $accent-txt #F9FAF9
-#set $indicator #109648
-
-# Theme 4 "cardinal"
-#set $accent-bg #ba263f
-#set $accent-txt #F9FAF9
-#set $indicator #109648
-
-# Theme 5 "illuminating emerald"
-#set $accent-bg #00916e
-#set $accent-txt #F9FAF9
-#set $indicator #109648
-
-# Theme 6 "light gray"
-#set $accent-bg #D3D3D3
-#set $accent-txt #363636
-#set $indicator #109648
-
-# Theme 6 "yellow green"
-#set $accent-bg #8ac926
-#set $accent-txt #363636
-#set $indicator #109648
+# Theme 5 "ocean green"
+#set $accent-bg #53ca9d
 
 # set other colors
-set $inactive-bg #3A4141
+set $accent-txt #000000
+set $inactive-bg #000000
 set $inactive-txt #bdbbbb
-set $unfocused-bg #566161
+set $unfocused-bg #000000
 set $unfocused-txt #939f9f
+set $indicator #109648
 
 # class                  border       backgr.    text        indic.     child_border
 client.focused           $accent-bg $accent-bg $accent-txt $indicator $accent-bg
-client.focused_inactive  $inactive-bg $inactive-bg $inactive-txt $indicator $inactive-bg
+client.focused_inactive  $inactive-bg $inactive-bg $accent-bg $indicator $inactive-bg
 client.unfocused         $unfocused-bg $unfocused-bg $unfocused-txt $indicator $unfocused-bg
 #client.urgent           #CB4B16 #FDF6E3 #CB4B16 $indicator
 #client.placeholder      #000000 #0c0c0c $accent-txt #000000
@@ -94,14 +72,15 @@ bindsym $mod+BackSpace exec --no-startup-id source ~/.xprofile
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
 #font pango:monospace 8
-font pango:DejaVu Sans 10
+font pango:DejaVu Sans 11
 
 # Use Mouse+$mod to drag floating windows
 floating_modifier $mod
 
 # Autostart applications
 #exec --no-startup-id alttab -pk h -nk l -fg "#d58681" -bg "#4a4a4a" -frame "#eb564d" -t 128x150 -i 127x64
-# needs xorg-xsetroot installed
+# needs hsetroot installed
+exec_always --no-startup-id hsetroot -solid "#000000"
 exec --no-startup-id "pkill -9 redshift; redshift -P -t 5000:4000"
 exec --no-startup-id "xkbset exp =m; xkbset m"
 exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
@@ -111,7 +90,6 @@ exec --no-startup-id fcitx -d
 exec --no-startup-id nm-applet
 exec --no-startup-id optimus-manager-qt
 exec --no-startup-id xfce4-power-manager
-exec --no-startup-id xsetroot -solid "#1d1d1d"
 exec_always --no-startup-id "pkill conky; sleep 0.5; conky -c ~/.config/conky; conky -c ~/.config/conky_shortcuts"
 set $picom_start "pkill picom; sleep 1; picom -b"
 exec_always --no-startup-id $picom_start
@@ -495,9 +473,12 @@ bar {
     strip_workspace_numbers yes
 
     colors {
-        background #4a4a4a
-        statusline #F9FAF9
-        separator  #454947
+        #background #4a4a4a
+        background #000000
+        #statusline #F9FAF9
+        statusline $accent-bg
+        #separator  #454947
+        separator  $accent-bg
 
 #                      border  backgr. text
         focused_workspace  $accent-txt $accent-bg $accent-txt

i3status/.i3status.conf.py3status

@@ -9,8 +9,10 @@
 general {
         colors = true
         interval = 5
-        color_good = "#F9FAF9"
-        color_bad = "#F9FAF9"
+        #color_good = "#F9FAF9"
+        #color_bad = "#F9FAF9"
+        color_good = "#07eded"
+        color_bad = "#07eded"
         color_degraded = "#DC322F"
 }