X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Femacs-evil.org;h=6ad4ee6f75d24d58a6d260ac628a7c704107ccdc;hb=3dcb38688ed119fc3124d46fc097486c6c217272;hp=86597e596bc2207b3e1cd4bd094db9b5b77a14b8;hpb=a205621d9b2ab3cc7257f88ea0b71fa54ceaaadd;p=dotfiles.git diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org index 86597e5..6ad4ee6 100644 --- a/emacs.d/emacs-evil.org +++ b/emacs.d/emacs-evil.org @@ -16,6 +16,7 @@ https://www.emacswiki.org/emacs/Evil. ;; (setq evil-default-state 'emacs) (setq evil-emacs-state-cursor '("red" box)) (setq evil-normal-state-cursor '("green" box)) + (setq evil-motion-state-cursor '("green" box)) (setq evil-visual-state-cursor '("orange" box)) (setq evil-insert-state-cursor '("red" bar)) (setq evil-replace-state-cursor '("red" bar)) @@ -25,17 +26,19 @@ https://www.emacswiki.org/emacs/Evil. (global-evil-leader-mode) (evil-mode t) - (define-key evil-normal-state-map "\C-W s" 'evil-window-split) - (define-key evil-normal-state-map "\C-W v" 'evil-window-vsplit) - (define-key evil-normal-state-map "\C-h" 'evil-window-left) - (define-key evil-normal-state-map "\C-j" 'evil-window-down) - (define-key evil-normal-state-map "\C-k" 'evil-window-up) - (define-key evil-normal-state-map "\C-l" 'evil-window-right) - (define-key evil-normal-state-map (kbd "C->") (lambda () (interactive) (evil-window-increase-width 3))) - (define-key evil-normal-state-map (kbd "C-<") (lambda () (interactive) (evil-window-decrease-width 3))) - (define-key evil-normal-state-map (kbd "C-+") (lambda () (interactive) (evil-window-increase-height 3))) - (define-key evil-normal-state-map (kbd "C--") (lambda () (interactive) (evil-window-decrease-height 3))) - (define-key evil-normal-state-map (kbd "C-=") (lambda () (interactive) (balance-windows)))) + (mapc (lambda (map) + (define-key map "\C-W s" 'evil-window-split) + (define-key map "\C-W v" 'evil-window-vsplit) + (define-key map "\C-h" 'evil-window-left) + (define-key map "\C-j" 'evil-window-down) + (define-key map "\C-k" 'evil-window-up) + (define-key map "\C-l" 'evil-window-right) + (define-key map (kbd "C->") (lambda () (interactive) (evil-window-increase-width 3))) + (define-key map (kbd "C-<") (lambda () (interactive) (evil-window-decrease-width 3))) + (define-key map (kbd "C-+") (lambda () (interactive) (evil-window-increase-height 3))) + (define-key map (kbd "C--") (lambda () (interactive) (evil-window-decrease-height 3))) + (define-key map (kbd "C-=") (lambda () (interactive) (balance-windows)))) + (list evil-normal-state-map evil-motion-state-map))) #+END_SRC ** Initial mode and state config @@ -144,6 +147,11 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803 :config (global-evil-visualstar-mode)) #+END_SRC +* Others +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (dolist (mode '(c-mode-hook lua-mode-hook)) + (add-hook mode (lambda () (setq indent-tabs-mode nil)))) +#+END_SRC * Provide #+BEGIN_SRC emacs-lisp :tangle yes :results silent (provide 'init-evil-mode)