From e9c088cf3b016432ed5c51bcd64747e4564ee0ae Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Sun, 3 Apr 2022 20:40:31 +0200
Subject: [PATCH] refactor(ibuffer): move workspace functions

---
 modules/emacs/ibuffer/autoload/workspaces.el | 14 ++++++++++++++
 modules/emacs/ibuffer/config.el              | 14 ++------------
 2 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 modules/emacs/ibuffer/autoload/workspaces.el

diff --git a/modules/emacs/ibuffer/autoload/workspaces.el b/modules/emacs/ibuffer/autoload/workspaces.el
new file mode 100644
index 000000000..ed3ed14db
--- /dev/null
+++ b/modules/emacs/ibuffer/autoload/workspaces.el
@@ -0,0 +1,14 @@
+;;; emacs/ibuffer/autoload/workspaces.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :ui workspaces)
+
+;;;###autoload
+(defun +ibuffer-workspace (workspace-name)
+  "Open an ibuffer window for a workspace"
+  (ibuffer nil (format "%s buffers" workspace-name)
+           (list (cons 'workspace-buffers (+workspace-get workspace-name)))))
+
+;;;###autoload
+(defun +ibuffer/open-for-current-workspace ()
+  "Open an ibuffer window for the current workspace"
+  (interactive)
+  (+ibuffer-workspace (+workspace-current-name)))
diff --git a/modules/emacs/ibuffer/config.el b/modules/emacs/ibuffer/config.el
index 89ed34974..4e8cde2d7 100644
--- a/modules/emacs/ibuffer/config.el
+++ b/modules/emacs/ibuffer/config.el
@@ -44,20 +44,10 @@
         "Filter for workspace buffers"
       (:reader (+workspace-get (read-string "workspace name: "))
        :description "workspace")
-      (memq buf (+workspace-buffer-list qualifier)))
-
-    (defun +ibuffer-workspace (workspace-name)
-      "Open an ibuffer window for a workspace"
-      (ibuffer nil (format "%s buffers" workspace-name)
-               (list (cons 'workspace-buffers (+workspace-get workspace-name)))))
-
-    (defun +ibuffer/open-for-current-workspace ()
-      "Open an ibuffer window for the current workspace"
-      (interactive)
-      (+ibuffer-workspace (+workspace-current-name))))
+      (memq buf (+workspace-buffer-list qualifier))))
 
   (when (featurep! :completion ivy)
-    (defadvice! +ibuffer-use-counsel-maybe-a (_file &optional _wildcards)
+    (defadvice! +ibuffer--use-counsel-maybe-a (_file &optional _wildcards)
       "Use `counsel-find-file' instead of `find-file'."
       :override #'ibuffer-find-file
       (interactive