From 306bd87174f1b4ead6c16800442eea3bd725bbc7 Mon Sep 17 00:00:00 2001
From: syl20bnr <sylvain.benner@gmail.com>
Date: Sun, 17 Nov 2013 21:45:13 -0500
Subject: [PATCH] Switch to official golden-ratio package

---
 .gitmodules                         |  3 ---
 extensions/golden-ratio             |  1 -
 init-extension/init-golden-ratio.el |  3 ---
 init-package/init-golden-ratio.el   | 24 ++++++++++++++++++++++++
 my-keybindings.el                   | 15 +++++----------
 packages.el                         |  1 +
 post-extensions.el                  |  1 -
 7 files changed, 30 insertions(+), 18 deletions(-)
 delete mode 160000 extensions/golden-ratio
 delete mode 100644 init-extension/init-golden-ratio.el
 create mode 100644 init-package/init-golden-ratio.el

diff --git a/.gitmodules b/.gitmodules
index 7aa01165d..528622b1d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,9 +34,6 @@
 [submodule "extensions/powerline"]
 	path = extensions/powerline
 	url = http://github.com/syl20bnr/powerline
-[submodule "extensions/golden-ratio"]
-	path = extensions/golden-ratio
-	url = http://github.com/syl20bnr/golden-ratio.el
 [submodule "snippets"]
 	path = snippets
 	url = http://github.com/syl20bnr/yasnippet-snippets
diff --git a/extensions/golden-ratio b/extensions/golden-ratio
deleted file mode 160000
index 807c44168..000000000
--- a/extensions/golden-ratio
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 807c441682c8d398fc83de6b4023b2d251502f63
diff --git a/init-extension/init-golden-ratio.el b/init-extension/init-golden-ratio.el
deleted file mode 100644
index 8adb61706..000000000
--- a/init-extension/init-golden-ratio.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(require 'golden-ratio)
-
-(golden-ratio-mode 1)
diff --git a/init-package/init-golden-ratio.el b/init-package/init-golden-ratio.el
new file mode 100644
index 000000000..2b09897b6
--- /dev/null
+++ b/init-package/init-golden-ratio.el
@@ -0,0 +1,24 @@
+(require 'golden-ratio)
+(setq golden-ratio-extra-commands
+      (append golden-ratio-extra-commands
+              '(evil-window-left
+                evil-window-right
+                evil-window-up
+                evil-window-down
+                select-window-0
+                select-window-1
+                select-window-2
+                select-window-3
+                select-window-4
+                select-window-5
+                select-window-6
+                select-window-7
+                select-window-8
+                select-window-9
+                ace-jump-mode-pop-mark
+                buf-move-left
+                buf-move-right
+                buf-move-up
+                buf-move-down
+                )))
+(golden-ratio-mode)
diff --git a/my-keybindings.el b/my-keybindings.el
index 244885446..c057f408b 100644
--- a/my-keybindings.el
+++ b/my-keybindings.el
@@ -42,8 +42,7 @@
 ;; M-x ------------------------------------------------------------------------
 (evil-leader/set-key ":" 'execute-extended-command)
 ;; ace-jump -------------------------------------------------------------------
-(evil-leader/set-key "," (lambda () (interactive)
-                             (ace-jump-mode-pop-mark) (golden-ratio)))
+(evil-leader/set-key "," 'ace-jump-mode-pop-mark)
 ;; switch window by number ----------------------------------------------------
 (evil-leader/set-key "0" 'select-window-0)
 (evil-leader/set-key "1" 'select-window-1)
@@ -71,14 +70,10 @@
 (evil-leader/set-key "bd" 'delete-current-buffer-file)
 (evil-leader/set-key "bK" 'kill-other-buffers)
 (evil-leader/set-key "bk" 'ido-kill-buffer)
-(evil-leader/set-key "bmh" (lambda () (interactive)
-                             (buf-move-left) (golden-ratio)))
-(evil-leader/set-key "bmj" (lambda () (interactive)
-                             (buf-move-down) (golden-ratio)))
-(evil-leader/set-key "bmk" (lambda () (interactive)
-                             (buf-move-up) (golden-ratio)))
-(evil-leader/set-key "bml" (lambda () (interactive)
-                             (buf-move-right) (golden-ratio)))
+(evil-leader/set-key "bmh" 'buf-move-left)
+(evil-leader/set-key "bmj" 'buf-move-down)
+(evil-leader/set-key "bmk" 'buf-move-up)
+(evil-leader/set-key "bml" 'buf-move-right)
 (evil-leader/set-key "bn" 'switch-to-next-buffer)
 (evil-leader/set-key "bp" 'switch-to-prev-buffer)
 (evil-leader/set-key "br" 'rename-current-buffer-file)
diff --git a/packages.el b/packages.el
index a35dea7c6..a1619f844 100644
--- a/packages.el
+++ b/packages.el
@@ -39,6 +39,7 @@
     fuzzy
     git-gutter-fringe
     ghc
+    golden-ratio
     google-translate
     haskell-mode
     helm
diff --git a/post-extensions.el b/post-extensions.el
index 423fd592f..b6c32fd78 100644
--- a/post-extensions.el
+++ b/post-extensions.el
@@ -5,7 +5,6 @@
     dos
     edts
     evil-plugins
-    golden-ratio
     ;; mu4e
     nose
     o-blog