[polybar] brighter colours

4 files changed, 36 insertions, 33 deletions

diff --git a/config.ini b/config.ini
index bfad4b9..2f34bbf 100644
--- a/config.ini
+++ b/config.ini
@@ -1,13 +1,11 @@
 ;; ~/.config/polybar/config.ini
-
 [colors]
 bg         = #111111
 bg-alt     = #1c1c1c
-fg         = #cccccc
-fg-dim     = #777777
+fg         = #e8e8e8
+fg-dim     = #b0b0b0
 accent     = #285577
 urgent     = #cc4444
-
 [bar/main]
 monitor              =
 width                = 100%
@@ -15,37 +13,28 @@ height               = 22
 offset-x             = 0
 offset-y             = 0
 bottom               = true
-
 background           = ${colors.bg}
 foreground           = ${colors.fg}
-
 padding-left         = 0
 padding-right        = 0
-
 module-margin-left   = 0
 module-margin-right  = 0
-
 font-0 = "Fira Nerd Font:pixelsize=11:antialias=true;3"
-
 modules-left   = xmonad
 modules-center =
 modules-right  = cpu memory volume date time
-
 tray-position        = right
 tray-padding         = 6
 tray-background      = ${colors.bg}
 tray-maxsize         = 14
-
 cursor-default = default
 cursor-click   = default
 cursor-scroll  = default
-
 [module/xmonad]
 type           = custom/script
 exec           = tail -F /tmp/xmonad-log 2>/dev/null
 tail           = true
 format-padding = 1
-
 [module/cpu]
 type                 = internal/cpu
 interval             = 2
@@ -55,7 +44,6 @@ format-padding       = 2
 format-margin-left   = 2
 label                = CPU %percentage%%
 label-foreground     = ${colors.fg-dim}
-
 [module/memory]
 type                 = internal/memory
 interval             = 2
@@ -65,7 +53,6 @@ format-padding       = 2
 format-margin-left   = 2
 label                = MEM %used%
 label-foreground     = ${colors.fg-dim}
-
 [module/volume]
 type                 = custom/script
 exec                 = pamixer --get-volume-human 2>/dev/null || echo --
@@ -76,7 +63,6 @@ format-padding       = 2
 format-margin-left   = 2
 label                = VOL %output%
 label-foreground     = ${colors.fg-dim}
-
 [module/date]
 type                 = internal/date
 interval             = 10
@@ -87,7 +73,6 @@ format-padding       = 2
 format-margin-left   = 2
 label                = %date%
 label-foreground     = ${colors.fg-dim}
-
 [module/time]
 type                 = internal/date
 interval             = 10
diff --git a/config.org b/config.org
index 70cbd9f..64d26b0 100644
--- a/config.org
+++ b/config.org
@@ -183,16 +183,14 @@
 
 * ALL THE ICONS
 #+begin_src emacs-lisp
-  (use-package all-the-icons
-    :ensure t
-    :defer t
-    :hook (server-after-make-frame . (lambda ()
-  				       (when (display-graphic-p)
-  					 (require 'all-the-icons)))))
+(use-package all-the-icons
+  :ensure t
+  :defer t)
 
-  (use-package all-the-icons-dired
-    :ensure t
-    :hook (dired-mode . (lambda () (all-the-icons-dired-mode t))))
+(use-package all-the-icons-dired
+  :ensure t
+  :defer t
+  :hook (dired-mode . all-the-icons-dired-mode))
 #+end_src
 
 * BUFFER MOVE
@@ -504,6 +502,8 @@ Type "<s" followed by TAB to expand to a begin_src tag.
 
   (use-package all-the-icons-ivy-rich
     :ensure t
+    :defer t
+    :after ivy-rich
     :init (all-the-icons-ivy-rich-mode 1))
 
   (use-package ivy-rich
diff --git a/polybar-launch.sh b/polybar-launch.sh
new file mode 100755
index 0000000..6ef9fa2
--- /dev/null
+++ b/polybar-launch.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# Wait briefly for WM to settle
+sleep 0.5
+
+# Kill existing bars
+killall -q polybar
+while pgrep -u $UID -x polybar > /dev/null; do sleep 0.1; done
+
+# Launch on all connected monitors
+if type "xrandr" > /dev/null 2>&1; then
+  for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
+    MONITOR=$m polybar --reload main &
+  done
+else
+  polybar --reload main &
+fi
diff --git a/xmonad.hs b/xmonad.hs
index 018aee0..0200fda 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -76,15 +76,16 @@ myStartupHook = do
     spawnOnce "nitrogen --restore"
     spawnOnce "nm-applet"
     spawnOnce "pa-applet"
+    spawnOnce "xrdb -merge ~/.Xresources"
     spawnOnce "xset r rate 300 50"
     spawnOnce "xsetroot -cursor_name left_ptr"
     spawnOnce "parcellite"
     spawnOnce "flameshot"
     spawnOnce "/opt/piavpn/bin/pia-client"
     spawnOnce "dunst"
-    spawnOnce "mkfifo /tmp/xmonad-log 2>/dev/null; polybar main &"
+    spawnOnce "~/.config/polybar/polybar-launch.sh"
     spawnOnce "urxvtd -q -o -f"
-    spawnOnce "/usr/bin/emacs --daemon --init-dir ~/.config/emacs"
+    spawnOnce "/usr/bin/emacs --daemon --init-dir ~/.config/emacs/"
 
 ------------------------------------------------------------------------
 -- Key bindings
@@ -161,11 +162,11 @@ myLogHook fifo = dynamicLogWithPP $ def
     , ppSep             = "  "
     , ppTitleSanitize   = xmobarStrip
     , ppCurrent         = wrap "%{B#285577}%{F#ffffff} " " %{F-}%{B-}"
-    , ppHidden          = wrap "%{F#888888} " " %{F-}"
-    , ppHiddenNoWindows = wrap "%{F#333333} " " %{F-}"
+    , ppHidden          = wrap "%{F#b0b0b0} " " %{F-}"
+    , ppHiddenNoWindows = wrap "%{F#555555} " " %{F-}"
     , ppUrgent          = wrap "%{B#cc4444}%{F#ffffff} " " %{F-}%{B-}"
-    , ppTitle           = wrap "%{F#555555}" "%{F-}" . shorten 40
-    , ppLayout          = wrap "%{F#444444}[" "]%{F-}" . \l -> case l of
+    , ppTitle           = wrap "%{F#c0c0c0}" "%{F-}" . shorten 40
+    , ppLayout          = wrap "%{F#909090}[" "]%{F-}" . \l -> case l of
                             "Tall"        -> "T"
                             "Mirror Tall" -> "M"
                             "Full"        -> "F"
@@ -196,4 +197,4 @@ main = do
             , startupHook        = myStartupHook
             , logHook            = myLogHook fifo
             }
-        `additionalKeysP` myKeys
+        `additionalKeysP` myKeys
\ No newline at end of file