X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig%2Finit-key-binding.el;h=46aec507746701feb7dc9f686b9ebd84507eec23;hb=d23250eb5c8c5e3e5190f0f53c6d062d4f2f169d;hp=838eaf3b46ba3fa1ff1f7b790b026e5e52c05d84;hpb=3ebaae383c8cdfa3d9ee6666e08a1491e13893dc;p=dotfiles.git

diff --git a/emacs.d/config/init-key-binding.el b/emacs.d/config/init-key-binding.el
index 838eaf3..46aec50 100644
--- a/emacs.d/config/init-key-binding.el
+++ b/emacs.d/config/init-key-binding.el
@@ -10,9 +10,13 @@
 (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-set-key (kbd "s-h") 'persp-switch)
+(global-set-key (kbd "s-j") 'helm-projectile-switch-to-buffer)
+(global-set-key (kbd "s-k") 'helm-cmd-t)
+;(global-set-key (kbd "s-m") 'helm-cmd-t)
+;(global-set-key (kbd "s-u") 'helm-cmd-t)
+
 
-;;; global key mapping, windows buffer, tab, project
 (defun pl-make-keymap (key bindings)
   (setq keymap (make-sparse-keymap))
   (dolist (binding bindings)
@@ -21,10 +25,9 @@
 
 ;; Esc s or M-s as prefix key
 (pl-make-keymap "\M-s"
-            '(("j" . helm-projectile-switch-to-buffer)
+            '(("j" . pl-switch-buffers)
 	      ("h" . persp-switch)
 	      ("k" . helm-cmd-t)
-	      ("f" . helm-ls-git-ls)
 	      ("w" . save-buffer)
 	      ("q" . helm-find-files)
 	      ("-" . split-window-below)
@@ -32,6 +35,14 @@
 	      ("o" . occur)
 	      ("b" . helm-find-files)))
 
+;; if current is not a project, useing helm-mini instead
+(defun pl-switch-buffers ()
+  (interactive)
+  (if (projectile-project-p)
+      (helm-projectile-switch-to-buffer)
+    (helm-mini)))
+  
+
 ;(setq key-chord-two-keys-delay 0.2)
 ;; from emacs conference 2015 workshop
 (defun keychord-keymap (keychord bindings)
@@ -189,15 +200,15 @@
 (global-set-key (kbd "s-8") (lambda () (interactive) (elscreen-goto 8)))
 
 ;; super key for windows
-(global-set-key (kbd "s-l") 'split-window-below)
-(global-set-key (kbd "s-h") 'split-window-right)
-(global-set-key (kbd "s-i") 'other-window)
-(global-set-key (kbd "s-j") 'delete-other-windows)
-
-(global-set-key (kbd "s-k") (lambda () (interactive)
-			      (split-window-right)
-			      (other-window 1)
-			      (ido-find-file)))
+;(global-set-key (kbd "s-l") 'split-window-below)
+;(global-set-key (kbd "s-h") 'split-window-right)
+;(global-set-key (kbd "s-i") 'other-window)
+;(global-set-key (kbd "s-j") 'delete-other-windows)
+
+;(global-set-key (kbd "s-k") (lambda () (interactive)
+;			      (split-window-right)
+;			      (other-window 1)
+;			      (ido-find-file)))