Compare commits

..

No commits in common. "ca32065fb8a3544ca6feb32d5fdf0445c4d5e97f" and "2868187c247c1b6470f7dd6709d26669be224d30" have entirely different histories.

17
init.el
View File

@ -298,12 +298,6 @@
(use-package man (use-package man
:init (setopt Man-switches "-a")) :init (setopt Man-switches "-a"))
(use-package minibuffer
:bind (:map minibuffer-mode-map
("M-r" . consult-history)
("C-r" . consult-history))
:hook (minibuffer-setup . cursor-intangible-mode))
(use-package multisession (use-package multisession
:init (setq multisession-directory (expand-file-name "multisession/" emacs-d-userdata))) :init (setq multisession-directory (expand-file-name "multisession/" emacs-d-userdata)))
@ -2389,7 +2383,11 @@ Note that this workaround is incomplete, as explained in this comment."
completion-in-region-function #'consult-completion-in-region) completion-in-region-function #'consult-completion-in-region)
(use-package helm (use-package helm
:init (setopt helm-command-prefix-key nil)) :ensure t
:bind (:map helm-command-map
("#" . helm-emms))
:init (setopt helm-command-prefix-key "C-c h" ; see `db/run-init' for explicit binding
))
(use-package recentf (use-package recentf
:commands (recentf-mode recentf-save-list) :commands (recentf-mode recentf-save-list)
@ -3040,6 +3038,7 @@ Note that this workaround is incomplete, as explained in this comment."
;; Global Hooks (XXX: should be moved outside of this init function) ;; Global Hooks (XXX: should be moved outside of this init function)
(add-hook 'minibuffer-setup-hook 'cursor-intangible-mode)
(add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p) (add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p)
;; Top-Level Keybindings ;; Top-Level Keybindings
@ -3070,7 +3069,6 @@ Note that this workaround is incomplete, as explained in this comment."
(bind-key "C-c c" #'org-capture) (bind-key "C-c c" #'org-capture)
(bind-key "C-c d" #'define-word-at-point) (bind-key "C-c d" #'define-word-at-point)
(bind-key "C-c e" #'crux-eval-and-replace) (bind-key "C-c e" #'crux-eval-and-replace)
(bind-key "C-c h #" #'helm-emms)
(bind-key "C-c i" #'ispell-change-dictionary) (bind-key "C-c i" #'ispell-change-dictionary)
(bind-key "C-c j" #'avy-goto-char-timer) (bind-key "C-c j" #'avy-goto-char-timer)
(bind-key "C-c l" #'org-store-link) (bind-key "C-c l" #'org-store-link)
@ -3112,6 +3110,9 @@ Note that this workaround is incomplete, as explained in this comment."
(bind-key "M-j" #'(lambda () (interactive) (join-line -1))) (bind-key "M-j" #'(lambda () (interactive) (join-line -1)))
(bind-key "M-z" #'zap-up-to-char) (bind-key "M-z" #'zap-up-to-char)
(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 fill-paragraph] #'endless/fill-or-unfill)
(bind-key [remap keyboard-quit] #'keyboard-quit-context+) (bind-key [remap keyboard-quit] #'keyboard-quit-context+)
(bind-key [remap kill-whole-line] #'crux-kill-whole-line) (bind-key [remap kill-whole-line] #'crux-kill-whole-line)