From: Peng Li <seudut@gmail.com>
Date: Wed, 16 Sep 2015 13:57:58 +0000 (+0800)
Subject: Merge branch 'master' of github.com:seudut/dotfiles
X-Git-Url: http://47.100.26.94:8080/?a=commitdiff_plain;h=6dadf904152ece88cb326b28b4fdfa05f4046e38;hp=b4063eb834867f9f34d6a75e81baab7a503742de;p=dotfiles.git

Merge branch 'master' of github.com:seudut/dotfiles
---

diff --git a/emacs.d/config/init-evil.el b/emacs.d/config/init-evil.el
index 00dd991..5067725 100644
--- a/emacs.d/config/init-evil.el
+++ b/emacs.d/config/init-evil.el
@@ -36,16 +36,19 @@
 (evil-leader/set-leader "s")
 (evil-leader/set-key "j" 'helm-mini)
 (evil-leader/set-key "k" 'helm-find-files)
+(evil-leader/set-key "h" 'persp-switch)
+(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)
 (key-chord-define evil-emacs-state-map "jj" 'evil-normal-state)
 
 
-(key-chord-define evil-normal-state-map ";w" 'save-buffer)
-(key-chord-define evil-normal-state-map ";s" 'split-window-below)
+;(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 ";v" 'split-window-right)
-(key-chord-define evil-normal-state-map ";;" 'helm-find-files)
+;(key-chord-define evil-normal-state-map ";;" 'helm-find-files)
 
 (key-chord-mode 1)
 
@@ -80,6 +83,7 @@
                   (grep-mode . emacs)
                   (bc-menu-mode . emacs)
                   (magit-branch-manager-mode . emacs)
+                  (magit-popup-mode . emacs)
                   (rdictcc-buffer-mode . emacs)
                   (dired-mode . emacs)
                   (wdired-mode . normal)
diff --git a/emacs.d/config/init-key-binding.el b/emacs.d/config/init-key-binding.el
index bf90894..d38e0c5 100644
--- a/emacs.d/config/init-key-binding.el
+++ b/emacs.d/config/init-key-binding.el
@@ -33,23 +33,23 @@
 ;(key-chord-define-global "sk" 'helm-find-files)
 
 
-(key-chord-define-global "JJ" 'save-buffer)
-(key-chord-define-global "HH" 'save-buffer)
-(key-chord-define-global "KK" 'save-buffer)
-(key-chord-define-global "LL" 'save-buffer)
-(key-chord-define-global "LL" 'save-buffer)
-(key-chord-define-global "UU" 'save-buffer)
-(key-chord-define-global "II" 'save-buffer)
-(key-chord-define-global "OO" 'save-buffer)
-(key-chord-define-global "NN" 'save-buffer)
-(key-chord-define-global "MM" 'save-buffer)
-(key-chord-define-global "PP" 'save-buffer)
-(key-chord-define-global "YY" 'save-buffer)
+;(key-chord-define-global "JJ" 'save-buffer)
+;(key-chord-define-global "HH" 'save-buffer)
+;(key-chord-define-global "KK" 'save-buffer)
+;(key-chord-define-global "LL" 'save-buffer)
+;(key-chord-define-global "LL" 'save-buffer)
+;(key-chord-define-global "UU" 'save-buffer)
+;(key-chord-define-global "II" 'save-buffer)
+;(key-chord-define-global "OO" 'save-buffer)
+;(key-chord-define-global "NN" 'save-buffer)
+;(key-chord-define-global "MM" 'save-buffer)
+;(key-chord-define-global "PP" 'save-buffer)
+;(key-chord-define-global "YY" 'save-buffer)
 
 
 
 
-(key-chord-define minibuffer-local-map "qq" "\C-g")
+;(key-chord-define minibuffer-local-map "qq" "\C-g")
 
 
 (key-chord-define minibuffer-local-map "jj"  'keyboard-escape-quit)
@@ -153,19 +153,6 @@
 
 
 
-(defvar sacha/windmove-map (make-sparse-keymap))
-(define-key sacha/windmove-map "h" 'windmove-left)
-(define-key sacha/windmove-map "t" 'windmove-up)
-(define-key sacha/windmove-map "n" 'windmove-down)
-(define-key sacha/windmove-map "s" 'windmove-right)
-(define-key sacha/windmove-map "[left]" 'windmove-left)
-(define-key sacha/windmove-map "[up]" 'windmove-up)
-(define-key sacha/windmove-map "[down]" 'windmove-down)
-(define-key sacha/windmove-map "[right]" 'windmove-right)
-;(key-chord-define-global "yy"     sacha/windmove-map)
-
-
-
 ;; project
 ;(global-set-key (kbd "<escape> M-n") 'find-file)
 ;(global-set-key (kbd "<escape> M-m") 'find-file)
diff --git a/emacs.d/config/init-projectile.el b/emacs.d/config/init-projectile.el
index 866cf7e..9ba616f 100644
--- a/emacs.d/config/init-projectile.el
+++ b/emacs.d/config/init-projectile.el
@@ -2,15 +2,24 @@
 
 
 (require 'projectile)
+(require 'projectile-speedbar)
 
 
 (projectile-global-mode)
+
 (setq projectile-enable-caching t)
+(setq projectile-indexing-method 'native)
 
+;; with helm
+(require 'helm-projectile)
+(helm-projectile-on)
 
-(require 'projectile-speedbar)
 
+(setq projectile-switch-project-action 'helm-projectile-find-file)
 
+;; with - perspective
+(persp-mode)
+(require 'persp-projectile)
 
 (provide 'init-projectile)
 
diff --git a/emacs.d/config/my-packages.el b/emacs.d/config/my-packages.el
index 05feef0..fc8d1db 100644
--- a/emacs.d/config/my-packages.el
+++ b/emacs.d/config/my-packages.el
@@ -62,6 +62,7 @@
     multi-term
     projectile
     page-break-lines
+    helm-projectile
   ) "a list of packages to ensure are installed at launch.")
 
 (require 'cl)
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 07ef18f..0e486ec 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -138,3 +138,9 @@
 (require 'page-break-lines)
 ;(turn-on-page-break-lines-mode)
 (global-page-break-lines-mode 1)
+
+;(setq projectile-completion-system 'helm)
+;(helm-projectile-on)
+
+
+;; show projectile name in mode-line