From 6cb31718df762c6ebf764986074f08b19d6f82f8 Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Sun, 16 Oct 2022 01:40:16 +0200
Subject: Refactor loading of plugins with packer

---
 fnl/config/lualine.fnl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'fnl/config/lualine.fnl')

diff --git a/fnl/config/lualine.fnl b/fnl/config/lualine.fnl
index d098966..ee68523 100644
--- a/fnl/config/lualine.fnl
+++ b/fnl/config/lualine.fnl
@@ -1,8 +1,9 @@
 ;; Statusbar.
-(module config.lualine {autoload {: util}})
+(module config.lualine {autoload {:util :config.util}})
 
 (def- disable [:neogitstatus
                :lir
+               :netrw
                :alpha
                :Outline
                :NeogitStatus
@@ -73,4 +74,4 @@
                                 :lualine_z [:location :progress]}
             :extensions []})
 
-(util.use-config :lualine opts)
+(util.setup :lualine opts)
-- 
cgit v1.2.3-70-g09d2


From 3f1367c3a460f89cafc80f134fbf420543ffb5e6 Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Sun, 16 Oct 2022 11:49:45 +0200
Subject: Remove colon for util autoload

---
 fnl/config/auto-session.fnl        | 2 +-
 fnl/config/autocmd.fnl             | 9 ++++++++-
 fnl/config/autopairs.fnl           | 2 +-
 fnl/config/better-escape.fnl       | 2 +-
 fnl/config/bqf.fnl                 | 2 +-
 fnl/config/cmp.fnl                 | 2 +-
 fnl/config/colorizer.fnl           | 2 +-
 fnl/config/colorscheme.fnl         | 2 +-
 fnl/config/comment.fnl             | 2 +-
 fnl/config/diffview.fnl            | 2 +-
 fnl/config/fidget.fnl              | 2 +-
 fnl/config/flit.fnl                | 2 +-
 fnl/config/gitsigns.fnl            | 2 +-
 fnl/config/harpoon.fnl             | 2 +-
 fnl/config/leap.fnl                | 2 +-
 fnl/config/lir.fnl                 | 2 +-
 fnl/config/lsp/handlers.fnl        | 2 +-
 fnl/config/lsp/mason-lspconfig.fnl | 2 +-
 fnl/config/lsp/mason-null-ls.fnl   | 2 +-
 fnl/config/lsp/mason.fnl           | 2 +-
 fnl/config/lsp/null-ls.fnl         | 2 +-
 fnl/config/lsp/settings/jsonls.fnl | 2 +-
 fnl/config/lualine.fnl             | 2 +-
 fnl/config/minibar.fnl             | 2 +-
 fnl/config/neogit.fnl              | 2 +-
 fnl/config/orgmode.fnl             | 2 +-
 fnl/config/packer.fnl              | 2 +-
 fnl/config/project.fnl             | 2 +-
 fnl/config/spectre.fnl             | 2 +-
 fnl/config/stabilize.fnl           | 2 +-
 fnl/config/stay-in-place.fnl       | 2 +-
 fnl/config/surround.fnl            | 2 +-
 fnl/config/telescope.fnl           | 2 +-
 fnl/config/toggleterm.fnl          | 2 +-
 fnl/config/treesitter.fnl          | 2 +-
 fnl/config/trim.fnl                | 2 +-
 fnl/config/trouble.fnl             | 2 +-
 fnl/config/which-key.fnl           | 2 +-
 fnl/config/window-picker.fnl       | 2 +-
 fnl/config/zen.fnl                 | 2 +-
 fnl/plugins.fnl                    | 2 --
 41 files changed, 47 insertions(+), 42 deletions(-)

(limited to 'fnl/config/lualine.fnl')

diff --git a/fnl/config/auto-session.fnl b/fnl/config/auto-session.fnl
index 35a43a9..0ac88ce 100644
--- a/fnl/config/auto-session.fnl
+++ b/fnl/config/auto-session.fnl
@@ -1,5 +1,5 @@
 ;; Session manager.
