aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiquel Sabaté Solà <msabate@suse.com>2016-10-24 23:16:07 +0200
committerMiquel Sabaté Solà <msabate@suse.com>2016-10-24 23:16:07 +0200
commit3e8ec280989b0d8810d594f2e832f52c3c5be7af (patch)
treef9377edd3c3ea4cd55d763f8061a5d1bc00fd850
parentcde6364e1be827bedc1f4a7f0d736acd13549aa6 (diff)
downloaddotfiles-3e8ec280989b0d8810d594f2e832f52c3c5be7af.tar.gz
dotfiles-3e8ec280989b0d8810d594f2e832f52c3c5be7af.zip
emacs: added evil-magit
Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
-rw-r--r--emacs/init.el14
1 files changed, 9 insertions, 5 deletions
diff --git a/emacs/init.el b/emacs/init.el
index f011c7e..a0e22ae 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -433,7 +433,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(setq evil-leader/in-all-states 1)
(evil-leader/set-key
"," 'back-to-indentation
- "a" 'helm-ag-project-root
+ "a" 'helm-ag-project-root ; TODO: non-projects
"c" 'delete-window
"k" 'kill-buffer-and-window
"v" 'split-window-right
@@ -457,8 +457,12 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(use-package magit
:ensure t
:config
+
(add-hook 'git-commit-mode-hook 'evil-insert-state)
- (evil-leader/set-key "s" 'magit-status))
+ (evil-leader/set-key "s" 'magit-status)
+
+ (use-package evil-magit
+ :ensure t))
;; Install a set of useful functions from @bbatsov. The bindings are following
;; Emacs style instead of being more Vim-like on purpose (I don't want to put
@@ -607,9 +611,9 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
; Apply purple function identifiers to all these languages.
(dolist (lang-hook '(ruby-mode-hook
- php-mode-hook
- perl-mode-hook
- emacs-lisp-mode-hook))
+ php-mode-hook
+ perl-mode-hook
+ emacs-lisp-mode-hook))
(add-hook lang-hook 'soria-purple-identifiers))
;; YASnippet