add(nvim): even more macros

.config/nvim/fnl/plugins/_cmp.fnl

@@ -1,5 +1,5 @@
 (import-macros {: nil?} :hibiscus.core)
-(import-macros {: require-then!} :macros)
+(import-macros {: require-then! : elem!} :macros)
 
 (local cmp (require :cmp))
 (local ls (require :luasnip))
@@ -39,7 +39,7 @@
 ; Lazy loader ;
 ;;;;;;;;;;;;;;;
 (require-then! :luasnip.loaders.from_vscode
-              #($.lazy_load {:paths [:./snippets]}))
+               #($.lazy_load {:paths [:./snippets]}))
 
 ;;;;;;;;
 ; Init ;
@@ -157,8 +157,7 @@
                                                                   :select true}))
                                            ($))
                                       [:i :s])}
-      sources (let [{: contains} (require :helpers)
-                    of-filetype (fn [fts] (contains fts vim.bo.filetype))]
+      sources (let [of-filetype (fn [fts] (elem! vim.bo.filetype fts))]
                 [{:name :luasnip}
                  {:name :nvim_lsp}
                  {:name :buffer

.config/nvim/fnl/plugins/_lsp.fnl

@@ -1,6 +1,5 @@
 (import-macros {: exec! : map! : setlocal!} :hibiscus.vim)
-(import-macros {: fst! : require-then!} :macros)
-(local {: foreach} (require :helpers))
+(import-macros {: fst! : require-then! : for!} :macros)
 (local map vim.keymap.set)
 
 (local servers
@@ -129,13 +128,13 @@
                   new-virt-text))]
   (require-then! :ufo #($.setup {:fold_virt_text_handler handler})))
 
-(foreach servers (fn [k v]
+(for! (fn [k v]
                    (let [config {: capabilities
                                  :on_attach #((on_attach $) (v.on_attach $))
                                  :settings v.settings}]
                      ((-> (require :lspconfig)
                           (. k)
-                          (. :setup)) config))))
+                          (. :setup)) config))) servers)
 
 (let [config {: capabilities
               :cmd [:jdt-language-server

.config/nvim/fnl/plugins/_lualine.fnl

@@ -1,11 +1,10 @@
-(import-macros {: require-then!} :macros)
-(local {: fst} (require :helpers))
+(import-macros {: require-then! : fst!} :macros)
 
 (fn diagnostic-message []
   (let [{: row} (vim.api.nvim_win_get_cursor 0)
         ds (vim.diagnostic.get 0 {:lnum (- row 1)})]
     (if (>= (length ds) 1)
-        (-> (fst ds)
+        (-> (fst! ds)
             (. :message)
             (: :gsub "%%" "%%%%"))
         "")))