Update modules/feature/version-control

modules/feature/version-control/+git.el

@@ -6,32 +6,19 @@
   :init (add-hook 'gitconfig-mode-hook 'flyspell-mode))
 
 (@def-package gitignore-mode
-  :mode "/\\.?git/?config$"
-  :mode "/\\.gitmodules$")
+  :mode "/\\.gitignore$")
 
 
 (@def-package git-gutter-fringe
   :commands git-gutter-mode
-  :init (@add-hook (text-mode prog-mode conf-mode) 'git-gutter-mode)
+  :init
+  (@add-hook (text-mode prog-mode conf-mode) 'git-gutter-mode)
   :config
   (@set :popup "^\\*git-gutter.+\\*$" :regexp t :size 15 :noselect t)
 
   ;; Update git-gutter on focus (in case I was using git externally)
   (add-hook 'focus-in-hook 'git-gutter:update-all-windows)
 
-  ;; places the git gutter outside the margins.
-  (setq-default fringes-outside-margins t)
-  ;; thin fringe bitmaps
-  (define-fringe-bitmap 'git-gutter-fr:added
-    [224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224]
-    nil nil 'center)
-  (define-fringe-bitmap 'git-gutter-fr:modified
-    [224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224]
-    nil nil 'center)
-  (define-fringe-bitmap 'git-gutter-fr:deleted
-    [0 0 0 0 0 0 0 0 0 0 0 0 0 128 192 224 240 248]
-    nil nil 'center)
-
   (@after evil
     ;; Refreshing git-gutter on ESC
     (advice-add 'evil-force-normal-state :after 'git-gutter)))
@@ -44,10 +31,16 @@
 (@def-package magit
   :commands magit-status
   :config
-  (@set :popup "^\\*magit.+" :regexp t)
+  (@set :popup "^\\*magit" :regexp t)
+  (@map :map magit-mode-map
+        ;; Don't interfere with window movement keys
+        :nv "C-j" nil
+        :nv "C-k" nil))
 
-  (@after evil
-    (require 'evil-magit)
-    ;; evil-snipe conflicts with magit
-    (add-hook 'magit-mode-hook 'turn-off-evil-snipe-override-mode)))
+
+(@def-package evil-magit
+  :after magit
+  :config
+  ;; evil-snipe conflicts with magit
+  (add-hook 'magit-mode-hook 'turn-off-evil-snipe-override-mode))