From 6d22458c6f6ce8ee187913aa2765ce19dd098bac Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Mon, 21 Nov 2022 23:35:07 +0100
Subject: Set up polybar and decommission i3status

---
 home-configuration.scm | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'home-configuration.scm')

diff --git a/home-configuration.scm b/home-configuration.scm
index 9e9a3590..56763e1b 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -96,12 +96,12 @@ replacement spec (to which `regexp-substitute/global' is applied)."
 (define gui-packages
   '(;; i3 and Xorg. i3 itself must be installed system-wide for gdm to pick it up.
     ;; acpilight is a drop-in xbacklight replacement, as xbacklight doesn't work on my system.
-    "acpilight" "arandr" "blueman" "gnupg" "gimp" "hsetroot" "i3status"
-    "inkscape" "icecat" "kitty" "mpv" "nheko" "neomutt"
-    "password-store" "rofi" "rofi-calc" "signal-desktop" "simple-scan"
-    "xdg-utils" "xdot" "xclip" "xdotool" "xdpyinfo" "xev" "xfd"
-    "xfontsel" "xinput" "xkill" "xprop" "xrandr" "xrdb" "xsel"
-    "xset" "xwininfo" "zoom" "zathura" "zathura-ps" "zathura-pdf-poppler"
+    "acpilight" "arandr" "blueman" "dunst" "gnupg" "gimp" "hsetroot"
+    "inkscape" "icecat" "kitty" "mpv" "nheko" "neomutt" "password-store"
+    "polybar" "rofi" "rofi-calc" "signal-desktop" "simple-scan"
+    "xdg-utils" "xdot" "xclip" "xdotool" "xdpyinfo" "xev" "xfd" "xfontsel"
+    "xinput" "xkill" "xprop" "xrandr" "xrdb" "xsel" "xset" "xwininfo"
+    "zoom" "zathura" "zathura-ps" "zathura-pdf-poppler"
     ;; kitty uses startup-notifications, but doesn't pull it.
     ;; TODO: kitty still doesn't find libstartup-notification-1.so,
     ;; even though it's installed by this package. Maybe kitty needs
@@ -119,6 +119,17 @@ replacement spec (to which `regexp-substitute/global' is applied)."
     "catppuccin-mocha-dark-cursors"
     "simutrans"))
 
+(define (polybar-service monitor)
+  (shepherd-service
+   (documentation (string-append "Polybar desktop bar for monitor" monitor "."))
+   (provision (list (string->symbol (string-append "polybar-" monitor))))
+   (start #~(make-forkexec-constructor
+             (list #$(package-binary "polybar") "--reload")
+             #:environment-variables
+             (cons #$(string-append "POLYBAR_MONITOR=" monitor)
+                   (default-environment-variables))))
+   (stop #~(make-kill-destructor))))
+
 (define gui-services
   (list
    ;; Batsignal: battery level notifications.
@@ -159,6 +170,10 @@ replacement spec (to which `regexp-substitute/global' is applied)."
       (start #~(make-forkexec-constructor
                 (list #$(package-binary "blueman" "blueman-applet"))))
       (stop #~(make-kill-destructor)))
+
+     (polybar-service "eDP-1")
+     (polybar-service "HDMI-1-1")
+
      (shepherd-service
       (documentation "Dunst notification daemon; displays desktop notifications.")
       (provision '(dunst))
@@ -211,7 +226,6 @@ replacement spec (to which `regexp-substitute/global' is applied)."
       ("gtk-2.0/gtkrc" ,(local-file "gtk2.ini"))
       ("gtk-3.0/settings.ini" ,(local-file "gtk3.ini"))
       ("i3/config" ,(local-file "i3.conf"))
-      ("i3status/config" ,(local-file "i3status.conf"))
       ("kitty/diff.conf"
        ,(local-file #.(string-append "catppuccin/kitty/diff-"
                                      catppuccin-theme-variant ".conf")
@@ -223,6 +237,10 @@ replacement spec (to which `regexp-substitute/global' is applied)."
                                                          catppuccin-theme-variant ".conf")
                                         "kitty-theme.conf")))
       ("picom/picom.conf" ,(local-file "picom.conf"))
+      ("polybar/config.ini" ,(local-file "polybar.ini"))
+      ("polybar/catppuccin.ini"
+       ,(local-file #.(string-append "catppuccin/polybar/themes/"
+                                     catppuccin-theme-variant ".ini")))
       ("rofi/config.rasi" ,(local-file "rofi.rasi"))
       ("rofi/themes/catppuccin.rasi"
        ,(text-file/substitutions "catppuccin.rasi"
-- 
cgit v1.2.3