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

Fix keymaps and git-gutter

Browse source
This commit is contained in:
Henrik Lissner 2015-04-23 00:31:54 -04:00
parent 2e7ba4a21e
commit 1dd426eede
4 changed files with 83 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

113
init/init-git.el
View file

@ -11,7 +11,7 @@
(use-package gitconfig-mode (use-package gitconfig-mode
:mode (("/\\.?git/?config\\'" . gitconfig-mode) :mode (("/\\.?git/?config\\'" . gitconfig-mode)
("/\\.gitmodules\\'" . gitconfig-mode)) ("/\\.gitmodules\\'" . gitconfig-mode))
:config (add-hook 'gitconfig-mode-hook 'flyspell-mode)) :init (add-hook 'gitconfig-mode-hook 'flyspell-mode))
(use-package gitignore-mode (use-package gitignore-mode
:mode (("/\\.gitignore\\'" . gitignore-mode) :mode (("/\\.gitignore\\'" . gitignore-mode)
@ -19,44 +19,49 @@
("/git/ignore\\'" . gitignore-mode))) ("/git/ignore\\'" . gitignore-mode)))
;; ;;
(use-package git-gutter-fringe+ (use-package git-gutter-fringe+
:init (global-git-gutter+-mode +1)
:config :config
(progn (progn
(global-git-gutter+-mode +1)
;; Fixes "git-gutter+-process-diff: Wrong number of arguments: nil" error
(defadvice git-gutter+-process-diff (before git-gutter+-process-diff-advice activate)
(ad-set-arg 0 (file-truename (ad-get-arg 0))))
(evil-ex-define-cmd "gstage" 'git-gutter+-stage-hunks) (evil-ex-define-cmd "gstage" 'git-gutter+-stage-hunks)
(evil-ex-define-cmd "grevert" 'git-gutter+-revert-hunks) (evil-ex-define-cmd "grevert" 'git-gutter+-revert-hunks)
(evil-ex-define-cmd "gdiff" 'git-gutter+-show-hunk) (evil-ex-define-cmd "gdiff" 'git-gutter+-show-hunk)
(fringe-helper-define 'git-gutter-fr+-added nil (fringe-helper-define 'git-gutter-fr+-added nil
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X.......") "XX......")
(fringe-helper-define 'git-gutter-fr+-deleted nil (fringe-helper-define 'git-gutter-fr+-deleted nil
"X......." "XX......"
"XXXXXXXX" "XXXXXXXX"
"X......." "XX......"
"........" "........"
"........" "........"
"........" "........"
@ -81,31 +86,31 @@
"........") "........")
(fringe-helper-define 'git-gutter-fr+-modified nil (fringe-helper-define 'git-gutter-fr+-modified nil
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......." "XX......"
"X......."))) "XX......")))
(evil-set-initial-state 'git-commit-mode 'insert) (evil-set-initial-state 'git-commit-mode 'insert)
(evil-set-initial-state 'git-rebase-mode 'insert) (evil-set-initial-state 'git-rebase-mode 'insert)

32
init/init-text.el
View file

