diff options
| -rw-r--r-- | init.org | 45 | ||||
| -rw-r--r-- | lisp/init-music.el | 38 |
2 files changed, 42 insertions, 41 deletions
@@ -685,13 +685,54 @@ On my laptop screen the file name in the EMMS modeline cannot be fully displayed (emms-mode-line-cycle 1) #+END_SRC +Some more initialisation settings: + +#+BEGIN_SRC elisp +(emms-all) +(setq emms-playlist-buffer-name "*EMMS*") +(setq emms-source-file-directory-tree-function + 'emms-source-file-directory-tree-find) +#+END_SRC + +Set up global key bindings for controlling EMMS in any mode. + +#+BEGIN_SRC elisp +(global-set-key (kbd "C-c e t") 'emms-play-directory-tree) +(global-set-key (kbd "C-c e x") 'emms-start) +(global-set-key (kbd "C-c e v") 'emms-stop) +(global-set-key (kbd "C-c e n") 'emms-next) +(global-set-key (kbd "C-c e p") 'emms-previous) +(global-set-key (kbd "C-c e o") 'emms-show) +(global-set-key (kbd "C-c e h") 'emms-shuffle) +(global-set-key (kbd "C-c e e") 'emms-play-file) +(global-set-key (kbd "C-c e f") 'emms-play-playlist) +(global-set-key (kbd "C-c e SPC") 'emms-pause) +(global-set-key (kbd "C-c e a") 'emms-add-directory-tree) + +(global-set-key (kbd "C-c e r") 'emms-toggle-repeat-track) +(global-set-key (kbd "C-c e R") 'emms-toggle-repeat-playlist) + +;; playlist-mode-map +(define-key emms-playlist-mode-map (kbd "SPC") 'emms-pause) +(define-key emms-playlist-mode-map (kbd "+") 'emms-volume-raise) +(define-key emms-playlist-mode-map (kbd "-") 'emms-volume-lower) +(define-key emms-playlist-mode-map (kbd "<right>") + (lambda () (interactive) (emms-seek +10))) +(define-key emms-playlist-mode-map (kbd "<left>") + (lambda () (interactive) (emms-seek -10))) +(define-key emms-playlist-mode-map (kbd "<up>") + (lambda () (interactive) (emms-seek +60))) +(define-key emms-playlist-mode-map (kbd "<down>") + (lambda () (interactive) (emms-seek -60))) +#+END_SRC + All of this should be loaded lazily. #+BEGIN_SRC elisp :noweb-ref emms-lazy (with-eval-after-load "emms" <<emms>> ) -(require 'emms) +(require 'emms-setup) #+END_SRC * TODO Initial stuff @@ -857,8 +898,6 @@ This is even more stuff to be done after initialising packages. I still need to (load "init-modeline.el") (load "init-my-stuff.el") (load "init-paredit.el") -(load "init-music.el") -(require 'my/init-music) (load "init-god-mode.el") (require 'my/init-god-mode) diff --git a/lisp/init-music.el b/lisp/init-music.el deleted file mode 100644 index bf24e4d..0000000 --- a/lisp/init-music.el +++ /dev/null @@ -1,38 +0,0 @@ -(provide 'my/init-music) -(eval-after-load "emms" - '(progn - (emms-all) - (emms-default-players) - (setq emms-playlist-buffer-name "*EMMS*") - (setq emms-source-file-directory-tree-function - 'emms-source-file-directory-tree-find) - - (global-set-key (kbd "C-c e t") 'emms-play-directory-tree) - (global-set-key (kbd "C-c e x") 'emms-start) - (global-set-key (kbd "C-c e v") 'emms-stop) - (global-set-key (kbd "C-c e n") 'emms-next) - (global-set-key (kbd "C-c e p") 'emms-previous) - (global-set-key (kbd "C-c e o") 'emms-show) - (global-set-key (kbd "C-c e h") 'emms-shuffle) - (global-set-key (kbd "C-c e e") 'emms-play-file) - (global-set-key (kbd "C-c e f") 'emms-play-playlist) - (global-set-key (kbd "C-c e SPC") 'emms-pause) - (global-set-key (kbd "C-c e a") 'emms-add-directory-tree) - - (global-set-key (kbd "C-c e r") 'emms-toggle-repeat-track) - (global-set-key (kbd "C-c e R") 'emms-toggle-repeat-playlist) - - ;; playlist-mode-map - (define-key emms-playlist-mode-map (kbd "SPC") 'emms-pause) - (define-key emms-playlist-mode-map (kbd "+") 'emms-volume-raise) - (define-key emms-playlist-mode-map (kbd "-") 'emms-volume-lower) - (define-key emms-playlist-mode-map (kbd "<right>") - (lambda () (interactive) (emms-seek +10))) - (define-key emms-playlist-mode-map (kbd "<left>") - (lambda () (interactive) (emms-seek -10))) - (define-key emms-playlist-mode-map (kbd "<up>") - (lambda () (interactive) (emms-seek +60))) - (define-key emms-playlist-mode-map (kbd "<down>") - (lambda () (interactive) (emms-seek -60))))) -(require 'emms-setup) - |