From 4e70e151d85f06cba891b731dbbaeca44a09f65b Mon Sep 17 00:00:00 2001 From: bd Date: Thu, 4 Jan 2024 17:43:53 -0700 Subject: Rewrote emms-open-playlist-buffer --- .config/emacs/bd-emms.el | 23 ++++++++--------------- .config/emacs/init.el | 12 ++++-------- 2 files changed, 12 insertions(+), 23 deletions(-) (limited to '.config/emacs') diff --git a/.config/emacs/bd-emms.el b/.config/emacs/bd-emms.el index 1204d17..2e48ca0 100644 --- a/.config/emacs/bd-emms.el +++ b/.config/emacs/bd-emms.el @@ -1,17 +1,13 @@ ;; -*- lexical-binding: t; -*- (defun emms-open-playlist-buffer () - "Opens the current playlist in the + "Opens the current playlist in the right side window." (interactive) - ;; if playlist open, open playlist view. Else, if browser open, open browser view. Else, print failure - (cond ((match-buffer-name "*Playlist*") - (display-buffer-in-side-window (get-buffer "*Playlist*") '((side . right))) - (select-window (get-buffer-window "*Playlist*"))) - ((match-buffer-name "Browsing by: artist") - (display-buffer-in-side-window (get-buffer "Browsing by: artist") '((side . right))) - (select-window (get-buffer-window "Browsing by: artist"))) - (t (message "No EMMS buffers open!")))) + (if (get-buffer emms-playlist-buffer-name) + (progn (display-buffer-in-side-window (get-buffer emms-playlist-buffer-name) '((side . right))) + (select-window (get-buffer-window emms-playlist-buffer-name))) + (message "The Ainur are silent..."))) (defun emms-quickstart () "Queues a shuffled playlist and starts @@ -21,12 +17,9 @@ playback." (when (bufferp emms-playlist-buffer-name) (kill-buffer emms-playlist-buffer-name)) (emms-play-directory-tree (expand-file-name "~/Personal/mpd/music/")) - (emms-shuffle) - (emms-next)) + (emms-shuffle)) (use-package emms - :defer 4 - ;; need to load immediately for mode line :bind (("C-z C-m" . 'emms-open-playlist-buffer)) :config (emms-all) @@ -39,8 +32,8 @@ playback." (emms-player-mpd-server-name "localhost") (emms-player-mod-server-port "6600") ;; set dir and volume keys - (emms-player-mpd-music-directory "/home/bdunahu/Personal/mpd/music/") - (emms-source-file-default-directory "/home/bdunahu/Personal/mpd/playlists/") + (emms-player-mpd-music-directory (expand-file-name "$HOME/Personal/mpd/music/")) + (emms-source-file-default-directory (expand-file-name "$HOME/Personal/mpd/playlists/")) (emms-volume-change-function 'emms-volume-mpd-change) ;; misc (emms-mode-line-format "%s ") diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 778443f..0fe8ac8 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -7,10 +7,6 @@ (load (expand-file-name "$HOME/.config/emacs/bd-default.el")) -(defun match-buffer-name (name) - "Returns non-nil if NAME matches the name of an existing buffer" - (try-completion name (mapcar #'buffer-name (buffer-list)))) - (defun clamp (lower-bound upper-bound value) (max lower-bound (min value upper-bound))) @@ -19,10 +15,10 @@ (load (expand-file-name "$HOME/.config/emacs/bd-development.el")) (setopt erc-server "irc.libera.chat" - erc-nick "Isaz" - erc-user-full-name "bd" - erc-kill-buffer-on-part t - erc-autojoin-channels-alist '(("irc.libera.chat" "#parabola" "#emacs"))) + erc-nick "Isaz" + erc-user-full-name "bd" + erc-kill-buffer-on-part t + erc-autojoin-channels-alist '(("irc.libera.chat" "#parabola" "#emacs" "#guix"))) (defalias 'erc 'erc-tls) ;; dired -- cgit v1.2.3