From 0c1fec94f3c936aaffe80484f2b1089fb520101b Mon Sep 17 00:00:00 2001
From: Emmet <librephoenix3@pm.me>
Date: Fri, 9 Jun 2023 23:26:10 -0500
Subject: [PATCH] Update did something weird w magit, evil-collection and
 annalist

---
 user/app/doom-emacs/config.el   | 12 ++++++++++++
 user/app/doom-emacs/doom.org    | 13 ++++++++++++-
 user/app/doom-emacs/packages.el |  1 -
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el
index aff947e..4ab1e1c 100644
--- a/user/app/doom-emacs/config.el
+++ b/user/app/doom-emacs/config.el
@@ -836,6 +836,18 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
 (advice-add 'magit-process-environment
             :filter-return #'~/magit-process-environment)
 
+(evil-set-initial-state 'magit-status-mode 'normal)
+(evil-set-initial-state 'magit-log-mode 'normal)
+(evil-define-key 'normal magit-status-mode-map
+  "j" 'evil-next-visual-line
+  "k" 'evil-previous-visual-line
+  "c" 'magit-commit
+  "s" 'magit-stage
+  "u" 'magit-unstage
+  "l" 'magit-log
+  "F" 'magit-pull
+  "p" 'magit-push)
+
 ;;;------ dired configuration ------;;;
 
 (add-hook 'dired-mode-hook 'all-the-icons-dired-mode)
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index 2eb0919..a81b11f 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -1186,6 +1186,18 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
 (advice-add 'magit-process-environment
             :filter-return #'~/magit-process-environment)
 
+(evil-set-initial-state 'magit-status-mode 'normal)
+(evil-set-initial-state 'magit-log-mode 'normal)
+(evil-define-key 'normal magit-status-mode-map
+  "j" 'evil-next-visual-line
+  "k" 'evil-previous-visual-line
+  "c" 'magit-commit
+  "s" 'magit-stage
+  "u" 'magit-unstage
+  "l" 'magit-log
+  "F" 'magit-pull
+  "p" 'magit-push)
+
 #+END_SRC
 ** Dired Configuration
 #+BEGIN_SRC emacs-lisp :tangle config.el
@@ -1537,7 +1549,6 @@ Any git package can be configured for a particular commit or branch:
 - =(unpin! pinned-package another-pinned-package)= to get bleeding edge instead of Doom's stability
 
 #+BEGIN_SRC emacs-lisp :tangle packages.el
-;;(package! org-bullets)
 (package! org-modern)
 (package! org-super-agenda)
 (package! emacsql :pin "c1a4407")
diff --git a/user/app/doom-emacs/packages.el b/user/app/doom-emacs/packages.el
index 9ab7a89..69d421b 100644
--- a/user/app/doom-emacs/packages.el
+++ b/user/app/doom-emacs/packages.el
@@ -1,4 +1,3 @@
-;;(package! org-bullets)
 (package! org-modern)
 (package! org-super-agenda)
 (package! emacsql :pin "c1a4407")