Merge branch 'color-theme' - change color theme and eshell

[dotfiles.git] / emacs.d / config / init-key-binding.el

diff --git a/emacs.d/config/init-key-binding.el b/emacs.d/config/init-key-binding.el
index 6b303fc..cadcf29 100644 (file)
--- a/emacs.d/config/init-key-binding.el
+++ b/emacs.d/config/init-key-binding.el
@@ -1,6 +1,5 @@
 ;; This  file is for some global key binding
 
-(require 'key-chord)
 
 (setq mac-command-modifier 'super) ; make cmd key do Meta
 
@@ -13,8 +12,6 @@
 (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)
 
 
 (defun pl-make-keymap (key bindings)
@@ -25,7 +22,7 @@
 
 ;; 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)
              ("w" . save-buffer)
@@ -35,7 +32,19 @@
              ("o" . occur)
              ("b" . helm-find-files)))
 
-;(setq key-chord-two-keys-delay 0.2)
+;; 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)))
+  
+
+;; key-chord
+(require 'key-chord)
+
+(setq key-chord-two-keys-delay 0.5)
+
 ;; from emacs conference 2015 workshop
 (defun keychord-keymap (keychord bindings)
   (setq keymap (make-sparse-keymap))
@@ -43,11 +52,6 @@
     (define-key keymap (car binding) (cdr binding)))
   (key-chord-define-global keychord keymap))
 
-
-
-
-;;; keychord
-;;;
 (defun switch-to-previous-buffer ()
   "Switch to previously open buffer. Repeated invocations toggle between the two most recently open buffers."
   (interactive)
@@ -80,10 +84,6 @@
 
 
 
-
-;(key-chord-define minibuffer-local-map "qq" "\C-g")
-
-
 (key-chord-define minibuffer-local-map "jj"  'keyboard-escape-quit)
 (key-chord-define minibuffer-local-ns-map "jj"  'keyboard-escape-quit)
 (key-chord-define minibuffer-local-isearch-map "jj"  'keyboard-escape-quit)
@@ -94,6 +94,16 @@
 (key-chord-define minibuffer-local-filename-must-match-map "jj"  'keyboard-escape-quit)
 
 
+(define-key minibuffer-local-map [escape]  'keyboard-escape-quit)
+(define-key minibuffer-local-ns-map [escape]  'keyboard-escape-quit)
+(define-key minibuffer-local-isearch-map [escape]  'keyboard-escape-quit)
+(define-key minibuffer-local-completion-map [escape]  'keyboard-escape-quit)
+(define-key minibuffer-local-must-match-map [escape]  'keyboard-escape-quit)
+(define-key minibuffer-local-must-match-filename-map [escape]  'keyboard-escape-quit)
+(define-key minibuffer-local-filename-completion-map [escape]  'keyboard-escape-quit)
+(define-key minibuffer-local-filename-must-match-map [escape]  'keyboard-escape-quit)
+
+
 
 (key-chord-mode 1)
 
@@ -207,18 +217,6 @@
 
 ;(global-set-key (kbd "M-g M-w") 'other-window)
 
-;;----------------------------------------------------------------------------
-;; C-o prefix binding for some File/Buffer switching/openning
-;;
-;;(global-unset-key "\C-o")
-;;(global-set-key (kbd "C-o C-o") 'keyboard-quit);; same as C-g to quit
-;;; c-o c-o swith to normal mode 
-;(global-set-key (kbd "C-o C-o") 'evil-normal-state)
-;;(global-set-key (kbd "C-o C-o") 'fiplr-find-file)
-;(global-set-key (kbd "C-o C-f") 'ido-find-file)
-;(global-set-key (kbd "C-o C-n") 'recentf-ido-find-file)
-;(global-set-key (kbd "C-o C-j") 'ido-switch-buffer)
-;(global-set-key (kbd "C-o C-j") 'ido-find-file)
 
 
 ;(global-set-key (kbd "C-o C-g") 'ggtags-find-file)