From 73333784f84d9e6b714fd2811c9ae9ffcab86bda Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 17 Dec 2017 00:03:14 -0500
Subject: [PATCH] completion/ivy: fix cyclical-load errors when compiling

---
 modules/completion/ivy/config.el     | 12 +++++++++++-
 modules/feature/workspaces/config.el | 14 +-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el
index 6f35efcfd..bcd027078 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -62,7 +62,17 @@ immediately runs it on the current candidate (ending the ivy session)."
   (ivy-set-display-transformer #'ivy-switch-buffer #'+ivy-buffer-transformer)
   (ivy-set-display-transformer #'ivy-switch-buffer-other-window #'+ivy-buffer-transformer)
   (ivy-set-display-transformer #'+ivy/switch-workspace-buffer #'+ivy-buffer-transformer)
-  (ivy-set-display-transformer #'counsel-recentf #'abbreviate-file-name))
+  (ivy-set-display-transformer #'counsel-recentf #'abbreviate-file-name)
+
+  (nconc ivy-sort-functions-alist
+         '((persp-kill-buffer   . nil)
+           (persp-remove-buffer . nil)
+           (persp-add-buffer    . nil)
+           (persp-switch        . nil)
+           (persp-window-switch . nil)
+           (persp-frame-switch  . nil)
+           (+workspace/switch-to . nil)
+           (+workspace/delete . nil))))
 
 
 (def-package! swiper :commands (swiper swiper-all))
diff --git a/modules/feature/workspaces/config.el b/modules/feature/workspaces/config.el
index 6699b8878..6bcb58ffe 100644
--- a/modules/feature/workspaces/config.el
+++ b/modules/feature/workspaces/config.el
@@ -93,17 +93,5 @@ Allows a perspective-specific buffer list via `+workspaces-buffer-list'."
       (persp-add-buffer buffer (get-current-persp) nil)
       (force-mode-line-update t)))
   (advice-add #'switch-to-buffer :after #'+workspaces*auto-add-buffer)
-  (advice-add #'display-buffer   :after #'+workspaces*auto-add-buffer)
-
-  ;;
-  (after! ivy
-    (nconc ivy-sort-functions-alist
-           '((persp-kill-buffer   . nil)
-             (persp-remove-buffer . nil)
-             (persp-add-buffer    . nil)
-             (persp-switch        . nil)
-             (persp-window-switch . nil)
-             (persp-frame-switch  . nil)
-             (+workspace/switch-to . nil)
-             (+workspace/delete . nil)))))
+  (advice-add #'display-buffer   :after #'+workspaces*auto-add-buffer))