From ef67dd9a66b7b278ecac3d6ddcb6f4347f20bb3c Mon Sep 17 00:00:00 2001
From: aktersnurra <grydholm@kth.se>
Date: Wed, 20 Apr 2022 23:45:35 +0200
Subject: fix(packer): loading problem

---
 fnl/config/init.fnl   | 1 -
 fnl/config/packer.fnl | 5 ++---
 fnl/install.fnl       | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'fnl')

diff --git a/fnl/config/init.fnl b/fnl/config/init.fnl
index 7299f0b..c1eb17d 100644
--- a/fnl/config/init.fnl
+++ b/fnl/config/init.fnl
@@ -1,6 +1,5 @@
 ;; Load all plugin configs.
 (module config.init {require {_ config.impatient
-                              _ config.packer
                               _ config.autocmd
                               _ config.alpha
                               _ config.autopairs
diff --git a/fnl/config/packer.fnl b/fnl/config/packer.fnl
index 9d6a016..6441ab0 100644
--- a/fnl/config/packer.fnl
+++ b/fnl/config/packer.fnl
@@ -1,7 +1,6 @@
 ;; Load packer config
 (module config.packer {autoload {util util}})
 
-(let [packer (util.load-plugin :packer)]
+(let [packer (util.load-plugin :packer) packer-util (require :packer.util)]
   (packer.init {:display {:open_fn (fn []
-                                     ((require :packer.util).float
-                                                             {:border :rounded}))}}))
+                                     (packer-util.float {:border :rounded}))}}))
diff --git a/fnl/install.fnl b/fnl/install.fnl
index a1db5c0..4582d67 100644
--- a/fnl/install.fnl
+++ b/fnl/install.fnl
@@ -1,14 +1,16 @@
 ;; Installs plugins with packer.
 (module install {autoload {a aniseed.core
-                           plugins plugins
                            packer packer
+                           plugins plugins
                            util util}})
 
+
 (defn- install-plugins [plgs]
        (packer.startup (fn [use]
                          (each [plugin opts (pairs plgs)]
                            (use (a.assoc opts 1 plugin))))))
 
+(require :config.packer)
 (install-plugins plugins.plugins)
 (if (= util.num-plugins 3)
     (packer.sync))
-- 
cgit v1.2.3-70-g09d2