From: Peng Li Date: Sat, 19 Sep 2015 04:12:07 +0000 (+0800) Subject: emacs - improve key mapping X-Git-Url: http://47.100.26.94:8080/?a=commitdiff_plain;h=f2b26a91f9fabde9f2d865457bff652e3b9bc830;p=dotfiles.git emacs - improve key mapping --- diff --git a/emacs.d/config/init-evil.el b/emacs.d/config/init-evil.el index b920d8f..7938d72 100644 --- a/emacs.d/config/init-evil.el +++ b/emacs.d/config/init-evil.el @@ -5,12 +5,8 @@ (require 'evil) (defalias 'evil-insert-state 'evil-emacs-state) -;; C-o C-o switch to normal mode, defined in config/init-key-binding.el -;;;(global-set-key (kbd "C-o C-o") 'evil-normal-state) ;;https://github.com/toumorokoshi/yt.rc/blob/master/emacs/my-evil.el -;; let's disable keymaps we don't want. -;; basically, anything that uses C or M (define-key evil-visual-state-map "\C-w" nil) ;(define-key evil-normal-state-map (kbd "M-.") nil) (define-key evil-normal-state-map "\C-t" nil) @@ -23,22 +19,30 @@ (define-key evil-normal-state-map "\C-o" nil) - - ;; M-e not works correctly in evil-normal mode, this fix it (define-key evil-normal-state-map "\M-e" (lambda() (interactive) (forward-sentence 2))) (define-key evil-motion-state-map "\C-e" (move-end-of-line 1)) - +;; most common keys in normal-mode to swith buffer, project, windows, +;; in emacs mode, Esc + s + x, the same (global-evil-leader-mode) (evil-leader/set-leader "s") -(evil-leader/set-key "j" 'helm-mini) -(evil-leader/set-key "k" 'helm-find-files) +;(evil-leader/set-key "j" 'helm-mini) +(evil-leader/set-key "j" 'helm-projectile-switch-to-buffer) (evil-leader/set-key "h" 'persp-switch) -(evil-leader/set-key "l" 'persp-switch) -(evil-leader/set-key "g" 'persp-switch) +(evil-leader/set-key "k" 'helm-find-files) +(evil-leader/set-key "ff" 'helm-ls-git-ls) +(evil-leader/set-key "fb" 'helm-mini) +;(evil-leader/set-key "p" 'helm-projectile-switch-project) + +;(define-key evil-normal-state-map "\M-n" 'persp-next) +;(define-key evil-normal-state-map "\M-p" 'persp-prev) + + +;(evil-leader/set-key "l" 'persp-switch) +;(evil-leader/set-key "g" 'persp-switch) (setq key-chord-two-keys-delay 0.5) (key-chord-define evil-insert-state-map "jj" 'evil-normal-state) @@ -46,7 +50,7 @@ ;(key-chord-define evil-normal-state-map ";w" 'save-buffer) -;(key-chord-define evil-normal-state-map "ss" 'split-window-below) +(key-chord-define evil-normal-state-map ";s" 'split-window-below) (key-chord-define evil-normal-state-map ";v" 'split-window-right) ;(key-chord-define evil-normal-state-map ";;" 'helm-find-files) @@ -62,6 +66,12 @@ ;(define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit) + +;; implement some missing vim normal command +;; g-; - goto last change +;; g + + ;; cursor shape (setq evil-emacs-state-cursor '("red" box)) (setq evil-normal-state-cursor '("green" box)) diff --git a/emacs.d/config/init-key-binding.el b/emacs.d/config/init-key-binding.el index d38e0c5..5a53c94 100644 --- a/emacs.d/config/init-key-binding.el +++ b/emacs.d/config/init-key-binding.el @@ -2,8 +2,37 @@ (require 'key-chord) -;(setq key-chord-two-keys-delay 0.2) +(setq mac-command-modifier 'super) ; make cmd key do Meta + +(global-set-key (kbd "") 'toggle-frame-fullscreen) + +;; global swith project - plugin projectile +(global-set-key (kbd "s-t") 'helm-projectile-switch-project) +(global-set-key (kbd "s-n") 'persp-next) +(global-set-key (kbd "s-p") 'persp-prev) +;(global-set-key (kbd "s-m") 'helm-projectile-switch-project) + +;;; global key mapping, windows buffer, tab, project +(defun pl-make-keymap (key bindings) + (setq keymap (make-sparse-keymap)) + (dolist (binding bindings) + (define-key keymap (car binding) (cdr binding))) + (global-set-key key keymap)) + +;; Esc s or M-s as prefix key +(pl-make-keymap "\M-s" + '(("j" . helm-projectile-switch-to-buffer) + ("h" . persp-switch) + ("k" . helm-find-files) + ("f" . helm-ls-git-ls) + ("w" . save-buffer) + ("q" . helm-find-files) + ("-" . split-window-below) + ("\\" . split-window-right) + ("o" . occur) + ("b" . helm-find-files))) +;(setq key-chord-two-keys-delay 0.2) ;; from emacs conference 2015 workshop (defun keychord-keymap (keychord bindings) (setq keymap (make-sparse-keymap)) @@ -67,26 +96,6 @@ -;;; global key mapping, windows buffer, tab, project -;;; -(defun pl-make-keymap (key bindings) - (setq keymap (make-sparse-keymap)) - (dolist (binding bindings) - (define-key keymap (car binding) (cdr binding))) - (global-set-key key keymap)) - -;; ESC s j -(pl-make-keymap "\M-s" - '(("j" . helm-mini) - ("k" . helm-find-files) - ("w" . save-buffer) - ("q" . helm-find-files) - ("-" . split-window-below) - ("\\" . split-window-right) -; ("\M-s" . split-window-below) -; ("\M-v" . split-window-right) - ("o" . occur) - ("b" . helm-find-files))) ;; ESC ; j M-; add comment, (pl-make-keymap "\M-;" @@ -164,15 +173,7 @@ -(setq mac-command-modifier 'super) ; make cmd key do Meta - - -;; super key for elscreen tabs -(global-set-key (kbd "") 'toggle-frame-fullscreen) -(global-set-key (kbd "s-t") 'elscreen-create) -(global-set-key (kbd "s-n") 'elscreen-next) -(global-set-key (kbd "s-p") 'elscreen-previous) ;;(global-set-key (kbd "s-k") (lambda () (interactive) (elscreen-kill (elscreen-get-current-screen)))) ;;(global-set-key (kbd "s-d") (lambda () (interactive) (elscreen-kill (elscreen-get-current-screen)))) ;; C-c C-d diff --git a/emacs.d/config/init-projectile.el b/emacs.d/config/init-projectile.el index edbe926..53a11e3 100644 --- a/emacs.d/config/init-projectile.el +++ b/emacs.d/config/init-projectile.el @@ -8,8 +8,8 @@ (projectile-global-mode) (setq projectile-enable-caching t) -(setq projectile-indexing-method 'native) - +;(setq projectile-indexing-method 'native) +(setq projectile-indexing-method 'alien) ;; with helm (require 'helm-projectile) (helm-projectile-on) @@ -18,6 +18,9 @@ ;(setq projectile-switch-project-action 'helm-projectile-find-file) (setq projectile-switch-project-action 'projectile-dired) +;; https://www.reddit.com/r/emacs/comments/2pvmkm/helm_projectile_now_enables_fuzzy_matching_by/ +(setq helm-projectile-fuzzy-match nil) + ;; with - perspective (persp-mode) (require 'persp-projectile)