From a8da7548af2f3c038b4dac5c0199f31a3930d829 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Thu, 7 Aug 2025 17:27:57 +0200 Subject: [PATCH] Remove some unnecessary conditional keybindings All affected packages are required by now. --- init.el | 62 ++++++++++++++++++------------------------ site-lisp/db-eshell.el | 7 ----- 2 files changed, 27 insertions(+), 42 deletions(-) diff --git a/init.el b/init.el index d3820e2..88514df 100644 --- a/init.el +++ b/init.el @@ -2368,18 +2368,19 @@ Note that this workaround is incomplete, as explained in this comment." ;; * Completion -(setq suggest-key-bindings t - extended-command-suggest-shorter t - completions-detailed t - completion-cycle-threshold nil - completion-styles '(basic orderless) - completion-category-defaults nil - ;; Via https://protesilaos.com/emacs/dotemacs, with additional changes - completion-category-overrides '((file (styles . (basic partial-completion orderless))) - (buffer (styles . (orderless))) - (bookmark (styles . (orderless))) - (imenu (styles . (basic substring orderless))) - (kill-ring (styles . (emacs22 orderless))))) +(setopt suggest-key-bindings t + extended-command-suggest-shorter t + completions-detailed t + completion-cycle-threshold nil + completion-styles '(basic orderless) + completion-category-defaults nil + ;; Via https://protesilaos.com/emacs/dotemacs, with additional changes + completion-category-overrides '((file (styles . (basic partial-completion orderless))) + (buffer (styles . (orderless))) + (bookmark (styles . (orderless))) + (imenu (styles . (basic substring orderless))) + (kill-ring (styles . (emacs22 orderless)))) + completion-in-region-function #'consult-completion-in-region) (use-package helm :ensure t @@ -2716,7 +2717,6 @@ Note that this workaround is incomplete, as explained in this comment." :commands (db/run-or-hide-eshell eshell-clear-buffer eshell/default-prompt-function - eshell-insert-history pcomplete/git)) (use-package eshell @@ -2740,7 +2740,7 @@ Note that this workaround is incomplete, as explained in this comment." ("M-P" . eshell-previous-prompt) ("M-N" . eshell-next-prompt) :map eshell-hist-mode-map - ("M-r" . eshell-insert-history)) + ("M-r" . consult-history)) :config (progn @@ -3095,12 +3095,14 @@ Note that this workaround is incomplete, as explained in this comment." (bind-key "C-h C-k" #'find-function-on-key) (bind-key "C-h C-v" #'find-variable) (bind-key "C-x 4 C-j" #'dired-jump-other-window) + (bind-key "C-x b" #'consult-buffer) (bind-key "C-x C-b" #'ibuffer) (bind-key "C-x C-d" #'dired) (bind-key "C-x C-j" #'dired-jump) (bind-key "C-x C-r" #'revert-buffer) (bind-key "C-x SPC" #'hydra-rectangle/body) (bind-key "C-x g" #'db/shortcuts) + (bind-key "C-x o" #'ace-window) (bind-key "C-x r E" #'db/bookmark-add-external) (bind-key "C-x r M" #'db/bookmark-add-url) (bind-key "C-x r v" #'list-registers) @@ -3111,39 +3113,29 @@ Note that this workaround is incomplete, as explained in this comment." (bind-key "M-Z" #'zap-to-char) (bind-key "M-j" #'(lambda () (interactive) (join-line -1))) (bind-key "M-z" #'zap-up-to-char) + (bind-key "M-g i" #'consult-imenu) + (bind-key "M-g g" #'avy-goto-line) + (bind-key "M-g M-g" #'avy-goto-line) + + (bind-key "M-r" #'consult-history minibuffer-mode-map) + (bind-key "C-r" #'consult-history minibuffer-mode-map) + (bind-key [remap fill-paragraph] #'endless/fill-or-unfill) (bind-key [remap keyboard-quit] #'keyboard-quit-context+) + (bind-key [remap kill-whole-line] #'crux-kill-whole-line) + (bind-key [remap open-line] #'crux-smart-open-line-above) + (unbind-key "" global-map) (unbind-key "" global-map) - (unbind-key "C-x C-c" global-map) + (unbind-key "C-x C-c" global-map) ; Quit emacs by calling `save-buffers-kill-emacs' directly (unbind-key "M-o" global-map) - ;; Overwrite certain keybindings only if packages are avilable - (when (package-installed-p 'helm) ;; Explicitly require helm, because autoloading is difficult with helm's ;; separate `helm-command-prefix-key' mechanism. (require 'helm) (bind-key helm-command-prefix-key #'helm-command-prefix)) - (when (package-installed-p 'crux) - (bind-key [remap kill-whole-line] #'crux-kill-whole-line) - (bind-key [remap open-line] #'crux-smart-open-line-above)) - - (when (package-installed-p 'ace-window) - (bind-key "C-x o" #'ace-window)) - - (when (package-installed-p 'avy) - (bind-key "M-g M-g" #'avy-goto-line) - (bind-key "M-g g" #'avy-goto-line)) - - (when (package-installed-p 'consult) - (bind-key "M-g i" #'consult-imenu) - (bind-key "C-x b" #'consult-buffer) - (setq completion-in-region-function #'consult-completion-in-region) - (bind-key "M-r" #'consult-history eshell-hist-mode-map) - (bind-key "M-r" #'consult-history minibuffer-mode-map) - (bind-key "C-r" #'consult-history minibuffer-mode-map)) ;; Environment Variables diff --git a/site-lisp/db-eshell.el b/site-lisp/db-eshell.el index b14199c..76c4eed 100644 --- a/site-lisp/db-eshell.el +++ b/site-lisp/db-eshell.el @@ -170,13 +170,6 @@ formatting." (if (zerop (user-uid)) "#" "$") (propertize " " 'face '(:weight bold))))) -(defun eshell-insert-history () - "Displays the eshell history to select and insert back into your eshell." - ;; directly taken from Howard Abrams - (interactive) - (insert (completing-read "Eshell history: " - (seq-uniq (ring-elements eshell-history-ring))))) - ;; Git Completion ;; https://tsdh.wordpress.com/2013/05/31/eshell-completion-for-git-bzr-and-hg/