From fe2978dce2304e1af9ec4207cfffdc417e8cde1b Mon Sep 17 00:00:00 2001
From: Grant Horner <h.grant.horner@gmail.com>
Date: Sat, 20 Jun 2026 20:18:20 -0400
Subject: [PATCH] set up evil

---
 custom.el |  6 +++---
 init.el   | 62 ++++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/custom.el b/custom.el
index fe89d63..c9422a5 100644
--- a/custom.el
+++ b/custom.el
@@ -6,9 +6,9 @@
  ;; If there is more than one, they won't work right.
  '(eglot-code-action-indications '(eldoc-hint))
  '(package-selected-packages
-   '(cape dumb-jump dumber-jump exec-path-from-shell jai-mode magit
-	  markdown-mode move-text multiple-cursors vterm yaml
-	  yaml-mode))
+   '(cape dumber-jump evil evil-collection exec-path-from-shell fish-mode
+	  jai-mode magit move-text multiple-cursors yaml-mode
+	  yasnippet yasnippet-snippets))
  '(package-vc-selected-packages
    '((jai-mode :url "https://github.com/valignatev/jai-mode.git"))))
 (custom-set-faces
diff --git a/init.el b/init.el
index be3802e..66cf804 100644
--- a/init.el
+++ b/init.el
@@ -24,16 +24,21 @@
 (keymap-global-set "C-c e i" #'hgh/edit-init-file)
 (keymap-global-set "C-,"     #'hgh/duplicate-dwim)
 
-(keymap-global-set "C-h h"   #'eldoc)
+(keymap-set help-map "h" #'eldoc)
+;; (keymap-global-set "C-h h"   #'eldoc)
+
+(setopt grep-find-program "rg --no-heading")
 
 (setq
  custom-file "~/.emacs.d/custom.el"
  make-backup-files nil
- dired-dwim-target t)
+ dired-dwim-target t
+ manual-program "gman"
+ )
 
 (load-file "~/.emacs.d/utils.el")
 
-(setq-default cursor-type 'bar)
+;; (setq-default cursor-type 'bar)
 
 (setopt
  use-short-answers t
@@ -70,9 +75,39 @@
 
 (exec-path-from-shell-initialize)
 
+(use-package evil
+  :custom
+  (evil-want-C-u-scroll t)
+  (evil-want-Y-yank-to-eol t)
+  (evil-move-beyond-eol t)
+  :ensure t
+  :init
+  (setq evil-want-integration t) ;; This is optional since it's already set to t by default.
+  (setq evil-want-keybinding nil)
+  :config
+  (evil-set-leader nil (kbd "SPC"))
+  (evil-mode 1)
+  (evil-global-set-key 'normal (kbd "<leader>ff") #'find-file)
+  (evil-global-set-key 'normal (kbd "<leader>fb") #'switch-to-buffer)
+  (evil-global-set-key 'normal (kbd "<leader>gs") #'magit)
+  (evil-global-set-key 'normal (kbd "<leader>rw") #'dired)
+  (evil-global-set-key 'normal (kbd "<leader>h")  #'help-command)
+
+  (evil-global-set-key 'normal (kbd "<leader>w")  evil-window-map)
+  (evil-global-set-key 'normal (kbd "<leader>p")  project-prefix-map)
+  )
+
+(use-package evil-collection
+  :after evil
+  :ensure t
+  :config
+  (evil-collection-init))
+
 (use-package move-text
   :bind (("M-<down>" . 'move-text-down)
-         ("M-<up>"   . 'move-text-up)))
+         ("M-j"      . 'move-text-down)
+         ("M-<up>"   . 'move-text-up)
+         ("M-k"      . 'move-text-up)))
 
 (use-package jai-mode
   :vc (:url "https://github.com/valignatev/jai-mode.git"
@@ -89,14 +124,15 @@
          ("C-c C-<" . mc/mark-all-like-this)
          ("C-c C->" . mc/mark-lines))
   :init
-  (advice-add 'mc/mark-next-like-this :before #'hgh/set-box-cursor)
-  (advice-add 'mc/mark-previous-like-this :before #'hgh/set-box-cursor)
-  (advice-add 'mc/mark-all-like-this :before #'hgh/set-box-cursor)
-  (add-hook 'multiple-cursors-mode-disabled-hook #'hgh/set-bar-cursor))
+  ;; (advice-add 'mc/mark-next-like-this :before #'hgh/set-box-cursor)
+  ;; (advice-add 'mc/mark-previous-like-this :before #'hgh/set-box-cursor)
+  ;; (advice-add 'mc/mark-all-like-this :before #'hgh/set-box-cursor)
+  ;; (add-hook 'multiple-cursors-mode-disabled-hook #'hgh/set-bar-cursor)
+  )
 
 (use-package cape
   :hook ((completion-at-point-functions . cape-dabbrev)
-	 (completion-at-point-functions . cape-file)))
+         (completion-at-point-functions . cape-file)))
 
 (use-package dumber-jump
   :init
@@ -128,4 +164,10 @@
 
 (use-package yaml-mode)
 
-(use-package vterm)
+;; (use-package vterm)
+
+(use-package fish-mode)
+
+(use-package yasnippet)
+
+(use-package yasnippet-snippets)