gergely/my-emacs-d
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move magit configuration to use-package

Browse Source
This commit is contained in:
Gergely Polonkai 2016-10-10 20:38:49 +02:00
parent 9a6c3ad6b2
commit 62ab686148
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
init.el
View File

@ -244,6 +244,14 @@
(setq zone-programs [zone-nyan]) (setq zone-programs [zone-nyan])
(zone-when-idle 60)) (zone-when-idle 60))
;; Magit and friends
(use-package magit
:init
(setq magit-auto-revert-mode nil)
(setq magit-last-seen-setup-instructions "1.4.0")
:bind
(("C-x g" . magit-status)))
(use-package ag (use-package ag
:bind :bind
(("C-x M-a" . ag) (("C-x M-a" . ag)
@ -281,8 +289,6 @@
(defalias 'yes-or-no-p 'y-or-n-p) (defalias 'yes-or-no-p 'y-or-n-p)
;; Magit settings ;; Magit settings
(setq magit-auto-revert-mode nil)
(setq magit-last-seen-setup-instructions "1.4.0")
(setq-default magit-gerrit-remote "gerrit") (setq-default magit-gerrit-remote "gerrit")
(add-hook 'after-init-hook (lambda () (require 'magit-gerrit))) (add-hook 'after-init-hook (lambda () (require 'magit-gerrit)))
@ -368,7 +374,6 @@
(global-set-key (kbd "<C-S-return>") 'open-line-above) (global-set-key (kbd "<C-S-return>") 'open-line-above)
(global-set-key (kbd "C-x C-r") 'rename-current-buffer-file) (global-set-key (kbd "C-x C-r") 'rename-current-buffer-file)
(global-set-key (kbd "C-x C-d") 'delete-current-buffer-file) (global-set-key (kbd "C-x C-d") 'delete-current-buffer-file)
(global-set-key (kbd "C-x g") 'magit-status)
(global-set-key (kbd "C-x ~") 'toggle-char-case) (global-set-key (kbd "C-x ~") 'toggle-char-case)
;; Origami mode keys ;; Origami mode keys