Switch to official golden-ratio package

.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

extensions/golden-ratio

@@ -1 +0,0 @@
-Subproject commit 807c441682c8d398fc83de6b4023b2d251502f63

init-extension/init-golden-ratio.el

@@ -1,3 +0,0 @@
-(require 'golden-ratio)
-
-(golden-ratio-mode 1)

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)

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)

packages.el

@@ -39,6 +39,7 @@
     fuzzy
     git-gutter-fringe
     ghc
+    golden-ratio
     google-translate
     haskell-mode
     helm

post-extensions.el

@@ -5,7 +5,6 @@
     dos
     edts
     evil-plugins
-    golden-ratio
     ;; mu4e
     nose
     o-blog