format, move to use-package declarations

1 files changed, 79 insertions, 71 deletions

diff --git a/bard-emacs-modules/bard-emacs-window.el b/bard-emacs-modules/bard-emacs-window.el
index 2dc63e0..8ee8d00 100644
--- a/bard-emacs-modules/bard-emacs-window.el
+++ b/bard-emacs-modules/bard-emacs-window.el
@@ -1,17 +1,23 @@
 (require 'bard-window)
 
-(setq focus-follows-mouse t)
-(setq mouse-autoselect-window t)
-(setq window-combination-resize t)
-(setq even-window-sizes 'height-only)
-(setq window-sides-vertical nil)
-(setq switch-to-buffer-in-dedicated-window 'pop)
-(setq split-height-threshold 80)
-(setq split-width-threshold 125)
-(setq window-min-height 3)
-(setq window-min-width 30)
+(use-package emacs
+  ;; configuration for window splits/window sizes
+  :config
+  (setq focus-follows-mouse t)
+  (setq mouse-autoselect-window t)
+  (setq window-combination-resize t)
+  (setq even-window-sizes 'height-only)
+  (setq window-sides-vertical nil)
+  (setq switch-to-buffer-in-dedicated-window 'pop)
+  (setq split-height-threshold 80)
+  (setq split-width-threshold 125)
+  (setq window-min-height 3)
+  (setq window-min-width 30))
 
-(define-key global-map (kbd "C-x f") #'other-frame-prefix)
+(use-package emacs
+  :bind
+  (("C-x f" . other-window-prefix)
+   ("C-c TAB" . other-frame-prefix)))
 
 (use-package eyebrowse
   :ensure t
@@ -27,10 +33,9 @@
    ("M-6" . eyebrowse-switch-to-window-config-6)
    ("M-7" . eyebrowse-switch-to-window-config-7)
    ("M-8" . eyebrowse-switch-to-window-config-8)
-   ("M-9" . eyebrowse-switch-to-window-config-9))
-  )
+   ("M-9" . eyebrowse-switch-to-window-config-9)))
 
-(use-package emacs
+(use-package windmove
   :bind*
   (("C-M-<up>" . windmove-up)
    ("C-M-<right>" . windmove-right)
@@ -41,65 +46,68 @@
    ("C-M-S-<down>" . windmove-swap-states-down)
    ("C-M-S-<left>" . windmove-swap-states-left)))
 
-(setq display-buffer-alist
-      `(("\\`\\*Async Shell Command\\*\\'"
-	 (display-buffer-no-window))
-	("\\`\\*\\(Warnings\\|Compile-Log\\)\\*\\'"
-	 (display-buffer-no-window)
-	 (allow-no-window . t))
-	("\\*\\(Calendar\\|wclock\\).*"
-	 (display-buffer-reuse-mode-window display-buffer-below-selected)
-	 (dedicated . t)
-	 (window-height . fit-window-to-buffer))
-	("\\magit: .*"
-	 (display-buffer-same-window)
-	 (inhibit-same-window . nil)
-	 (dedicated . t))
-	("\\*Org Agenda\\*"
-	 (display-buffer-same-window)
-	 (inhibit-same-window . nil)
-	 (dedicated . t))
-	("\\*Embark Actions\\*"
-         (display-buffer-reuse-mode-window display-buffer-below-selected)
-         (window-height . fit-window-to-buffer)
-         (window-parameters . ((no-other-window . t)
-                               (mode-line-format . none))))
-	("\\(\\*Capture\\*\\|CAPTURE-.*\\)"
-	 (display-buffer-reuse-mode-window display-buffer-below-selected))
-	;; error stuff
-	((or . ((derived-mode . flymake-diagnostics-buffer-mode)
-                (derived-mode . flymake-project-diagnostics-mode)
-                (derived-mode . messages-buffer-mode)
-                (derived-mode . backtrace-mode)
-		(derived-mode . cider-stacktrace-mode)))
-         (display-buffer-reuse-mode-window display-buffer-at-bottom)
-         (window-height . 0.3)
-         (dedicated . t)
-         (preserve-size . (t . t)))
-
-	((or . ((derived-mode . occur-mode)
-                (derived-mode . grep-mode)
-		(derived-mode . Man-mode)
-                (derived-mode . Buffer-menu-mode)
-                (derived-mode . log-view-mode)
-                (derived-mode . help-mode) ; See the hooks for `visual-line-mode'
-                "\\*\\(|Buffer List\\|Occur\\|Man.*\\|Org Select\\|vc-change-log\\|eldoc.*\\).*"
-                prot-window-shell-or-term-p
-                ,world-clock-buffer-name))
-         (prot-window-display-buffer-below-or-pop)
-         (body-function . prot-window-select-fit-size))
-	))
+(use-package emacs
+  :config
+  (setq display-buffer-alist
+        `(("\\`\\*Async Shell Command\\*\\'"
+	       (display-buffer-no-window))
+	      ("\\`\\*\\(Warnings\\|Compile-Log\\|tex-shell\\)\\*\\'"
+	       (display-buffer-no-window)
+	       (allow-no-window . t))
+	      ("\\*\\(Calendar\\|wclock\\).*"
+	       (display-buffer-reuse-mode-window display-buffer-below-selected)
+	       (dedicated . t)
+	       (window-height . fit-window-to-buffer))
+	      ("\\magit: .*"
+	       (display-buffer-same-window)
+	       (inhibit-same-window . nil)
+	       (dedicated . t))
+	      ("\\*Org Agenda\\*"
+	       (display-buffer-same-window)
+	       (inhibit-same-window . nil)
+	       (dedicated . t))
+	      ("\\*Embark Actions\\*"
+           (display-buffer-reuse-mode-window display-buffer-below-selected)
+           (window-height . fit-window-to-buffer)
+           (window-parameters . ((no-other-window . t)
+                                 (mode-line-format . none))))
+	      ("\\(\\*Capture\\*\\|CAPTURE-.*\\)"
+	       (display-buffer-reuse-mode-window display-buffer-below-selected))
+	      ;; error stuff
+	      ((or . ((derived-mode . flymake-diagnostics-buffer-mode)
+                  (derived-mode . flymake-project-diagnostics-mode)
+                  (derived-mode . messages-buffer-mode)
+                  (derived-mode . backtrace-mode)
+		          (derived-mode . cider-stacktrace-mode)))
+           (display-buffer-reuse-mode-window display-buffer-at-bottom)
+           (window-height . 0.3)
+           (dedicated . t)
+           (preserve-size . (t . t)))
 
-(winner-mode 1)
-(let ((map global-map))
-     (define-key map (kbd "C-x <right>") #'winner-redo)
-     (define-key map (kbd "C-x <left>") #'winner-undo)
-     (define-key map (kbd "C-x C-n") #'next-buffer)
-     (define-key map (kbd "C-x C-p") #'previous-buffer)
-     (define-key map (kbd "C-x <up>") #'next-buffer)
-     (define-key map (kbd "C-x <down>") #'previous-buffer))
+	      ((or . ((derived-mode . occur-mode)
+                  (derived-mode . grep-mode)
+		          (derived-mode . Man-mode)
+                  (derived-mode . Buffer-menu-mode)
+                  (derived-mode . log-view-mode)
+                  (derived-mode . help-mode) ; See the hooks for `visual-line-mode'
+                  "\\*\\(|Buffer List\\|Occur\\|Man.*\\|Org Select\\|vc-change-log\\|eldoc.*\\).*"
+                  prot-window-shell-or-term-p
+                  ,world-clock-buffer-name))
+           (prot-window-display-buffer-below-or-pop)
+           (body-function . prot-window-select-fit-size))
+	      ))
+  )
 
-(define-key global-map (kbd "C-x w") #'delete-frame)
+(use-package winner-mode
+  :init
+  (winner-mode 1)
+  :bind
+  (("C-x <right>" . winner-redo)
+   ("C-x <left>" . winner-undo)
+   ("C-x C-n" . next-buffer)
+   ("C-x C-p" . previous-buffer)
+   ("C-x <up>" . next-buffer)
+   ("C-x <down>" . previous-buffer)))
 
 (provide 'bard-emacs-window)
 ;;; bard-emacs-window.el ends here