@ -10,18 +10,18 @@
:config :config
(progn (progn
(defun markdown-insert-del () (defun markdown-insert-del ()
(interactive) (interactive)
(let ((delim "~~")) (let ((delim "~~"))
(if (markdown-use-region-p) (if (markdown-use-region-p)
;; Active region ;; Active region
(let ((bounds (markdown-unwrap-things-in-region (let ((bounds (markdown-unwrap-things-in-region
(region-beginning) (region-end) (region-beginning) (region-end)
markdown-regex-del 2 4))) markdown-regex-del 2 4)))
(markdown-wrap-or-insert delim delim nil (car bounds) (cdr bounds))) (markdown-wrap-or-insert delim delim nil (car bounds) (cdr bounds)))
;; Bold markup removal, bold word at point, or empty markup insertion ;; Bold markup removal, bold word at point, or empty markup insertion
(if (thing-at-point-looking-at markdown-regex-del) (if (thing-at-point-looking-at markdown-regex-del)
(markdown-unwrap-thing-at-point nil 2 4) (markdown-unwrap-thing-at-point nil 2 4)
(markdown-wrap-or-insert delim delim 'word nil nil))))) (markdown-wrap-or-insert delim delim 'word nil nil)))))
(sp-local-pair 'markdown-mode "*" "*" :unless '(sp-point-after-bol-p sp-point-before-same-p sp-point-after-same-p)) (sp-local-pair 'markdown-mode "*" "*" :unless '(sp-point-after-bol-p sp-point-before-same-p sp-point-after-same-p))
(let ((map markdown-mode-map)) (let ((map markdown-mode-map))
@ -43,10 +43,10 @@
(kbd "<M-left>") nil (kbd "<M-left>") nil
(kbd "<M-right>") nil (kbd "<M-right>") nil
(kbd "s-*") 'markdown-insert-list-item (kbd "M-*") 'markdown-insert-list-item
(kbd "s-b") 'markdown-insert-bold (kbd "M-b") 'markdown-insert-bold
(kbd "s-i") 'markdown-insert-italic (kbd "M-i") 'markdown-insert-italic
(kbd "s-`") 'markdown-insert-del)))) (kbd "M-`") 'markdown-insert-del))))
(provide 'init-text) (provide 'init-text)

7
init/init-web.el
View file

@ -37,7 +37,7 @@
(add-hook! 'web-mode-hook (setenv "jsbeautify_indent_size" "4")) (add-hook! 'web-mode-hook (setenv "jsbeautify_indent_size" "4"))
(bind 'motion web-mode-map "gQ" 'web-beautify-html)) (bind 'motion web-mode-map "gQ" 'web-beautify-html))
(bind web-mode-map (kbd "s-/") 'web-mode-comment-or-uncomment) (bind web-mode-map (kbd "M-/") 'web-mode-comment-or-uncomment)
(bind 'normal web-mode-map (bind 'normal web-mode-map
"zf" 'web-mode-fold-or-unfold "zf" 'web-mode-fold-or-unfold
",t" 'web-mode-element-rename) ",t" 'web-mode-element-rename)
@ -52,7 +52,6 @@
:defer t :defer t
:init :init
(progn (progn
(add-hook 'css-mode-hook 'emmet-mode)
(add-hook 'scss-mode-hook 'emmet-mode) (add-hook 'scss-mode-hook 'emmet-mode)
(add-hook 'web-mode-hook 'emmet-mode) (add-hook 'web-mode-hook 'emmet-mode)
(add-hook 'html-mode-hook 'emmet-mode) (add-hook 'html-mode-hook 'emmet-mode)
@ -63,8 +62,8 @@
(setq emmet-move-cursor-between-quotes t) (setq emmet-move-cursor-between-quotes t)
(bind 'insert emmet-mode-keymap (bind 'insert emmet-mode-keymap
(kbd "s-e") 'emmet-expand-yas (kbd "M-e") 'emmet-expand-yas
(kbd "s-E") 'emmet-expand-line))) (kbd "M-E") 'emmet-expand-line)))
(provide 'init-web) (provide 'init-web)

10
init/my-bindings.el
View file

@ -127,7 +127,7 @@
;; Textmate-esque indent shift left/right ;; Textmate-esque indent shift left/right
"M-[" (kbd "C-o m l C-o I DEL C-o ` l") "M-[" (kbd "C-o m l C-o I DEL C-o ` l")
"M-]" (λ (evil-shift-right (point-at-bol) (point-at-eol))) "M-]" (λ (evil-shift-right (point-at-bol) (point-at-eol)))
"<backtab>" (kbd "s-[")) "<backtab>" (kbd "M-["))
;; Enable TAB to do matchit ;; Enable TAB to do matchit
(bind '(normal visual) evil-matchit-mode-map [tab] 'evilmi-jump-items) (bind '(normal visual) evil-matchit-mode-map [tab] 'evilmi-jump-items)
@ -206,12 +206,12 @@
(use-package smart-forward (use-package smart-forward
:config :config
(bind 'insert (bind 'insert
(kbd "<M-left>") 'smart-backward (kbd "<M-left>") 'my.move-to-bol
(kbd "<M-right>") 'smart-forward (kbd "<M-right>") 'my.move-to-eol
(kbd "<M-backspace>") 'my.backward-kill-to-bol-and-indent
;; (kbd "<M-up>") 'beginning-of-buffer ;; (kbd "<M-up>") 'beginning-of-buffer
(kbd "<M-up>") 'smart-up (kbd "<M-up>") 'smart-up
(kbd "<M-down>") 'smart-down (kbd "<M-down>") 'smart-down))
(kbd "<M-backspace>") 'my.backward-kill-to-bol-and-indent))