From ae7b03e58ac406bfc969d88c02035f7386198e86 Mon Sep 17 00:00:00 2001
From: Kaid Wong <kaid@kaid.me>
Date: Tue, 22 Dec 2015 11:36:53 +0800
Subject: [PATCH] Refactored key-bindings

---
 core/init-pkgs.el    | 27 ++++++++++-----------------
 core/key-bindings.el | 24 ++++++++++++++++++++++++
 core/modeline.el     |  3 +++
 core/preferences.el  | 21 ---------------------
 core/utils.el        | 12 ++++++++++++
 init.el              |  1 +
 6 files changed, 50 insertions(+), 38 deletions(-)
 create mode 100644 core/key-bindings.el

diff --git a/core/init-pkgs.el b/core/init-pkgs.el
index c2a9400..d5593bf 100644
--- a/core/init-pkgs.el
+++ b/core/init-pkgs.el
@@ -21,6 +21,14 @@
   :config (evil-mode t))
 
 (use-package evil-surround :ensure t)
+(use-package evil-jumper :ensure t)
+(use-package evil-magit :ensure t)
+
+(use-package evil-leader
+  :ensure t
+  :config (global-evil-leader-mode))
+
+(use-package evil-org :ensure t)
 (use-package ruby-tools :ensure t)
 (use-package ruby-electric :ensure t)
 (use-package flycheck :ensure t)
@@ -40,12 +48,7 @@
             (ac-config-default)
             (global-auto-complete-mode t)))
 
-(use-package js2-mode
-  :ensure t
-  :config (progn
-            (modify-syntax-entry ?< "(>")
-            (modify-syntax-entry ?> ")<")))
-
+(use-package js2-mode :ensure t)
 (use-package json-mode :ensure t)
 (use-package json-reformat :ensure t)
 (use-package powerline :ensure t)
@@ -56,16 +59,6 @@
   :config (progn
             (ivy-mode 1)
             (setq ivy-use-virtual-buffers t)
-            (setq projectile-completion-system 'ivy)
-            (global-set-key "\C-s" 'swiper)
-            (global-set-key
-             (kbd "M-t")
-             (lambda ()
-               (interactive)
-               (setq ivy-re-builders-alist '((t . ivy--regex-fuzzy)))
-               (unwind-protect
-                   (projectile-find-file)
-                (setq ivy-re-builders-alist '((t . ivy--regex-plus))))
-               (print ivy-re-builders-alist)))))
+            (setq projectile-completion-system 'ivy)))
 
 (provide 'init-pkgs)
diff --git a/core/key-bindings.el b/core/key-bindings.el
new file mode 100644
index 0000000..52fb7d0
--- /dev/null
+++ b/core/key-bindings.el
@@ -0,0 +1,24 @@
+(setq mac-option-modifier 'meta)
+(setq mac-command-modifier 'hyper)
+(setq mac-right-command-modifier 'super)
+
+(windmove-default-keybindings 'hyper)
+
+(global-set-key [(ctrl c) (w)] 'backward-kill-word)
+(global-set-key [(ctrl c) (i)] 'indent-region)
+(global-set-key [(ctrl c) (c)] 'comment-or-uncomment-region)
+
+(global-set-key [(ctrl s)] 'swiper)
+
+(global-set-key [(hyper a)] 'mark-whole-buffer)
+(global-set-key [(hyper v)] 'yank)
+(global-set-key [(hyper c)] 'kill-ring-save)
+(global-set-key [(hyper s)] 'save-buffer)
+(global-set-key [(hyper l)] 'goto-line)
+(global-set-key [(hyper w)] 'close-window)
+(global-set-key [(hyper z)] 'undo)
+(global-set-key [(hyper t)] 'projectile-H-t)
+
+(define-key emacs-lisp-mode-map [(ctrl c) (v)] 'eval-buffer)
+
+(provide 'key-bindings)
diff --git a/core/modeline.el b/core/modeline.el
index e746b2d..8f1c6f3 100644
--- a/core/modeline.el
+++ b/core/modeline.el
@@ -1,3 +1,6 @@
+(setq powerline-height 20)
+(setq powerline-default-separator 'slant)
+
 (powerline-default-theme)
 
 (provide 'modeline)
diff --git a/core/preferences.el b/core/preferences.el
index 2982a66..7edbd88 100644
--- a/core/preferences.el
+++ b/core/preferences.el
@@ -58,27 +58,6 @@
 (setq-default tab-width 2)
 (setq c-basic-offset 4)
 
-;; Key bindings
-(define-key emacs-lisp-mode-map (kbd "C-c v") 'eval-buffer)
-
-;; Set super key
-(setq mac-right-command-modifier 'super)
-
-;; Winner mode
-(windmove-default-keybindings 'super)
-
-;; Swap M-x to C-c C-m
-(global-set-key "\C-c\C-m" 'execute-extended-command)
-
-;; Backward kill word
-(global-set-key "\C-c\w" 'backward-kill-word)
-
-;; Indent region
-(global-set-key "\C-c\i" 'indent-region)
-
-;; Comment/Uncomment region
-(global-set-key "\C-c\c" 'comment-or-uncomment-region)
-
 (set-exec-path-from-shell-PATH)
 
 (provide 'preferences)
diff --git a/core/utils.el b/core/utils.el
index 76df3ae..262980a 100644
--- a/core/utils.el
+++ b/core/utils.el
@@ -16,4 +16,16 @@
     (setenv "PATH" path-from-shell)
     (setq exec-path (split-string path-from-shell path-separator))))
 
+(defun projectile-H-t ()
+  (interactive)
+  (setq ivy-re-builders-alist '((t . ivy--regex-fuzzy)))
+  (unwind-protect
+      (projectile-find-file)
+    (setq ivy-re-builders-alist '((t . ivy--regex-plus))))
+  (print ivy-re-builders-alist))
+
+(defun close-window ()
+  (interactive)
+  delete-window)
+
 (provide 'utils)
diff --git a/init.el b/init.el
index 1a0fd79..fc36f64 100644
--- a/init.el
+++ b/init.el
@@ -6,4 +6,5 @@
 (require 'auto-modes)
 (require 'hooks)
 (require 'modeline)
+(require 'key-bindings)
 (require 'preferences)