From 9d2943d443c5b0bdb07482d1e8b424e4e0e65e75 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Mon, 25 Dec 2017 15:31:55 -0500
Subject: [PATCH] Moving stuff back to xprofile. Some more polybar prettying

---
 polybar   | 26 ++++++++++++++------------
 xmonad.hs | 20 ++++++++++----------
 xprofile  | 17 +++++++++--------
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/polybar b/polybar
index cbda4c0..066a0ee 100644
--- a/polybar
+++ b/polybar
@@ -14,8 +14,9 @@ background-alt = #444444
 ;foreground = ${xrdb:color7:#222}
 foreground = #ffffff
 foreground-alt = #aaaaaa
-primary = #ffb52a
+primary = #0a6cf5
 secondary = #e60053
+tertiary = #ffb52a
 alert = #bd2c40
 
 [bar/top]
@@ -86,22 +87,23 @@ label-unmounted-foreground = ${colors.foreground-alt}
 [module/workspace]
 type = internal/xworkspaces
 
-label-active = %icon% %name%
-label-active-background = ${colors.background-alt}
+label-active = %name%
+; label-active-background = ${colors.background-alt}
 label-active-foreground = ${colors.foreground}
 label-active-underline = ${colors.primary}
 label-active-padding = 2
 
-label-occupied = %index%
-label-occupied-padding = 2
+label-occupied = %name%
 label-occupied-foreground = ${colors.foreground}
+label-occupied-underline = ${colors.secondary}
+label-occupied-padding = 2
 
-label-urgent = %index%!
-label-urgent-background = ${colors.alert}
+label-urgent = %name%!
 label-urgent-foreground = ${colors.foreground}
+label-urgent-background = ${colors.alert}
 label-urgent-padding = 2
 
-label-empty = %index%
+label-empty = %name%
 label-empty-foreground = ${colors.foreground-alt}
 label-empty-padding = 2
 
@@ -176,15 +178,15 @@ format-disconnected =
 type = internal/date
 interval = 5
 
-date =
-date-alt = " %Y-%m-%d"
+date = " %Y-%m-%d"
+; date-alt = " %Y-%m-%d"
 
 time = %H:%M
-time-alt = %H:%M:%S
+; time-alt = %H:%M:%S
 
 format-prefix = 
 format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #0a6cf5
+format-underline = #ffb52a
 
 label = %date% %time%
 
diff --git a/xmonad.hs b/xmonad.hs
index 3107116..c3e4c53 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -12,22 +12,22 @@ lightBlue = "#66aaff"
 main = xmonad $ docks $ ewmh $ defaultConfig
     { terminal = "urxvtc"
     , modMask = mod4Mask
-    , workspaces = [ "1", "2", "3" ]
+    , workspaces = [ "α", "β", "γ" ]
     , borderWidth = 2
     , normalBorderColor = "#000000"
     , focusedBorderColor = lightBlue
     , focusFollowsMouse = False
     , layoutHook = avoidStruts $ spacingWithEdge 6 $ layoutHook defaultConfig
     , startupHook = do
-        spawn "polybar top"
-        spawn "compton -cGb"
-        spawn "~/dotfiles/logitech_linux_mouse.sh"
-        spawn "xsetroot -solid black -cursor_name left_ptr"
-        spawn "feh --bg-fill ~/Sync/Pictures/Wallpaper/space2.jpg"
-        spawn "setxkbmap -option ctrl:nocaps -option compose:ralt"
-        spawn "xcape -e 'Control_L=Escape'"
-        spawn "qsyncthingtray"
-        spawn "xscreensaver"
+        spawn "pkill polybar; polybar top &"
+        -- spawn "compton -cGb"
+        -- spawn "~/dotfiles/logitech_linux_mouse.sh"
+        -- spawn "xsetroot -solid black -cursor_name left_ptr"
+        -- spawn "feh --bg-fill ~/Sync/Pictures/Wallpaper/space2.jpg"
+        -- spawn "setxkbmap -option ctrl:nocaps -option compose:ralt"
+        -- spawn "xcape -e 'Control_L=Escape'"
+        -- spawn "qsyncthingtray"
+        -- spawn "xscreensaver"
     }
     `additionalKeysP`
     [ ("M1-<Space>", spawn "rofi -show combi")
diff --git a/xprofile b/xprofile
index ed770d4..e843a94 100644
--- a/xprofile
+++ b/xprofile
@@ -1,8 +1,9 @@
-# setxkbmap -option ctrl:nocaps -option compose:ralt
-# xcape -e 'Control_L=Escape'
-# compton -cGb
-# sh ~/dotfiles/logitech_linux_mouse.sh
-# xsetroot -solid black -cursor_name left_ptr
-# feh --bg-fill ~/Sync/Pictures/Wallpaper/space2.jpg
-# qsyncthingtray &
-# xscreensaver &
+setxkbmap -option ctrl:nocaps -option compose:ralt
+xcape -e 'Control_L=Escape'
+xmodmap -e "keycode 96 = dead_greek dead_greek dead_greek dead_greek"
+compton -cGb
+sh ~/dotfiles/logitech_linux_mouse.sh
+xsetroot -solid black -cursor_name left_ptr
+feh --bg-fill ~/Sync/Pictures/Wallpaper/space2.jpg
+qsyncthingtray &
+xscreensaver &