Make popper respect default-buffer-alist, but default to standard.

3 files changed, 11 insertions, 8 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index c655ca2..79ae17f 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -52,10 +52,10 @@
 (require 'bd--shells)
 (require 'bd--minibuffer)
 (require 'bd--completions)
+(require 'bd--popper)
 (require 'bd--devel)
 (require 'bd--org)
 (require 'bd--roam)
 (require 'bd--emms)
 (require 'bd--modeline)
-(require 'bd--popper)
 (require 'bd--exwm-windowing)
diff --git a/.config/emacs/modules/bd--emms.el b/.config/emacs/modules/bd--emms.el
index 8ee2b34..f3db35d 100644
--- a/.config/emacs/modules/bd--emms.el
+++ b/.config/emacs/modules/bd--emms.el
@@ -22,8 +22,7 @@ playback."
   (keymap-global-set "C-z C-m"  (lambda ()
                                   (interactive)
                                   (if (get-buffer emms-playlist-buffer-name)
-                                      (progn (display-buffer emms-playlist-buffer-name)
-                                             (select-window (get-buffer-window emms-playlist-buffer-name)))
+                                      (display-buffer emms-playlist-buffer-name)
                                     (message "The Ainur cannot hear you..."))))
   :custom
   ;; make sure mpd is configured similarly
@@ -43,8 +42,9 @@ playback."
 (add-to-list 'display-buffer-alist
              `(,emms-playlist-buffer-name
                (display-buffer-in-side-window)
-               (side . right)
-               (window-width . 45)))
+               (side . left)
+               (window-width . 45)
+               (body-function . select-window)))
 
 
 (provide 'bd--emms)
diff --git a/.config/emacs/modules/bd--popper.el b/.config/emacs/modules/bd--popper.el
index 6b4d83b..e3e43e7 100644
--- a/.config/emacs/modules/bd--popper.el
+++ b/.config/emacs/modules/bd--popper.el
@@ -3,6 +3,7 @@
 
 ;;;; popper
 (use-package popper
+  :demand t
   :bind (("C-`" . 'popper-toggle-latest)
          ("M-`" . 'popper-cycle)
          ("C-M-`" . popper-toggle-type))
@@ -23,16 +24,18 @@
      compilatin-mode
      emms-playlist-mode
      emms-browser-mode))
-  ;; (popper-display-control 'user)
+  (popper-display-control 't)
   (popper-mode-line '(:eval (propertize " P" 'face 'mode-line-emphasis))))
 
 
 ;;;; buffer defaults for default buffers
 (add-to-list 'display-buffer-alist
-             `(,(regexp-opt'("*shell*" "*eshell*" "*term*"))
+             '((or (derived-mode . term-mode)
+                   (derived-mode . eshell-mode)
+                   (derived-mode . shell-mode))
                (display-buffer-in-side-window)
                (side . top)
-               (window-height . 20)))
+               (window-height . 15)))
 
 
 (provide 'bd--popper)