From 196eb6ca14ecc50f76d5e64753265d1214cc18a2 Mon Sep 17 00:00:00 2001 From: Daniel <89086143+BardofSprites@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:18:54 -0500 Subject: removed unnecessary packages --- bard-emacs-modules/bard-emacs-calendar.el | 11 --- bard-emacs-modules/bard-emacs-essentials.el | 41 ---------- bard-emacs-modules/bard-emacs-org.el | 7 -- bard-emacs-modules/bard-emacs-prog.el | 43 ++-------- bard-emacs-modules/bard-emacs-ui.el | 15 ---- bard-emacs-modules/bard-emacs-window.el | 118 ++++++++++++++++++---------- bard-emacs-modules/bard-emacs-writing.el | 9 --- 7 files changed, 80 insertions(+), 164 deletions(-) diff --git a/bard-emacs-modules/bard-emacs-calendar.el b/bard-emacs-modules/bard-emacs-calendar.el index 46c5247..073aeab 100644 --- a/bard-emacs-modules/bard-emacs-calendar.el +++ b/bard-emacs-modules/bard-emacs-calendar.el @@ -78,15 +78,4 @@ holiday-christian-holidays nil holiday-islamic-holidays nil)) -(use-package calfw - :ensure t - :bind - (:map cfw:calendar-mode-map - ("g" . cfw:refresh-calendar-buffer)) - :bind - ("" . bard/open-calendar)) - -(use-package calfw-org - :ensure t) - (provide 'bard-emacs-calendar) diff --git a/bard-emacs-modules/bard-emacs-essentials.el b/bard-emacs-modules/bard-emacs-essentials.el index acee6e9..6ff2900 100644 --- a/bard-emacs-modules/bard-emacs-essentials.el +++ b/bard-emacs-modules/bard-emacs-essentials.el @@ -142,47 +142,6 @@ (define-key global-map (kbd "C-c C-w") #'world-clock) -(use-package breadcrumb - :after spacious-padding - :hook - (prog-mode . breadcrumb-local-mode)) - -(use-package vundo - :ensure t - :defer 1 - :bind - ( :map vundo-mode-map - ("C-/" . vundo-backward) - ("C-?" . vundo-forward) - ("g" . vundo-goto-last-saved) - ("p" . vundo-backward) - ("n" . vundo-forward) - ("f" . vundo-next) - ("b" . vundo-previous)) - :config - (setq vundo-glyph-alist vundo-unicode-symbols) - - (defvar prot/vundo-undo-functions '(undo undo-only undo-redo) - "List of undo functions to check if we need to visualise the undo ring.") - - (defvar prot/vundo-undo-command #'undo - "Command to call if we are not going to visualise the undo ring.") - - (defun prot/vundo-if-repeat-undo (&rest args) - "Use `vundo' if the last command is among `prot/vundo-undo-functions'. -In other words, start visualising the undo ring if we are going -to be cycling through the edits." - (interactive) - (if (and (member last-command prot/vundo-undo-functions) - (not undo-in-region)) - (call-interactively 'vundo) - (apply args))) - - (mapc - (lambda (fn) - (advice-add fn :around #'prot/vundo-if-repeat-undo)) - prot/vundo-undo-functions)) - ;; running emacs as server (require 'server) (setq server-client-instructions nil) diff --git a/bard-emacs-modules/bard-emacs-org.el b/bard-emacs-modules/bard-emacs-org.el index 2225cb2..593843f 100644 --- a/bard-emacs-modules/bard-emacs-org.el +++ b/bard-emacs-modules/bard-emacs-org.el @@ -154,11 +154,4 @@ :config (require 'org-download)) -;; (use-package org-modern -;; :ensure t -;; :config -;; (setq org-modern-star nil -;; org-modern-block-name nil) -;; (global-org-modern-mode)) - (provide 'bard-emacs-org) diff --git a/bard-emacs-modules/bard-emacs-prog.el b/bard-emacs-modules/bard-emacs-prog.el index 8b0a778..1d284f5 100644 --- a/bard-emacs-modules/bard-emacs-prog.el +++ b/bard-emacs-modules/bard-emacs-prog.el @@ -21,20 +21,6 @@ (add-to-list 'exec-path bard/ghcup-path))) ;; Lisp -(use-package clojure-mode - :ensure t - :bind - (:map clojure-mode-map - ("C-" . cider-switch-to-repl-buffer)) - :hook - (clojure-mode . paredit-mode)) - -(use-package cider - :ensure t - :bind - (:map cider-repl-mode-map - ("C-" . cider-switch-to-last-clojure-buffer))) - (use-package sly :ensure t :config @@ -47,17 +33,6 @@ :ensure t) ;; parens packages -(use-package paredit - :ensure t) - -(use-package scheme-mode - :hook (scheme-mode . paredit-mode)) - -(use-package lisp-mode - :hook (lisp-mode . paredit-mode)) - -(use-package emacs-lisp-mode - :hook (emacs-lisp-mode . paredit-mode)) (use-package c++-mode :bind @@ -95,18 +70,10 @@ ("~/.emacs.d" . 0) ("~/Pictures/wallpaper" . 0))) -(use-package ada-mode - :load-path "~/.emacs.d/old-ada" - :bind - (:map ada-mode-map - ("C-j" . dired-jump))) - -(use-package diff-hl - :ensure t - :after magit - (add-hook 'magit-pre-refresh-hook 'diff-hl-magit-pre-refresh) - (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh) - :init - (add-hook 'prog-mode-hook 'diff-hl-mode)) +;; (use-package ada-mode +;; :load-path "~/.emacs.d/old-ada" +;; :bind +;; (:map ada-mode-map +;; ("C-j" . dired-jump))) (provide 'bard-emacs-prog) diff --git a/bard-emacs-modules/bard-emacs-ui.el b/bard-emacs-modules/bard-emacs-ui.el index c9905ec..b01383d 100644 --- a/bard-emacs-modules/bard-emacs-ui.el +++ b/bard-emacs-modules/bard-emacs-ui.el @@ -23,21 +23,6 @@ :config (setq display-line-numbers-type 'relative)) -;; padding for everything -(use-package spacious-padding - :ensure t - :config - (setq spacious-padding-widths - '( :internal-border-width 20 - :header-line-width 4 - :mode-line-width 6 - :tab-width 4 - :right-divider-width 20 - :left-fringe-width 0 - :right-fringe-width 0 - :scroll-bar-width 0)) - (spacious-padding-mode t)) - ;; Todo Keywords highlighting, colors defined in bard-emacs-theme.el (use-package hl-todo :ensure t diff --git a/bard-emacs-modules/bard-emacs-window.el b/bard-emacs-modules/bard-emacs-window.el index 529f689..665b0b3 100644 --- a/bard-emacs-modules/bard-emacs-window.el +++ b/bard-emacs-modules/bard-emacs-window.el @@ -14,22 +14,6 @@ (setq window-min-height 3) (setq window-min-width 30)) -(use-package winum - :ensure t - :bind - (("M-1" . winum-select-window-1) - ("M-2" . winum-select-window-2) - ("M-3" . winum-select-window-3) - ("M-4" . winum-select-window-4) - ("M-5" . winum-select-window-5) - ("M-6" . winum-select-window-6) - ("M-7" . winum-select-window-7) - ("M-8" . winum-select-window-8) - ("M-9" . winum-select-window-9)) - :config - (setq winum-scope 'frame-local) - ) - (use-package windmove :bind* (("C-M-" . windmove-up) @@ -44,16 +28,29 @@ (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: .*" + `(;; no window + ("\\`\\*Async Shell Command\\*\\'" + (display-buffer-no-window)) + ("\\`\\*\\(Warnings\\|Compile-Log\\|Org Links\\)\\*\\'" + (display-buffer-no-window) + (allow-no-window . t)) + ;; bottom side window + ("\\*Org \\(Select\\|Note\\)\\*" ; the `org-capture' key selection and `org-add-log-note' + (display-buffer-in-side-window) + (dedicated . t) + (side . bottom) + (slot . 0) + (window-parameters . ((mode-line-format . none)))) + ;; bottom buffer (NOT side window) + ((or . ((derived-mode . flymake-diagnostics-buffer-mode) + (derived-mode . flymake-project-diagnostics-mode) + (derived-mode . messages-buffer-mode) + (derived-mode . backtrace-mode))) + (display-buffer-reuse-mode-window display-buffer-at-bottom) + (window-height . 0.3) + (dedicated . t) + (preserve-size . (t . t))) + ("\\magit: .*" (display-buffer-same-window) (inhibit-same-window . nil) (dedicated . t)) @@ -61,38 +58,73 @@ (display-buffer-same-window) (inhibit-same-window . nil) (dedicated . t)) - ("\\*Embark Actions\\*" + ("\\*cfw-calendar\\*" + (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) + ("\\*\\(Output\\|Register Preview\\).*" + (display-buffer-reuse-mode-window display-buffer-at-bottom)) + ;; below current window + ("\\(\\*Capture\\*\\|CAPTURE-.*\\)" + (display-buffer-in-side-window) + (dedicated . t) + (side . bottom) + (slot . 0) + (window-parameters . ((mode-line-format . none)))) + ("\\*\\vc-\\(incoming\\|outgoing\\|git : \\).*" + (display-buffer-reuse-mode-window display-buffer-below-selected) + (window-height . 0.1) (dedicated . t) (preserve-size . (t . t))) - - ((or . ((derived-mode . occur-mode) + ((derived-mode . reb-mode) ; M-x re-builder + (display-buffer-reuse-mode-window display-buffer-below-selected) + (window-height . 4) ; note this is literal lines, not relative + (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.*\\).*" + "\\*\\(|Buffer List\\|Occur\\|vc-change-log\\|eldoc.*\\).*" prot-window-shell-or-term-p - ,world-clock-buffer-name)) + ;; ,world-clock-buffer-name + )) (prot-window-display-buffer-below-or-pop) (body-function . prot-window-select-fit-size)) - )) + ("\\*\\(Calendar\\|Bookmark Annotation\\|ert\\).*" + (display-buffer-reuse-mode-window display-buffer-below-selected) + (dedicated . t) + (window-height . fit-window-to-buffer)) + ;; NOTE 2022-09-10: The following is for `ispell-word', though + ;; it only works because I override `ispell-display-buffer' + ;; with `prot-spell-ispell-display-buffer' and change the + ;; value of `ispell-choices-buffer'. + ("\\*ispell-top-choices\\*.*" + (display-buffer-reuse-mode-window display-buffer-below-selected) + (window-height . fit-window-to-buffer)) + ;; same window + + ;; NOTE 2023-02-17: `man' does not fully obey the + ;; `display-buffer-alist'. It works for new frames and for + ;; `display-buffer-below-selected', but otherwise is + ;; unpredictable. See `Man-notify-method'. + ((or . ((derived-mode . Man-mode) + (derived-mode . woman-mode) + "\\*\\(Man\\|woman\\).*")) + (display-buffer-same-window)))) ) +(use-package frame + :ensure nil + :bind ("C-x u" . undelete-frame) ; I use only C-/ for `undo' + :hook (after-init . undelete-frame-mode)) + (use-package winner-mode :init (winner-mode 1) diff --git a/bard-emacs-modules/bard-emacs-writing.el b/bard-emacs-modules/bard-emacs-writing.el index 0e3a02f..c9e0f65 100644 --- a/bard-emacs-modules/bard-emacs-writing.el +++ b/bard-emacs-modules/bard-emacs-writing.el @@ -36,15 +36,6 @@ (setq show-paren-when-point-inside-paren nil) (setq show-paren-context-when-offscreen 'overlay)) -;; Captain capitalization -(use-package captain - :ensure t - :hook - (text-mode . captain-mode) - :bind - ("M-u" . captain-capitalize-word) - ("M-S-u" . captain-capitalize-sentence)) - ;; snippets (use-package tempel -- cgit v1.2.3