3 files changed, 48 insertions, 3 deletions
diff --git a/mixins/dev.el b/mixins/dev.el
index 9f24b02..c92075e 100644
--- a/mixins/dev.el
+++ b/mixins/dev.el
@@ -32,7 +32,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (use-package markdown-mode
-  :ensure t)
+  :hook ((markdown-mode . visual-line-mode)))
 
 (use-package yaml-mode
   :ensure t)
diff --git a/mixins/ui.el b/mixins/ui.el
index 54a71c0..4a3f003 100644
--- a/mixins/ui.el
+++ b/mixins/ui.el
@@ -74,10 +74,14 @@
 ;; Consult: Misc. enhanced commands
 (use-package consult
   :ensure t
+  ;; Other good things to bind: consult-ripgrep, consult-line-multi,
+  ;; consult-history, consult-outline, consult-error
   :bind (("C-x b" . consult-buffer) ;; orig. switch-to-buffer
          ("M-y" . consult-yank-pop) ;; orig. yank-pop
-         ("C-s" . consult-line)     ;; orig. isearch
-         ))
+         ("C-s" . consult-line))    ;; orig. isearch
+  :config
+  ;; Narrowing lets you restrict results to certain groups of candidates
+  (setq consult-narrow-key "<"))
 
 (use-package eshell
   :bind (("C-r" . consult-history)))
diff --git a/mixins/vim-like.el b/mixins/vim-like.el
index 6de8431..02468a3 100644
--- a/mixins/vim-like.el
+++ b/mixins/vim-like.el
@@ -15,8 +15,49 @@
 ;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+;; Evil: vi emulation
+(use-package evil
+  :ensure t
+  :init
+  (setq evil-respect-visual-line-mode t)
+  (setq evil-undo-system 'undo-redo)
+  (setq evil-want-keybinding nil)       ; prep to load evil-collection
+  :config
+  (evil-mode)
+
+  ;; Configuring initial major mode for some modes
+  (evil-set-initial-state 'vterm-mode 'emacs))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
 ;;;   Evil Enhancements
 ;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; Evil-collection: handy evil bindings for lots of different modes
+(use-package evil-collection
+  :ensure t
+  :after evil
+  :config
+  ;; Other good ones to enable: magit, mu4e, eglot, etc.
+  (evil-collection-init '(dired info))
+
+  ;; You can add evil-mode keybindings here; for example, when we're in
+  ;; special-mode, it usually means we're in some kind of uneditable buffer like
+  ;; a message popup etc. `q' will quit inside these windows instead of starting
+  ;; a macro recording.
+  (evil-collection-define-key 'normal 'special-mode-map
+    (kbd "q") 'quit-window))
+
+;; Evil-owl: preview what's in your vim registers
+(use-package evil-owl
+  :ensure t
+  :config
+  (setq evil-owl-idle-delay 0.3)
+  (setq evil-owl-max-string-length 500)
+  (add-to-list 'display-buffer-alist
+               '("*evil-owl*"
+                 (display-buffer-in-side-window)
+                 (side . bottom)
+                 (window-height . 30)))
+  (evil-owl-mode))