From c0b8ffff0478746ff485aab5e092106be4973c42 Mon Sep 17 00:00:00 2001 From: ame Date: Wed, 13 Nov 2024 06:58:28 -0600 Subject: fix install --- fnl/.util.fnl.swp | Bin 0 -> 12288 bytes fnl/util.fnl | 10 +++++++--- init.fnl | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 fnl/.util.fnl.swp diff --git a/fnl/.util.fnl.swp b/fnl/.util.fnl.swp new file mode 100644 index 0000000..f9add58 Binary files /dev/null and b/fnl/.util.fnl.swp differ diff --git a/fnl/util.fnl b/fnl/util.fnl index 12abe74..c372393 100644 --- a/fnl/util.fnl +++ b/fnl/util.fnl @@ -2,11 +2,15 @@ (tset _G :loaded {}) (tset M :require! (lambda [name] - (tset _G.loaded name (require name)) - (. _G.loaded name))) + (local (ok req) (pcall require name)) + (when ok + (tset _G.loaded name req) + (. _G.loaded name)))) (tset M :setup! (lambda [name ?config] ;(tset _G.loaded :name ((. (require name) :setup) (or ?config {}))))) - ((. (M.require! name) :setup) (or ?config {})))) + (local req (M.require! name)) + (when (~= req nil) + ((. (M.require! name) :setup) (or ?config {}))))) M diff --git a/init.fnl b/init.fnl index eb7af43..3438c99 100644 --- a/init.fnl +++ b/init.fnl @@ -4,7 +4,7 @@ (global settings (require :settings)) -(when (~= (vim.fn.getenv :NVIM_DEBUG) 1) +(when (~= (vim.fn.getenv :NVIM_DEBUG) :1) (require :keybinds) (require :defaults) (require :opt)) -- cgit v1.2.3