summaryrefslogtreecommitdiffstats
path: root/.emacs.d/init.org
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2013-02-02 00:56:15 +0100
committerGravatar Tom Willemsen2013-02-02 00:56:32 +0100
commit8fddc0d0a741ca8b77c08a6c8f33ce1ee6a5925e (patch)
tree2e39c9a3189d290c3f130545a6c383cf318f7a84 /.emacs.d/init.org
parent9223d0e998953f12631a7c9dd42fd5e052eadc23 (diff)
downloaddotfiles-8fddc0d0a741ca8b77c08a6c8f33ce1ee6a5925e.tar.gz
dotfiles-8fddc0d0a741ca8b77c08a6c8f33ce1ee6a5925e.zip
emacs: Move EMMS settings to init.org
Diffstat (limited to '.emacs.d/init.org')
-rw-r--r--.emacs.d/init.org46
1 files changed, 46 insertions, 0 deletions
diff --git a/.emacs.d/init.org b/.emacs.d/init.org
index 9caead5..50a4161 100644
--- a/.emacs.d/init.org
+++ b/.emacs.d/init.org
@@ -83,6 +83,52 @@
(eval-after-load "eldoc" '(diminish 'eldoc-mode))
#+END_SRC
+ Use the standard EMMS configuration and add some MPD settings.
+
+ #+BEGIN_SRC emacs-lisp :tangle init2.el
+ (defun oni:emms-init ()
+ "Initialization function for EMMS."
+ (require 'emms-setup)
+ (require 'emms-player-mpd)
+
+ (emms-standard)
+
+ (add-to-list 'emms-info-functions 'emms-info-mpd)
+ (add-to-list 'emms-player-list 'emms-player-mpd)
+
+ (setq emms-player-mpd-server-name "localhost")
+ (setq emms-player-mpd-server-port "6600")
+ (setq emms-player-mpd-music-directory "/mnt/music/mp3"))
+
+ (eval-after-load "emms-source-file" '(oni:emms-init))
+ (setq emms-source-file-default-directory "/mnt/music/")
+ #+END_SRC
+
+ Add some keybindings for EMMS.
+
+ #+BEGIN_SRC emacs-lisp :tangle init2.el
+ (defun oni:emms-toggle-playing ()
+ "Toggle between playing/paused states."
+ (interactive)
+ (if (eq emms-player-playing-p nil)
+ (emms-start)
+ (emms-pause)))
+
+ (defun oni:start-emms ()
+ "Check to see if the function `emms' exists, if not call
+ `emms-player-mpd-connect' and assume that will have loaded it."
+ (interactive)
+ (unless (fboundp 'emms)
+ (emms-player-mpd-connect))
+ (emms))
+
+ (global-set-key (kbd "<XF86AudioNext>") 'emms-next)
+ (global-set-key (kbd "<XF86AudioPlay>") 'oni:emms-toggle-playing)
+ (global-set-key (kbd "<XF86AudioPrev>") 'emms-previous)
+ (global-set-key (kbd "<XF86AudioStop>") 'emms-stop)
+ (global-set-key (kbd "<XF86Tools>") 'oni:start-emms)
+ #+END_SRC
+
** Eshell
Add ~unison~ to the list of =eshell-visual-commands= because it