-(module config.auto-session {autoload {:util :config.util}})
+(module config.auto-session {autoload {util config.util}})
 
 (def- auto-opts {:log_level :info
                  :auto_session_enable_last_session false
diff --git a/fnl/config/autocmd.fnl b/fnl/config/autocmd.fnl
index 24adcad..4194e66 100644
--- a/fnl/config/autocmd.fnl
+++ b/fnl/config/autocmd.fnl
@@ -2,7 +2,8 @@
 (module config.autocmd {autoload {nvim aniseed.nvim
                                   env aniseed.env
                                   a aniseed.core
-                                  :util :config.util}})
+                                  : packer
+                                  util config.util}})
 
 (defn create-autocmd [event opts] (nvim.create_autocmd event opts))
 
@@ -36,3 +37,9 @@
                 {:pattern :*.fnl
                  :callback (lambda []
                              (env.init nvim.g.aniseed#env))})
+
+(create-autocmd :BufWritePost
+                {:pattern :plugins.fnl
+                 :callback (lambda []
+                             (env.init nvim.g.aniseed#env)
+                             (packer.sync))})
diff --git a/fnl/config/autopairs.fnl b/fnl/config/autopairs.fnl
index 6918c40..d7865b5 100644
--- a/fnl/config/autopairs.fnl
+++ b/fnl/config/autopairs.fnl
@@ -1,5 +1,5 @@
 ;; Autopairs for brackets and quote symbols.
-(module config.autopairs {autoload {:util :config.util}})
+(module config.autopairs {autoload {util config.util}})
 
 (def- opts {:check_ts true
             :ts_config {:lua [:string :source]
diff --git a/fnl/config/better-escape.fnl b/fnl/config/better-escape.fnl
index 3e68ddd..659d22f 100644
--- a/fnl/config/better-escape.fnl
+++ b/fnl/config/better-escape.fnl
@@ -1,5 +1,5 @@
 ;; Better escape without nasty delay.
-(module config.better-escape {autoload {:util :config.util}})
+(module config.better-escape {autoload {util config.util}})
 
 (def- opts {:mapping [:kk :jj]
             :timeout vim.o.timeoutlen
diff --git a/fnl/config/bqf.fnl b/fnl/config/bqf.fnl
index 4c877a1..59a1aad 100644
--- a/fnl/config/bqf.fnl
+++ b/fnl/config/bqf.fnl
@@ -1,4 +1,4 @@
 ;; Make Neovim's quickfix window better.
-(module config.bqf {autoload {:util :config.util}})
+(module config.bqf {autoload {util config.util}})
 
 (util.setup :bqf {})
diff --git a/fnl/config/cmp.fnl b/fnl/config/cmp.fnl
index 24115d7..78e6304 100644
--- a/fnl/config/cmp.fnl
+++ b/fnl/config/cmp.fnl
@@ -1,5 +1,5 @@
 ;; Configuration for completion plugin.
-(module config.cmp {autoload {nvim aniseed.nvim :util :config.util}})
+(module config.cmp {autoload {nvim aniseed.nvim util config.util}})
 
 (let [cmp (util.prequire :cmp)
       lspkind (util.prequire :lspkind)
diff --git a/fnl/config/colorizer.fnl b/fnl/config/colorizer.fnl
index 8358f0b..ff7fbab 100644
--- a/fnl/config/colorizer.fnl
+++ b/fnl/config/colorizer.fnl
@@ -1,4 +1,4 @@
 ;; Enables colorization of color codes in source files.
-(module config.colorizer {autoload {:util :config.util}})
+(module config.colorizer {autoload {util config.util}})
 
 (util.setup :colorizer {})
diff --git a/fnl/config/colorscheme.fnl b/fnl/config/colorscheme.fnl
index 50317c7..b4fbf1f 100644
--- a/fnl/config/colorscheme.fnl
+++ b/fnl/config/colorscheme.fnl
@@ -1,5 +1,5 @@
 ;; Load neovim colorscheme.
-(module config.colorscheme {autoload {:util :config.util}})
+(module config.colorscheme {autoload {util config.util}})
 
 (local colorscheme :no-clown-fiesta)
 
diff --git a/fnl/config/comment.fnl b/fnl/config/comment.fnl
index 1b896f4..3a3f1fb 100644
--- a/fnl/config/comment.fnl
+++ b/fnl/config/comment.fnl
@@ -1,5 +1,5 @@
 ;; Language aware commenting.
-(module config.comment {autoload {:util :config.util}})
+(module config.comment {autoload {util config.util}})
 
 (def- opts {})
 
diff --git a/fnl/config/diffview.fnl b/fnl/config/diffview.fnl
index a4fed9d..3772d32 100644
--- a/fnl/config/diffview.fnl
+++ b/fnl/config/diffview.fnl
@@ -1,5 +1,5 @@
 ;; Trim whitespaces on save.
-(module config.diffview {autoload {:util :config.util}})
+(module config.diffview {autoload {util config.util}})
 
 (def- opts {})
 
diff --git a/fnl/config/fidget.fnl b/fnl/config/fidget.fnl
index 3c66990..1b9ca81 100644
--- a/fnl/config/fidget.fnl
+++ b/fnl/config/fidget.fnl
@@ -1,5 +1,5 @@
 ;; Show lsp progress.
-(module config.fidget {autoload {:util :config.util}})
+(module config.fidget {autoload {util config.util}})
 
 (def- opts {:text {:spinner :dots_snake}})
 
diff --git a/fnl/config/flit.fnl b/fnl/config/flit.fnl
index 6a769f0..d80a0d9 100644
--- a/fnl/config/flit.fnl
+++ b/fnl/config/flit.fnl
@@ -1,5 +1,5 @@
 ;; fFtT motions on roids.
-(module config.flit {autoload {:util :config.util nvim aniseed.nvim}})
+(module config.flit {autoload {util config.util nvim aniseed.nvim}})
 
 (def- opts {:keys {:f :f :F :F :t :t :T :T}
             :labeled_modes :v
diff --git a/fnl/config/gitsigns.fnl b/fnl/config/gitsigns.fnl
index 43f831e..663e3e0 100644
--- a/fnl/config/gitsigns.fnl
+++ b/fnl/config/gitsigns.fnl
@@ -1,5 +1,5 @@
 ;; Add git signs to source files.
-(module config.gitsigns {autoload {:util :config.util}})
+(module config.gitsigns {autoload {util config.util}})
 
 (def- signs {:add {:hl :GitSignsAdd
                    :text "|"
diff --git a/fnl/config/harpoon.fnl b/fnl/config/harpoon.fnl
index 71c3798..122f045 100644
--- a/fnl/config/harpoon.fnl
+++ b/fnl/config/harpoon.fnl
@@ -1,5 +1,5 @@
 ;; Harpoon files for navigation.
-(module config.harpoon {autoload {:util :config.util nvim aniseed.nvim}})
+(module config.harpoon {autoload {util config.util nvim aniseed.nvim}})
 
 (def- opts {})
 
diff --git a/fnl/config/leap.fnl b/fnl/config/leap.fnl
index 541b0e0..868f9eb 100644
--- a/fnl/config/leap.fnl
+++ b/fnl/config/leap.fnl
@@ -1,5 +1,5 @@
 ;; Leap through text.
-(module config.leap {autoload {:util :config.util nvim aniseed.nvim}})
+(module config.leap {autoload {util config.util nvim aniseed.nvim}})
 
 (def- opts {})
 
diff --git a/fnl/config/lir.fnl b/fnl/config/lir.fnl
index 8f9058c..45fb052 100644
--- a/fnl/config/lir.fnl
+++ b/fnl/config/lir.fnl
@@ -1,5 +1,5 @@
 ;; Simple file manager.
-(module config.lir {autoload {:util :config.util nvim aniseed.nvim}})
+(module config.lir {autoload {util config.util nvim aniseed.nvim}})
 
 (defn- opts [actions mark-actions clipboard-actions]
        {:show_hidden_files false
diff --git a/fnl/config/lsp/handlers.fnl b/fnl/config/lsp/handlers.fnl
index 913a5a2..c9b7825 100644
--- a/fnl/config/lsp/handlers.fnl
+++ b/fnl/config/lsp/handlers.fnl
@@ -1,5 +1,5 @@
 ;; Handlers for the requests and responses from and to the lsp server.
-(module config.lsp.handlers {autoload {:util :config.util nvim aniseed.nvim}})
+(module config.lsp.handlers {autoload {util config.util nvim aniseed.nvim}})
 
 (def- signs [{:name :DiagnosticSignError :text ""}
              {:name :DiagnosticSignWarn :text ""}
diff --git a/fnl/config/lsp/mason-lspconfig.fnl b/fnl/config/lsp/mason-lspconfig.fnl
index 7a03ced..130fc17 100644
--- a/fnl/config/lsp/mason-lspconfig.fnl
+++ b/fnl/config/lsp/mason-lspconfig.fnl
@@ -1,5 +1,5 @@
 ;; TBD
-(module config.lsp.mason-lspconfig {autoload {:util :config.util}})
+(module config.lsp.mason-lspconfig {autoload {util config.util}})
 
 (def- servers [:bashls
                :clangd
diff --git a/fnl/config/lsp/mason-null-ls.fnl b/fnl/config/lsp/mason-null-ls.fnl
index e739b9b..33cf93f 100644
--- a/fnl/config/lsp/mason-null-ls.fnl
+++ b/fnl/config/lsp/mason-null-ls.fnl
@@ -1,5 +1,5 @@
 ;; Ensure that tools needed for null-ls are installed.
-(module config.mason-null-ls {autoload {:util :config.util}})
+(module config.mason-null-ls {autoload {util config.util}})
 
 (def- opts {:ensure_installed [:flake8
                                :golangci-lint
diff --git a/fnl/config/lsp/mason.fnl b/fnl/config/lsp/mason.fnl
index 7c58d94..adc60a4 100644
--- a/fnl/config/lsp/mason.fnl
+++ b/fnl/config/lsp/mason.fnl
@@ -1,5 +1,5 @@
 ;; Mason manages external tooling, e.g. lsp, formatters, and linters.
-(module config.lsp.mason {autoload {:util :config.util}})
+(module config.lsp.mason {autoload {util config.util}})
 
 (def- opts {:ui {:icons {:package_installed "✓"
                          :package_pending "➜"
diff --git a/fnl/config/lsp/null-ls.fnl b/fnl/config/lsp/null-ls.fnl
index 7efb079..7ebd25e 100644
--- a/fnl/config/lsp/null-ls.fnl
+++ b/fnl/config/lsp/null-ls.fnl
@@ -1,5 +1,5 @@
 ;; Adds LSP diagnostics and formatting.
-(module config.lsp.null-ls {autoload {:util :config.util}})
+(module config.lsp.null-ls {autoload {util config.util}})
 
 (let [null-ls (util.prequire :null-ls)]
   (let [formatting null-ls.builtins.formatting
diff --git a/fnl/config/lsp/settings/jsonls.fnl b/fnl/config/lsp/settings/jsonls.fnl
index 3fe9299..55c6115 100644
--- a/fnl/config/lsp/settings/jsonls.fnl
+++ b/fnl/config/lsp/settings/jsonls.fnl
@@ -1,5 +1,5 @@
 ;; Json schema store catalog language server.
-(module config.lsp.settings.jsonls {autoload {:util :config.util}})
+(module config.lsp.settings.jsonls {autoload {util config.util}})
 
 (let [schemastore (util.prequire :schemastore)]
   {:init_options {:providerFormatter false}
diff --git a/fnl/config/lualine.fnl b/fnl/config/lualine.fnl
index ee68523..833e68e 100644
--- a/fnl/config/lualine.fnl
+++ b/fnl/config/lualine.fnl
@@ -1,5 +1,5 @@
 ;; Statusbar.
-(module config.lualine {autoload {:util :config.util}})
+(module config.lualine {autoload {util config.util}})
 
 (def- disable [:neogitstatus
                :lir
diff --git a/fnl/config/minibar.fnl b/fnl/config/minibar.fnl
index 21d687a..8f0e792 100644
--- a/fnl/config/minibar.fnl
+++ b/fnl/config/minibar.fnl
@@ -1,4 +1,4 @@
-(module config.minibar {autoload {:util :config.util}})
+(module config.minibar {autoload {util config.util}})
 
 (def- opts {:ignore-filetypes [:help
                                :startify
diff --git a/fnl/config/neogit.fnl b/fnl/config/neogit.fnl
index aab1291..2d9f515 100644
--- a/fnl/config/neogit.fnl
+++ b/fnl/config/neogit.fnl
@@ -1,4 +1,4 @@
 ;; UI for git.
-(module config.neogit {autoload {:util :config.util}})
+(module config.neogit {autoload {util config.util}})
 
 (util.setup :neogit {})
diff --git a/fnl/config/orgmode.fnl b/fnl/config/orgmode.fnl
index af3d705..a21eaa0 100644
--- a/fnl/config/orgmode.fnl
+++ b/fnl/config/orgmode.fnl
@@ -1,5 +1,5 @@
 ;; Orgmode for nvim.
-(module config.orgmode {autoload {nvim aniseed.nvim :util :config.util}})
+(module config.orgmode {autoload {nvim aniseed.nvim util config.util}})
 
 (nvim.ex.set :conceallevel=2)
 (nvim.ex.set :concealcursor=nc)
diff --git a/fnl/config/packer.fnl b/fnl/config/packer.fnl
index b8ab91a..f4f44cc 100644
--- a/fnl/config/packer.fnl
+++ b/fnl/config/packer.fnl
@@ -1,5 +1,5 @@
 ;; Load packer config
-(module config.packer {autoload {:util :config.util}})
+(module config.packer {autoload {util config.util}})
 
 (let [packer (util.prequire :packer)
       packer-util (require :packer.util)]
diff --git a/fnl/config/project.fnl b/fnl/config/project.fnl
index 1c97527..1617ca5 100644
--- a/fnl/config/project.fnl
+++ b/fnl/config/project.fnl
@@ -1,5 +1,5 @@
 ;; Provides project management.
-(module config.project {autoload {:util :config.util}})
+(module config.project {autoload {util config.util}})
 
 (def- opts {:active true
             :on_config_done nil
diff --git a/fnl/config/spectre.fnl b/fnl/config/spectre.fnl
index 337beb1..f0afa52 100644
--- a/fnl/config/spectre.fnl
+++ b/fnl/config/spectre.fnl
@@ -1,5 +1,5 @@
 ;; Find and replace.
-(module config.spectre {autoload {:util :config.util}})
+(module config.spectre {autoload {util config.util}})
 
 (def- opts {:color_devicons true
             :highlight {:ui :String :search :DiffChange :replace :DiffDelete}
diff --git a/fnl/config/stabilize.fnl b/fnl/config/stabilize.fnl
index 59b7c5d..5ac2a7f 100644
--- a/fnl/config/stabilize.fnl
+++ b/fnl/config/stabilize.fnl
@@ -1,5 +1,5 @@
 ;; Stabilize window open/close events.
-(module config.stabilize {autoload {:util :config.util}})
+(module config.stabilize {autoload {util config.util}})
 
 (def- opts {:force true
             ;; stabilize window even when current cursor position will be hidden behind new window
diff --git a/fnl/config/stay-in-place.fnl b/fnl/config/stay-in-place.fnl
index 1c19399..be3ccd3 100644
--- a/fnl/config/stay-in-place.fnl
+++ b/fnl/config/stay-in-place.fnl
@@ -1,4 +1,4 @@
 ;; Prevent the cursor from moving when using shift and filter actions.
-(module config.stay-in-place {autoload {:util :config.util}})
+(module config.stay-in-place {autoload {util config.util}})
 
 (util.setup :stay-in-place {})
diff --git a/fnl/config/surround.fnl b/fnl/config/surround.fnl
index 8a3aad9..2406ecd 100644
--- a/fnl/config/surround.fnl
+++ b/fnl/config/surround.fnl
@@ -1,5 +1,5 @@
 ;; Surround selections.
-(module config.surround {autoload {:util :config.util}})
+(module config.surround {autoload {util config.util}})
 
 (def- opts {})
 
diff --git a/fnl/config/telescope.fnl b/fnl/config/telescope.fnl
index 5c79501..dc58b01 100644
--- a/fnl/config/telescope.fnl
+++ b/fnl/config/telescope.fnl
@@ -1,5 +1,5 @@
 ;; Telescope a highly extendable fuzzy finder over lists.
-(module config.telescope {autoload {:util :config.util nvim aniseed.nvim}})
+(module config.telescope {autoload {util config.util nvim aniseed.nvim}})
 
 (def- opts {:noremap true :silent true})
 
diff --git a/fnl/config/toggleterm.fnl b/fnl/config/toggleterm.fnl
index 2a1a462..dd561f3 100644
--- a/fnl/config/toggleterm.fnl
+++ b/fnl/config/toggleterm.fnl
@@ -1,6 +1,6 @@
 ;; Terminal inside nvim.
 (module config.toggleterm
-        {autoload {:util :config.util nvim aniseed.nvim autocmd config.autocmd}})
+        {autoload {util config.util nvim aniseed.nvim autocmd config.autocmd}})
 
 (def- opts {:size 16 :shade_terminals false})
 
diff --git a/fnl/config/treesitter.fnl b/fnl/config/treesitter.fnl
index 058182d..e61e2c0 100644
--- a/fnl/config/treesitter.fnl
+++ b/fnl/config/treesitter.fnl
@@ -1,6 +1,6 @@
 ;; Treesitter is a tool for building syntax trees for source files.
 ;; In the neovim context it helps with better coloring.
-(module config.treesitter {autoload {:util :config.util}})
+(module config.treesitter {autoload {util config.util}})
 
 (def- opts {:ensure_installed [:c
                                :rust
diff --git a/fnl/config/trim.fnl b/fnl/config/trim.fnl
index ee699fb..8a2ec43 100644
--- a/fnl/config/trim.fnl
+++ b/fnl/config/trim.fnl
@@ -1,5 +1,5 @@
 ;; Trim whitespaces on save.
-(module config.trim {autoload {:util :config.util}})
+(module config.trim {autoload {util config.util}})
 
 (def- opts {:disable [:python]})
 
diff --git a/fnl/config/trouble.fnl b/fnl/config/trouble.fnl
index 0266ec0..b45fecd 100644
--- a/fnl/config/trouble.fnl
+++ b/fnl/config/trouble.fnl
@@ -1,5 +1,5 @@
 ;; Pretty diagnostics.
-(module config.trouble {autoload {:util :config.util}})
+(module config.trouble {autoload {util config.util}})
 
 (def- opts {:position :bottom
             ;; position of the list can be: bottom, top, left, right
diff --git a/fnl/config/which-key.fnl b/fnl/config/which-key.fnl
index fdd76b5..2b5ea9d 100644
--- a/fnl/config/which-key.fnl
+++ b/fnl/config/which-key.fnl
@@ -1,5 +1,5 @@
 ;; Which-key provides a pop-up meny for some key mappings.
-(module config.which-key {autoload {:util :config.util nvim aniseed.nvim}})
+(module config.which-key {autoload {util config.util nvim aniseed.nvim}})
 
 (def- setup {:plugins {:marks true
                        :registers true
diff --git a/fnl/config/window-picker.fnl b/fnl/config/window-picker.fnl
index 268e952..76a11f5 100644
--- a/fnl/config/window-picker.fnl
+++ b/fnl/config/window-picker.fnl
@@ -1,5 +1,5 @@
 ;; Trim whitespaces on save.
-(module config.window-picker {autoload {:util :config.util}})
+(module config.window-picker {autoload {util config.util}})
 
 (def- opts {:other_win_hl_color "#171717"
             :fg_color "#E1E1E1"
diff --git a/fnl/config/zen.fnl b/fnl/config/zen.fnl
index df90661..a7dbe6a 100644
--- a/fnl/config/zen.fnl
+++ b/fnl/config/zen.fnl
@@ -1,5 +1,5 @@
 ;; Zen mode.
-(module config.zen {autoload {:util :config.util}})
+(module config.zen {autoload {util config.util}})
 
 (def- opts {:window {:backdrop 1
                      :height 0.8
diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl
index 2b7fe15..3696598 100644
--- a/fnl/plugins.fnl
+++ b/fnl/plugins.fnl
@@ -49,8 +49,6 @@
            :event :BufWinEnter
            :config (fn []
                      (require :config.fidget))}
-          {1 :jose-elias-alvarez/null-ls.nvim}
-          {1 :neovim/nvim-lspconfig}
           {1 :williamboman/mason.nvim
            :event :BufWinEnter
            :config (fn []
-- 
cgit v1.2.3-70-g09d2