1 files changed, 37 insertions, 35 deletions

diff --git a/.config/emacs/modules/bd--emms.el b/.config/emacs/modules/bd--emms.el
index ff5b192..b19264c 100644
--- a/.config/emacs/modules/bd--emms.el
+++ b/.config/emacs/modules/bd--emms.el
@@ -3,54 +3,56 @@
 ;;; Code:
 
 
-(defun emms-quickstart ()
-  "Queues a shuffled playlist and starts
-playback."
-  (interactive)
-  (emms-stop)
-  (when (bufferp emms-playlist-buffer-name)
-    (kill-buffer emms-playlist-buffer-name))
-  (emms-play-directory-tree (expand-file-name "~/ik/music/"))
-  (emms-shuffle))
-
-
 (use-package emms
-  :bind (("C-z C-s" . 'emms-quickstart))
   :config
   (emms-all)
   (require 'emms-player-mpv)
+  (require 'emms-playlist-mode)
+
+  (defun emms-quickstart ()
+    "Queues a shuffled playlist and starts
+playback."
+    (interactive)
+    (emms-stop)
+    (when (bufferp emms-playlist-buffer-name)
+      (kill-buffer emms-playlist-buffer-name))
+    (emms-play-directory-tree (expand-file-name "~/ik/music/"))
+    (emms-shuffle))
+  (defun switch-to-emms ()
+    (interactive)
+    (if (get-buffer emms-playlist-buffer-name)
+        (display-buffer emms-playlist-buffer-name)
+      (message "The Ainur cannot hear you...")))
+  (keymap-global-set "C-z C-s" #'emms-quickstart)
+  (keymap-global-set "C-z C-m" #'switch-to-emms)
+  (keymap-set emms-playlist-mode-map "q" #'quit-window)
+
   (add-to-list 'emms-player-list 'emms-player-mpv)
-  (keymap-global-set "C-z C-m"  (lambda ()
-                                  (interactive)
-                                  (if (get-buffer emms-playlist-buffer-name)
-                                      (display-buffer emms-playlist-buffer-name)
-                                    (message "The Ainur cannot hear you..."))))
   (emms-playing-time-disable-display)
-  (setopt emms-track-description-function
-          '(lambda (track)
-             (let ((artist (emms-track-get track 'info-artist))
-                   (title  (emms-track-get track 'info-title)))
-               (cond
-                ((and artist title)
-                 (concat artist " - " title))
-                (title
-                 title)
-                (t
-                 (emms-track-simple-description track))))))
-  (keymap-set emms-playlist-mode-map "q" #'quit-window)
-  (setq-default
-   emms-playlist-default-major-mode 'emms-playlist-mode
+  (setq-default emms-playlist-default-major-mode 'emms-playlist-mode
 
-   emms-player-list '(emms-player-mpv)
-   emms-player-mpv-environment '("PULSE_PROP_media.role=music")
-   emms-player-mpv-parameters '("--quiet" "--really-quiet" "--no-audio-display" "--force-window=no" "--vo=null"))
+                emms-player-list '(emms-player-mpv)
+                emms-player-mpv-environment '("PULSE_PROP_media.role=music")
+                emms-player-mpv-parameters '("--quiet" "--really-quiet" "--no-audio-display" "--force-window=no" "--vo=null"))
   :custom
   ;; set dir and volume keys
   (emms-source-file-default-directory (expand-file-name "~/ik/playlists/"))
   ;; misc
   (emms-info-report-each-num-tracks 2000)
   (emms-playlist-buffer-name "*Playlist*")
-  (emms-mode-line-format " %s "))
+  (emms-mode-line-format " %s ")
+  (emms-track-description-function
+   '(lambda (track)
+      (let ((artist (emms-track-get track 'info-artist))
+            (title  (emms-track-get track 'info-title)))
+        (cond
+         ((and artist title)
+          (concat artist " - " title))
+         (title
+          title)
+         (t
+          (emms-track-simple-description track)))))))
+
 
 (provide 'bd--emms)
 ;;; bd-emms ends here