From 280490105e3ce5faa8eb96704a2760866d67243f Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 20 Dec 2020 23:23:23 +0100
Subject: Emacs: remove deprecated evil-magit package

Consumed by evil-collection
---
 user/emacs/init.el      | 10 +++-------
 user/settings/emacs.nix |  1 -
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'user')

diff --git a/user/emacs/init.el b/user/emacs/init.el
index 517670e2..4311419b 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -310,6 +310,9 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
   :demand t
   :commands (evil-collection-init)
   :config (progn
+            (setq evil-collection-magit-use-y-for-yank nil)
+            (general-unbind 'normal magit-mode-map
+              "<escape>")
             (evil-collection-init)))
 
 (general-create-definer my-leader-def
@@ -359,13 +362,6 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
   :defer 2
   :config (evil-commentary-mode +1))
 
-(use-package evil-magit
-  :after magit
-  :config (progn
-            (setq evil-magit-use-y-for-yank nil)
-            (general-unbind 'normal magit-mode-map
-              "<escape>")))
-
 (use-package evil-matchit
   :after evil
   :defer 2
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index 4e150a54..017f8eee 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -108,7 +108,6 @@ in
       evil-commentary
       evil-embrace
       evil-ledger
-      evil-magit
       evil-matchit
       evil-mu4e
       evil-numbers
-- 
cgit 1.4.1