so so much stuff

1 files changed, 28 insertions, 13 deletions

diff --git a/+emms.el b/+emms.el
index 945982c..3b03e9e 100644
--- a/+emms.el
+++ b/+emms.el
@@ -1,18 +1,33 @@
 ;;; $DOOMDIR/+emms.el -*- lexical-binding: t; -*-
 (use-package! emms
+  :commands (emms emms-browser)
+  :init
+  (map! :leader
+        (:prefix ("e" . "emms")
+         :desc "Browser"    "b" #'emms-browser
+         :desc "Playlist"   "m" #'emms-playlist-mode-go
+         :desc "Play/pause" "SPC" #'emms-pause
+         :desc "Next"       "n" #'emms-next
+         :desc "Previous"   "p" #'emms-previous
+         :desc "Stop"       "s" #'emms-stop
+         :desc "Clear"      "c" #'emms-playlist-clear))
   :config
   (require 'emms-setup)
-  (require 'emms-player-mpd)
   (emms-all)
-  (emms-default-players)
-  (emms-mpris-enable)
-  (setq emms-source-file-default-directory "~/Music/")
-  (setq emms-player-list
-        '(emms-player-mpd)))
-
-(map!
- :leader
- :prefix "e"
- :desc "Browser" "b" #'emms-browser
- :desc "Emms" "e" #'emms
- :desc "Play playlist" "a" #'emms-play-playlist)
+  (require 'emms-player-mpd)
+  (setq emms-player-list '(emms-player-mpd)
+        emms-info-functions '(emms-info-mpd)
+        emms-player-mpd-server-name "localhost"
+        emms-player-mpd-server-port "6600"
+        emms-player-mpd-music-directory "~/Music"
+        emms-source-file-default-directory (expand-file-name "~/Music/")
+        emms-repeat-playlist t
+        emms-cache-file (concat doom-cache-dir "emms-cache"))
+  (add-hook 'emms-playlist-cleared-hook #'emms-player-mpd-clear)
+  (emms-player-mpd-connect)
+  (emms-mode-line-mode 1)
+  (emms-lyrics-toggle-display-on-minibuffer)
+  (emms-lyrics-toggle-display-on-modeline)
+  (emms-playing-time-mode 1)
+  (map! :map emms-browser-mode-map
+        :n "RET" #'emms-browser-add-tracks-and-play))