emacs/.emacs.d/config/init-completion.el

@@ -61,6 +61,7 @@
 ;; Consult adds a bunch of completing-read based utilities
 (use-package consult
   :general
-  ([remap switch-to-buffer] #'consult-buffer))
+  ([remap switch-to-buffer] #'consult-buffer)
+  ([remap isearch-forward] #'consult-line))
 
 (provide 'init-completion)

emacs/.emacs.d/config/init-editing.el

@@ -1,68 +0,0 @@
-;; General text editing configuration
-
-;; Tree-shaped undos
-(use-package undo-tree
-  :config
-  (global-undo-tree-mode)
-  :general
-  ("C-c C-r" #'undo-tree-visualize))
-
-;; Better isearch
-(use-package ctrlf
-  :config
-  (ctrlf-mode 1))
-
-;; "pair" management, where pairs are parentheses, braces, etc.
-(use-package smartparens
-  :config
-  (require 'smartparens-config)
-  (smartparens-global-mode)
-  (defun sp-wrap-double-quote ()
-    (interactive)
-    (sp-wrap-with-pair "\""))
-  (defun sp-wrap-single-quote ()
-    (interactive)
-    (sp-wrap-with-pair "'"))
-  :hook
-  (prog-mode . smartparens-strict-mode)
-  :general
-  ;; Wrapping
-  (leader-map
-   "s(" #'sp-wrap-round
-   "s{" #'sp-wrap-curly
-   "s'" #'sp-wrap-single-quote
-   "s\"" #'sp-wrap-double-quote
-   "sW" #'sp-unwrap-sexp
-   "sl" #'sp-next-sexp
-   "sh" #'sp-backward-sexp
-   "sj" #'sp-down-sexp
-   "sk" #'sp-backward-up-sexp
-   "sL" #'sp-forward-symbol
-   "sH" #'sp-backward-symbol
-   "s^" #'sp-beginning-of-sexp
-   "s$" #'sp-end-of-sexp
-   "st" #'sp-transpose-sexp
-   "su" #'undo-tree-undo
-   "sy" #'sp-copy-sexp
-   "sd" #'sp-kill-sexp
-   "ss" #'sp-forward-slurp-sexp
-   "sS" #'sp-backward-slurp-sexp
-   "sb" #'sp-forward-barf-sexp
-   "sB" #'sp-backward-barf-sexp
-   "sv" #'sp-select-next-thing
-   "sV" #'sp-select-previous-thing)
-  (normal "g(" #'sp-wrap-round
-          "g[" #'sp-wrap-square
-          "g{" #'sp-wrap-curly
-          "g\"" #'sp-wrap-double-quote
-          "g'" #'sp-wrap-single-quote))
-
-(use-package evil-smartparens
-  :after (evil smartparens)
-  :hook (smartparens-enabled . evil-smartparens-mode))
-
-;; Automagical indent
-(use-package aggressive-indent
-  :hook (prog-mode . aggressive-indent-mode))
-
-(provide 'init-editing)

emacs/.emacs.d/config/init-evil.el

@@ -3,9 +3,7 @@
   :init
   (setq evil-want-keybinding nil)
   :config
-  (evil-mode 1)
+  (evil-mode 1))
-  :custom
-  (evil-undo-system 'undo-tree))
 
 (use-package evil-collection
   :after evil)

emacs/.emacs.d/init.el

@@ -36,7 +36,6 @@
 (require 'init-windows)
 (require 'init-dired)
 (require 'init-completion)
-(require 'init-editing)
 (require 'init-ui)
 (require 'init-projects)
 (require 'init-git)