diff --git a/modules/emacs.el b/modules/emacs.el index 84bb9a0..845d9c9 100644 --- a/modules/emacs.el +++ b/modules/emacs.el @@ -17,13 +17,14 @@ (setq emodule/emacs-packages - '(info+ - discover-my-major + '(discover-my-major help+ help-fns+ help-mode+ ibuffer-vc + info+ rainbow-mode + sr-speedbar which-key use-package) @@ -82,6 +83,30 @@ " " filename-and-process)))) + ;; -------------------------------------------------------------------------- + ;; Speedbar. + ;; -------------------------------------------------------------------------- + + (use-package sr-speedbar + :defer t + :bind + (("C-c s" . sr-speedbar-toggle)) + :config + (setq-default + sr-speedbar-skip-other-window-p t + sr-speedbar-right-side nil + speedbar-show-unknown-files t + sr-speedbar-delete-windows t) + + (defun goto-speedbar () + "Set the speedbar window as the active window." + (interactive) + (if (window-live-p sr-speedbar-window) + (set-frame-selected-window (window-frame) sr-speedbar-window) + (user-error "Speedbar window is not live"))) + + (global-set-key (kbd "M-m") #'goto-speedbar)) + ;; -------------------------------------------------------------------------- ;; Rainbow mode. ;; -------------------------------------------------------------------------- diff --git a/modules/programming.el b/modules/programming.el index 572c9d1..404e488 100644 --- a/modules/programming.el +++ b/modules/programming.el @@ -31,7 +31,6 @@ highlight-symbol plantuml-mode rust-mode - sr-speedbar stickyfunc-enhance swiper toml-mode @@ -213,30 +212,6 @@ :defer t :mode "\\.lock\\'") - ;; -------------------------------------------------------------------------- - ;; Speedbar. - ;; -------------------------------------------------------------------------- - - (use-package sr-speedbar - :defer t - :bind - (("C-c s" . sr-speedbar-toggle)) - :config - (setq-default - sr-speedbar-skip-other-window-p t - sr-speedbar-right-side nil - speedbar-show-unknown-files t - sr-speedbar-delete-windows t) - - (defun goto-speedbar () - "Set the speedbar window as the active window." - (interactive) - (if (window-live-p sr-speedbar-window) - (set-frame-selected-window (window-frame) sr-speedbar-window) - (user-error "Speedbar window is not live"))) - - (global-set-key (kbd "M-m") #'goto-speedbar)) - ;; -------------------------------------------------------------------------- ;; Configure `swiper'. ;; --------------------------------------------------------------------------