emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move magit from features/version-control to new tools/magit module

Browse source
This commit is contained in:
Henrik Lissner 2018-03-14 18:33:26 -04:00
parent d84222b6d0
commit f8fa07d668
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
5 changed files with 59 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

50
modules/tools/magit/config.el Normal file
View file

@ -0,0 +1,50 @@
;;; tools/magit/config.el -*- lexical-binding: t; -*-
(def-package! magit
:defer t
:init
(load "magit-autoloads" nil t)
:config
(set! :popup "^\\*?magit" :ignore)
(set! :evil-state 'magit-status-mode 'emacs)
(push 'magit-repolist-mode evil-snipe-disabled-modes)
(map! :map magit-repolist-mode-map
:n "j" #'next-line
:n "k" #'previous-line
:n "s" #'magit-repolist-status)
;; (add-hook 'magit-popup-mode-hook #'hide-mode-line-mode)
;; (set! :popup "^.*magit" '((slot . -1) (side . right) (size . 80)) '((modeline . nil) (select . t)))
;; (set! :popup "^\\*magit.*popup\\*" '((slot . 0) (side . right)) '((modeline . nil) (select . t)))
;; (set! :popup "^.*magit-revision:.*" '((slot . 2) (side . right) (window-height . 0.6)) '((modeline . nil) (select . t)))
;; (set! :popup "^.*magit-diff:.*" '((slot . 2) (side . right) (window-height . 0.6)) '((modeline . nil) (select . nil)))
(after! evil
;; Switch to emacs state only while in `magit-blame-mode', then back when
;; its done (since it's a minor-mode).
(add-hook! 'magit-blame-mode-hook
(evil-local-mode (if magit-blame-mode -1 +1)))))
(def-package! magit-blame
:commands magit-blame
:after git-timemachine)
(def-package! magithub
:commands (magithub-clone magithub-feature-autoinject)
:after magit
:config
(load "magithub-autoloads" nil t)
(magithub-feature-autoinject t)
(setq magithub-dir (concat doom-etc-dir "magithub/")
magithub-clone-default-directory "~/"
magithub-preferred-remote-method 'clone_url))
(def-package! evil-magit
:when (featurep! :feature evil)
:after magit
:config
(setq evil-magit-state 'normal))

7
modules/tools/magit/packages.el Normal file
View file

@ -0,0 +1,7 @@
;; -*- no-byte-compile: t; -*-
;;; tools/magit/packages.el
(package! magit)
(package! magithub)
(when (featurep! :feature evil)
(package! evil-magit))