From d135c0f65a7f0703dd3428e8629396f4e2710ec7 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Mon, 11 Apr 2022 23:56:08 +0200 Subject: fix(load config): pre compute num plugins --- fnl/init.fnl | 4 ++-- fnl/install.fnl | 6 +++--- fnl/util.fnl | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fnl/init.fnl b/fnl/init.fnl index 567214f..4862b16 100644 --- a/fnl/init.fnl +++ b/fnl/init.fnl @@ -1,6 +1,6 @@ ;; Install, load settings, and load plugin configs. -(module init) +(module init {autoload {util util}}) (require :settings) (require :install) -(if (> (length (vim.fn.readdir path)) 3) +(if (> util.num-plugins 3) (require :config)) diff --git a/fnl/install.fnl b/fnl/install.fnl index f6b4501..50fbe24 100644 --- a/fnl/install.fnl +++ b/fnl/install.fnl @@ -2,7 +2,8 @@ (module install {autoload {a aniseed.core plugins plugins packer packer - bootstrap bootstrap}}) + bootstrap bootstrap + util util}}) (defn- install-plugins [plgs] (packer.startup (fn [use] @@ -10,6 +11,5 @@ (use (a.assoc opts 1 plugin)))))) (install-plugins plugins.plugins) -(local path (.. (vim.fn.stdpath :data) :/site/pack/packer/start)) -(if (= (length (vim.fn.readdir path)) 3) +(if (= util.num-plugins 3) (packer.sync)) diff --git a/fnl/util.fnl b/fnl/util.fnl index e6b4d9f..8bb3754 100644 --- a/fnl/util.fnl +++ b/fnl/util.fnl @@ -1,7 +1,8 @@ ;; Utility functions. (module util {autoload {nvim aniseed.nvim}}) -(defn autocmd [name opts] (nvim.ex.create_autocmd name opts)) +(def- path (.. (vim.fn.stdpath :data) :/site/pack/packer/start)) +(def num-plugins (length (vim.fn.readdir path))) (defn load-plugin [name] (let [(ok? val-or-err) (pcall require name)] -- cgit v1.2.3-70-g09d2