summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraktersnurra <grydholm@kth.se>2022-04-20 23:45:35 +0200
committeraktersnurra <grydholm@kth.se>2022-04-20 23:45:35 +0200
commitef67dd9a66b7b278ecac3d6ddcb6f4347f20bb3c (patch)
tree86de753b29659c21ab69c08687a02160be9c71a3
parentc8e5a9d85ecefad2bf754596e4a47be59e666369 (diff)
fix(packer): loading problem
-rw-r--r--fnl/config/init.fnl1
-rw-r--r--fnl/config/packer.fnl5
-rw-r--r--fnl/install.fnl4
3 files changed, 5 insertions, 5 deletions
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))