From 351ba8bf77a743a5bfe0715aaddcf46b934eccf6 Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Mon, 17 May 2021 20:25:40 +0200
Subject: [PATCH] asdf

---
 nvim/.config/nvim/fnl/init.fnl           |  4 ++--
 nvim/.config/nvim/fnl/macros.fnl         |  3 ++-
 nvim/.config/nvim/fnl/plugins.fnl        |  1 +
 nvim/.config/nvim/fnl/plugins/barbar.fnl |  7 -------
 nvim/.config/nvim/fnl/plugins/lsp.fnl    | 10 +++++-----
 nvim/.config/nvim/fnl/utils.fnl          |  4 ++--
 6 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 nvim/.config/nvim/fnl/plugins/barbar.fnl

diff --git a/nvim/.config/nvim/fnl/init.fnl b/nvim/.config/nvim/fnl/init.fnl
index 85b5fa1..d8c1695 100644
--- a/nvim/.config/nvim/fnl/init.fnl
+++ b/nvim/.config/nvim/fnl/init.fnl
@@ -3,13 +3,13 @@
              nvim aniseed.nvim
              a aniseed.core
              str aniseed.string
-             fennel aniseed.fennel
              colors colors
              gehzu nvim-gehzu}
    require-macros [macros]})
 
 (macro make-errors-epic [f]
-  `(xpcall #,f #(a.println (fennel.traceback $1))))
+  `(xpcall #,f #(let [fennel# (require :aniseed.fennel)]
+                  (a.println (fennel#.traceback $1)))))
 
 (when (vim.fn.has "termguicolors")
   (se termguicolors true))
diff --git a/nvim/.config/nvim/fnl/macros.fnl b/nvim/.config/nvim/fnl/macros.fnl
index 8ca668e..7f77e15 100644
--- a/nvim/.config/nvim/fnl/macros.fnl
+++ b/nvim/.config/nvim/fnl/macros.fnl
@@ -67,7 +67,8 @@
               block (. args (+ i 1))]
           (a.assoc block 1 name)
           (when (. block :mod)
-            (a.assoc block :config `#((. (require "utils") :safe-require) ,(. block :mod))))
+            ;(a.assoc block :config `#((. (require "utils") :safe-require) ,(. block :mod)))
+            (a.assoc block :config `#(require ,(. block :mod))))
           (a.assoc block :mod)
           (table.insert use-statements block)))
   
diff --git a/nvim/.config/nvim/fnl/plugins.fnl b/nvim/.config/nvim/fnl/plugins.fnl
index 5900f96..a07c675 100644
--- a/nvim/.config/nvim/fnl/plugins.fnl
+++ b/nvim/.config/nvim/fnl/plugins.fnl
@@ -1,6 +1,7 @@
 (module plugins
   {require-macros [macros]})
 
+
 (packer-use
   "/home/leon/coding/projects/nvim-gehzu" {}
   :elkowar/kmonad.vim {}
diff --git a/nvim/.config/nvim/fnl/plugins/barbar.fnl b/nvim/.config/nvim/fnl/plugins/barbar.fnl
deleted file mode 100644
index 7780d10..0000000
--- a/nvim/.config/nvim/fnl/plugins/barbar.fnl
+++ /dev/null
@@ -1,7 +0,0 @@
-(module utils
-   {autoload {a aniseed.core
-              fennel aniseed.fennel
-              nvim aniseed.nvim
-              str aniseed.string}
-    require-macros [macros]})
-        
diff --git a/nvim/.config/nvim/fnl/plugins/lsp.fnl b/nvim/.config/nvim/fnl/plugins/lsp.fnl
index 7d9285b..b252ddf 100644
--- a/nvim/.config/nvim/fnl/plugins/lsp.fnl
+++ b/nvim/.config/nvim/fnl/plugins/lsp.fnl
@@ -1,10 +1,10 @@
 (module plugins.lsp
-        {autoload {a aniseed.core
-                   lsp lspconfig 
-                   lsp-configs lspconfig.configs
-                   utils utils}
+  {autoload {a aniseed.core
+             lsp lspconfig 
+             lsp-configs lspconfig.configs
+             utils utils}
 
-         require-macros [macros]})
+   require-macros [macros]})
 
 (fn on_attach [client bufnr]
   (pkg lsp_signature.nvim [lsp_signature (require "lsp_signature")]
diff --git a/nvim/.config/nvim/fnl/utils.fnl b/nvim/.config/nvim/fnl/utils.fnl
index 842378e..2252dc1 100644
--- a/nvim/.config/nvim/fnl/utils.fnl
+++ b/nvim/.config/nvim/fnl/utils.fnl
@@ -1,6 +1,5 @@
 (module utils
   {autoload {a aniseed.core
-             fennel aniseed.fennel
              nvim aniseed.nvim
              str aniseed.string}
    require-macros [macros]})
@@ -76,7 +75,8 @@
        ;(print name)
        ;(time 
         (require name)) 
-    #(a.println (.. "Error sourcing " name ":\n" (fennel.traceback $1)))))
+    #(let [fennel (require :aniseed.fennel)]
+      (a.println (.. "Error sourcing " name ":\n" (fennel.traceback $1))))))
 
 
 (defn buffer-content [bufnr]