Move emms track information to new dwm status bar

5 files changed, 10 insertions, 17 deletions

diff --git a/.config/emacs/modules/bd--emms.el b/.config/emacs/modules/bd--emms.el
index 84182ab..d939691 100644
--- a/.config/emacs/modules/bd--emms.el
+++ b/.config/emacs/modules/bd--emms.el
@@ -15,6 +15,9 @@ playback."
 (use-package emms
   :bind (("C-z C-s" . 'emms-quickstart)
          ("C-z C-p" . 'emms-play-playlist))
+  :hook
+  (emms-playlist-selection-changed . (lambda ()
+                                       (start-process-shell-command "refreshstatus" nil "refreshstatus")))
   :config
   (emms-all)
   (require 'emms-player-mpd)
@@ -36,9 +39,8 @@ playback."
   (emms-source-file-default-directory (expand-file-name "~/ik/playlists/"))
   (emms-volume-change-function 'emms-volume-mpd-change)
   ;; misc
-  (emms-mode-line-format "%s ")
   (emms-playlist-buffer-name "*Playlist*")
-  (emms-mode-line-icon-enabled-p nil))
+  (emms-mode-line-disable))
 
 
 (provide 'bd--emms)
diff --git a/.config/emacs/modules/bd--modeline.el b/.config/emacs/modules/bd--modeline.el
index 986ca23..249e55b 100644
--- a/.config/emacs/modules/bd--modeline.el
+++ b/.config/emacs/modules/bd--modeline.el
@@ -78,18 +78,9 @@
   "Formats the checked out git repository.")
 
 
-;;;; emms
-(defvar-local bd/emms-mode-line
-    '(:eval (when (and (mode-line-window-selected-p) emms-mode-line-string)
-              (format "%s %s" emms-mode-line-string
-                      emms-playing-time-string)))
-  "Formats the currently playing emms track.")
-
-
 (dolist (construct '(bd/time-mode-line
                      bd/buffer-identification-mode-line
                      bd/vc-mode-line
-                     bd/emms-mode-line
                      bd/line-position))
   (put construct 'risky-local-variable t))
 
@@ -106,7 +97,6 @@
                mode-line-modified
                bd/vc-mode-line
                "      "
-               bd/emms-mode-line
                (mode-line-fill 35)
                bd/line-position
                "  "
diff --git a/.config/emacs/modules/bd--themes.el b/.config/emacs/modules/bd--themes.el
index 166fea8..c4eb197 100644
--- a/.config/emacs/modules/bd--themes.el
+++ b/.config/emacs/modules/bd--themes.el
@@ -18,7 +18,8 @@ to.")
  bd/enable-variable-pitch-in-hooks)
 
 (set-face-attribute 'variable-pitch nil
-                    :family "Dejavu Serif")
+                    :family "Dejavu Serif"
+                    :height 102)
 (set-face-attribute 'fixed-pitch nil
                     :family "Terminus"
                     :height 120)
diff --git a/.config/guix/modules/desktop.scm b/.config/guix/modules/desktop.scm
index 0a2f2d7..84371f4 100644
--- a/.config/guix/modules/desktop.scm
+++ b/.config/guix/modules/desktop.scm
@@ -191,7 +191,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
 fi
 
 picom &
-time-getter &
+dwmstatus &
 emacs --daemon
 set-bg
 xset r rate 250 70
diff --git a/.config/guix/modules/dwm/config.def.h b/.config/guix/modules/dwm/config.def.h
index 0f24d2d..f1411f8 100644
--- a/.config/guix/modules/dwm/config.def.h
+++ b/.config/guix/modules/dwm/config.def.h
@@ -2,12 +2,12 @@
 
 /* appearance */
 static const unsigned int borderpx  = 1;        /* border pixel of windows */
-static const unsigned int gappx     = 60;        /* gaps between windows */
+static const unsigned int gappx     = 8;        /* gaps between windows */
 static const unsigned int snap      = 32;       /* snap pixel */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
-static const char *fonts[]          = { "Source Code Pro:size=10" };
-static const char dmenufont[]       = "Source Code Pro:size=10";
+static const char *fonts[]          = { "Terminus:size=10" };
+static const char dmenufont[]       = "Terminus:size=10";
 static const char col_gray1[]       = "#333333";
 static const char col_gray2[]       = "#666666";
 static const char col_gray3[]       = "#bbbbbb";