From da2af5c1fda0e1118364fd2f7e53aa76b84f561a Mon Sep 17 00:00:00 2001
From: Eivind Fonn <evfonn@gmail.com>
Date: Thu, 18 Aug 2016 21:10:43 +0200
Subject: [PATCH] Extract golden-ratio config to package fns

---
 layers/+lang/agda/packages.el  | 13 ++++++++-----
 layers/+lang/idris/packages.el | 17 ++++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/layers/+lang/agda/packages.el b/layers/+lang/agda/packages.el
index a09467b11..0f669a4fd 100644
--- a/layers/+lang/agda/packages.el
+++ b/layers/+lang/agda/packages.el
@@ -10,7 +10,8 @@
 ;;; License: GPLv3
 
 (setq agda-packages
-      '((agda :location local)))
+      '((agda :location local)
+        golden-ratio))
 
 (defun agda/init-agda ()
   (if (and (eq 'use-helper agda-mode-path)
@@ -75,8 +76,10 @@
           "xd"  'agda2-remove-annotations
           "xh"  'agda2-display-implicit-arguments
           "xq"  'agda2-quit
-          "xr"  'agda2-restart)
+          "xr"  'agda2-restart)))))
 
-        (with-eval-after-load 'golden-ratio
-          (add-to-list 'golden-ratio-exclude-buffer-names
-                       "*Agda information*"))))))
+(defun idris/pre-init-golden-ratio ()
+  (spacemacs|use-package-add-hook golden-ratio
+    :post-config
+    (add-to-list 'golden-ratio-exclude-buffer-names
+                 "*Agda information*")))
diff --git a/layers/+lang/idris/packages.el b/layers/+lang/idris/packages.el
index ed31ad1b4..d36363ac2 100644
--- a/layers/+lang/idris/packages.el
+++ b/layers/+lang/idris/packages.el
@@ -9,8 +9,9 @@
 ;;
 ;;; License: GPLv3
 
-(setq idris-packages '(idris-mode
-                       company
+(setq idris-packages '(company
+                       idris-mode
+                       golden-ratio
                        popwin))
 
 (defun idris/post-init-company ()
@@ -102,17 +103,19 @@
         "sp" 'idris-load-backward-line
         "sP" 'spacemacs/idris-load-backward-line-and-focus
         "ss" 'idris-pop-to-repl
-        "sq" 'idris-quit)
-
-      (with-eval-after-load 'golden-ratio
-        (add-to-list 'golden-ratio-exclude-buffer-names
-                      "*idris-notes*"))))
+        "sq" 'idris-quit)))
 
   ;; open special buffers in motion state so they can be closed with ~q~
   (evil-set-initial-state 'idris-compiler-notes-mode 'motion)
   (evil-set-initial-state 'idris-hole-list-mode 'motion)
   (evil-set-initial-state 'idris-info-mode 'motion))
 
+(defun idris/pre-init-golden-ratio ()
+  (spacemacs|use-package-add-hook golden-ratio
+    :post-config
+    (add-to-list 'golden-ratio-exclude-buffer-names
+                 "*idris-notes*")))
+
 (defun idris/pre-init-popwin ()
   (spacemacs|use-package-add-hook popwin
     :post-config