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

Update

Browse source
This commit is contained in:
Henrik Lissner 2015-06-12 17:14:41 +02:00
parent de70863bed
commit ed80d8119b
2 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
core/core-evil.el
View file

@ -57,13 +57,14 @@
(ignore-errors ad-do-it)) (ignore-errors ad-do-it))
;; modes to map to different default states ;; modes to map to different default states
(dolist (mode-map '((cider-repl-mode . emacs) (dolist (mode-map '((cider-repl-mode . emacs)
(comint-mode . emacs) (comint-mode . emacs)
(fundamental-mode . normal) (term-mode . emacs)
(help-mode . normal) (fundamental-mode . normal)
(term-mode . emacs) (help-mode . normal)
(message-mode . normal) (message-mode . normal)
(compilation-mode . normal))) (compilation-mode . normal)
(text-mode . normal)))
(evil-set-initial-state `,(car mode-map) `,(cdr mode-map))) (evil-set-initial-state `,(car mode-map) `,(cdr mode-map)))
;; Ace Jump ;; Ace Jump
@ -210,6 +211,7 @@
(use-package evil-space (use-package evil-space
:diminish (evil-space-mode . "_") :diminish (evil-space-mode . "_")
:init (setq evil-space-auto-setup nil)
:config :config
(progn (progn
(evil-space-mode 1) (evil-space-mode 1)
@ -217,7 +219,7 @@
(evil-space-setup "/" "n" "N") (evil-space-setup "/" "n" "N")
(evil-space-setup "?" "n" "N") (evil-space-setup "?" "n" "N")
(after "evil-snipe" (after evil-snipe
(evil-space-setup evil-snipe-f evil-snipe-repeat evil-snipe-repeat-reverse) (evil-space-setup evil-snipe-f evil-snipe-repeat evil-snipe-repeat-reverse)
(evil-space-setup evil-snipe-F evil-snipe-repeat evil-snipe-repeat-reverse) (evil-space-setup evil-snipe-F evil-snipe-repeat evil-snipe-repeat-reverse)
(evil-space-setup evil-snipe-t evil-snipe-repeat evil-snipe-repeat-reverse) (evil-space-setup evil-snipe-t evil-snipe-repeat evil-snipe-repeat-reverse)
@ -225,15 +227,14 @@
(evil-space-setup evil-snipe-s evil-snipe-repeat evil-snipe-repeat-reverse) (evil-space-setup evil-snipe-s evil-snipe-repeat evil-snipe-repeat-reverse)
(evil-space-setup evil-snipe-S evil-snipe-repeat evil-snipe-repeat-reverse)) (evil-space-setup evil-snipe-S evil-snipe-repeat evil-snipe-repeat-reverse))
(after "evil-numbers" (after evil-numbers
(let ((map (evil-get-auxiliary-keymap narf-mode-map 'normal))) (let ((map (evil-get-auxiliary-keymap narf-mode-map 'normal)))
(evil-space-setup "g=" "g=" "g-" map) (evil-space-setup "g=" "g=" "g-" map)
(evil-space-setup "g-" "g-" "g=" map))) (evil-space-setup "g-" "g-" "g=" map)))
(after "evil-visualstar" (after evil-visualstar
(let ((map (evil-get-auxiliary-keymap evil-visualstar-mode-map 'visual))) (evil-space-setup evil-visualstar/begin-search-forward "n" "N")
(evil-space-setup "*" "*" "#" map) (evil-space-setup evil-visualstar/begin-search-backward "n" "N")))))
(evil-space-setup "#" "#" "*" map))))))
(progn ; evil hacks (progn ; evil hacks
(defadvice evil-force-normal-state (before evil-esc-quit activate) (defadvice evil-force-normal-state (before evil-esc-quit activate)

6
core/core-ui.el
View file

@ -131,9 +131,9 @@
;; Hide evil state indicator ;; Hide evil state indicator
(after "evil" (setq evil-mode-line-format nil)) (after "evil" (setq evil-mode-line-format nil))
(setq-default mode-line-misc-info ;; (setq-default mode-line-misc-info
'((which-func-mode ("" which-func-format "")) ;; '((which-func-mode ("" which-func-format ""))
(global-mode-string ("" global-mode-string "")))) ;; (global-mode-string ("" global-mode-string ""))))
(sml/setup) (sml/setup)
(sml/apply-theme 'respectful) (sml/apply-theme 'respectful)