diff options
Diffstat (limited to 'emacs/.config/emacs-kj/init.el')
| -rw-r--r-- | emacs/.config/emacs-kj/init.el | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el index c4c3d48..83a9353 100644 --- a/emacs/.config/emacs-kj/init.el +++ b/emacs/.config/emacs-kj/init.el @@ -114,11 +114,6 @@ (process-buffer proc)) (kill-buffer (process-buffer proc))))))))) -(defun kj/shell-history () - (interactive) - - ) - (use-package coterm :config (coterm-mode 1)) @@ -359,6 +354,9 @@ ;; Both < and C-+ work reasonably well. (setq consult-narrow-key "<") ;; (kbd "C-+") + (setq consult-ripgrep-args + "rg --null --line-buffered --color=never --max-columns=1000 --path-separator / --smart-case --no-heading --with-filename --line-number --search-zip --hidden") + ;; Optionally make narrowing help available in the minibuffer. ;; You may want to use `embark-prefix-help-command' or which-key instead. ;; (define-key consult-narrow-map (vconcat consult-narrow-key "?") #'consult-narrow-help) @@ -433,7 +431,7 @@ :bind (:map projectile-mode-map ("C-x p" . projectile-command-map))) -(use-package ediff +(use-package emacs :init (setq ediff-diff-options "-w" ; turn off whitespace checking ediff-split-window-function #'split-window-horizontally @@ -882,8 +880,7 @@ (add-to-list 'display-buffer-alist `(kj/help-modes ;predicate - (display-buffer--maybe-same-window - display-buffer-reuse-window + (display-buffer-reuse-window display-buffer-reuse-mode-window) ;functions to try (mode . ,kj/help-modes) (inhibit-same-window . nil))) |