Improve util import

34 files changed, 43 insertions, 43 deletions

diff --git a/fnl/config/aerial.fnl b/fnl/config/aerial.fnl
index 6b74762..0ed3f83 100644
--- a/fnl/config/aerial.fnl
+++ b/fnl/config/aerial.fnl
@@ -1,5 +1,5 @@
 ;; Skimming code.
-(module config.aerial {autoload {util util}})
+(module config.aerial {autoload {: util}})
 
 (let [aerial (util.load-plugin :aerial)]
   (aerial.setup {}))
diff --git a/fnl/config/alpha.fnl b/fnl/config/alpha.fnl
index 96a5c32..fcbbb8c 100644
--- a/fnl/config/alpha.fnl
+++ b/fnl/config/alpha.fnl
@@ -1,5 +1,5 @@
 ;; A customizable greeter.
-(module config.alpha {autoload {util util}})
+(module config.alpha {autoload {: util}})
 
 (def- ascii-art ["     ##############..... ############## "
                  "   ##############......##############   "
diff --git a/fnl/config/autocmd.fnl b/fnl/config/autocmd.fnl
index 3319919..d66fb3a 100644
--- a/fnl/config/autocmd.fnl
+++ b/fnl/config/autocmd.fnl
@@ -1,5 +1,5 @@
 ;; Autocommands for nvim.
-(module config.autocmd {autoload {nvim aniseed.nvim a aniseed.core util util}})
+(module config.autocmd {autoload {nvim aniseed.nvim a aniseed.core : util}})
 
 (defn- autocmd [event opts] (nvim.create_autocmd event opts))
 
diff --git a/fnl/config/autopairs.fnl b/fnl/config/autopairs.fnl
index 2b175fa..6d7d466 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 util}})
+(module config.autopairs {autoload {: util}})
 
 (let [npairs (util.load-plugin :nvim-autopairs)]
   (npairs.setup {:check_ts true
diff --git a/fnl/config/better-escape.fnl b/fnl/config/better-escape.fnl
index 93ec0a9..ffe3a6e 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 util}})
+(module config.better-escape {autoload {: util}})
 
 (let [better-escape (util.load-plugin :better_escape)]
   (better-escape.setup {:mapping [:jk :jj]
diff --git a/fnl/config/bqf.fnl b/fnl/config/bqf.fnl
index 3f2abe9..9a4de06 100644
--- a/fnl/config/bqf.fnl
+++ b/fnl/config/bqf.fnl
@@ -1,5 +1,5 @@
 ;; Make Neovim's quickfix window better.
-(module config.bqf {autoload {util util}})
+(module config.bqf {autoload {: util}})
 
 (let [bqf (util.load-plugin :bqf)]
   (bqf.setup {}))
diff --git a/fnl/config/cmp.fnl b/fnl/config/cmp.fnl
index 8b37c1c..4b7c49b 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 util}})
+(module config.cmp {autoload {nvim aniseed.nvim : util}})
 
 (let [cmp (util.load-plugin :cmp)
       lspkind (util.load-plugin :lspkind)
diff --git a/fnl/config/colorizer.fnl b/fnl/config/colorizer.fnl
index 4d0b381..748fffa 100644
--- a/fnl/config/colorizer.fnl
+++ b/fnl/config/colorizer.fnl
@@ -1,5 +1,5 @@
 ;; Enables colorization of color codes in source files.
-(module config.colorizer {autoload {util util}})
+(module config.colorizer {autoload {: util}})
 
 (let [colorizer (util.load-plugin :colorizer)]
   (colorizer.setup))
diff --git a/fnl/config/colorscheme.fnl b/fnl/config/colorscheme.fnl
index d9eee52..417836b 100644
--- a/fnl/config/colorscheme.fnl
+++ b/fnl/config/colorscheme.fnl
@@ -1,5 +1,5 @@
 ;; Load neovim colorscheme.
-(module config.colorscheme {autoload {util util}})
+(module config.colorscheme {autoload {: util}})
 
 (local colorscheme :no-clown-fiesta)
 
diff --git a/fnl/config/comment.fnl b/fnl/config/comment.fnl
index 78eaa7d..f6e4972 100644
--- a/fnl/config/comment.fnl
+++ b/fnl/config/comment.fnl
@@ -1,5 +1,5 @@
 ;; Language aware commenting.
-(module config.comment {autoload {util util}})
+(module config.comment {autoload {: util}})
 
 (defn- get-type [ctx U] (if (= ctx.ctype U.ctype.line) :__default :__multiline))
 
diff --git a/fnl/config/fidget.fnl b/fnl/config/fidget.fnl
index 453714a..4699823 100644
--- a/fnl/config/fidget.fnl
+++ b/fnl/config/fidget.fnl
@@ -1,5 +1,5 @@
 ;; Show lsp progress.
-(module config.fidget {autoload {util util}})
+(module config.fidget {autoload {: util}})
 
 (let [fidget (util.load-plugin :fidget)]
   (fidget.setup {}))
diff --git a/fnl/config/gitsigns.fnl b/fnl/config/gitsigns.fnl
index 53d7da3..ecd3311 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 util}})
+(module config.gitsigns {autoload {: util}})
 
 (def- signs {:add {:hl :GitSignsAdd
                    :text "|"
diff --git a/fnl/config/hop.fnl b/fnl/config/hop.fnl
index 9dd3d10..678b5e2 100644
--- a/fnl/config/hop.fnl
+++ b/fnl/config/hop.fnl
@@ -1,5 +1,5 @@
 ;; Hopping in text.
-(module config.hop {autoload {util util nvim aniseed.nvim}})
+(module config.hop {autoload {: util nvim aniseed.nvim}})
 
 (let [hop (util.load-plugin :hop)]
   (hop.setup {}))
diff --git a/fnl/config/lir.fnl b/fnl/config/lir.fnl
index 686f847..c775c4b 100644
--- a/fnl/config/lir.fnl
+++ b/fnl/config/lir.fnl
@@ -1,5 +1,5 @@
 ;; Simple file manager.
-(module config.lir {autoload {util util nvim aniseed.nvim}})
+(module config.lir {autoload {: 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 1e087d8..c892a22 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 util nvim aniseed.nvim}})
+(module config.lsp.handlers {autoload {: util nvim aniseed.nvim}})
 
 (def- signs [{:name :DiagnosticSignError :text ""}
              {:name :DiagnosticSignWarn :text ""}
diff --git a/fnl/config/lsp/init.fnl b/fnl/config/lsp/init.fnl
index 0506e4f..04a3907 100644
--- a/fnl/config/lsp/init.fnl
+++ b/fnl/config/lsp/init.fnl
@@ -1,5 +1,5 @@
 ;; Loads the LSP functionality.
-(module config.lsp.init {autoload {util util}})
+(module config.lsp.init {autoload {: util}})
 
 (require :config.lsp.lsp-installer)
 (let [handlers (require :config.lsp.handlers)]
diff --git a/fnl/config/lsp/lsp-installer.fnl b/fnl/config/lsp/lsp-installer.fnl
index 9a3215a..1ad0af7 100644
--- a/fnl/config/lsp/lsp-installer.fnl
+++ b/fnl/config/lsp/lsp-installer.fnl
@@ -1,5 +1,5 @@
 ;; Loads default handlers and specific language settings.
-(module config.lsp.lsp-installer {autoload {util util}})
+(module config.lsp.lsp-installer {autoload {: util}})
 
 (def- default-servers {:bashls true
                        :clangd true
diff --git a/fnl/config/lsp/null-ls.fnl b/fnl/config/lsp/null-ls.fnl
index b4b75c6..a1e16c2 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 util}})
+(module config.lsp.null-ls {autoload {: util}})
 
 (let [null-ls (util.load-plugin :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 18d9256..a2cb78c 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 util}})
+(module config.lsp.settings.jsonls {autoload {: util}})
 
 (let [schemastore (util.load-plugin :schemastore)]
   {:init_options {:providerFormatter false}
diff --git a/fnl/config/lualine.fnl b/fnl/config/lualine.fnl
index f439f2d..746fc58 100644
--- a/fnl/config/lualine.fnl
+++ b/fnl/config/lualine.fnl
@@ -1,5 +1,5 @@
 ;; Statusbar.
-(module config.lualine {autoload {util util}})
+(module config.lualine {autoload {: util}})
 
 (def- ignore [:help
               :packer
diff --git a/fnl/config/neogit.fnl b/fnl/config/neogit.fnl
index 0bbc5b3..353e8fc 100644
--- a/fnl/config/neogit.fnl
+++ b/fnl/config/neogit.fnl
@@ -1,5 +1,5 @@
 ;; UI for git.
-(module config.neogit {autoload {util util}})
+(module config.neogit {autoload {: util}})
 
 (let [neogit (util.load-plugin :trim)]
   (neogit.setup {}))
diff --git a/fnl/config/nvim-tree.fnl b/fnl/config/nvim-tree.fnl
index a957259..00e509d 100644
--- a/fnl/config/nvim-tree.fnl
+++ b/fnl/config/nvim-tree.fnl
@@ -1,5 +1,5 @@
 ;; A vertical sidebar file explorer.
-(module config.nvim-tree {autoload {util util nvim aniseed.nvim}})
+(module config.nvim-tree {autoload {: util nvim aniseed.nvim}})
 
 (let [nvim-tree (util.load-plugin :nvim-tree)
       nvim-tree-config (util.load-plugin :nvim-tree.config)]
diff --git a/fnl/config/orgmode.fnl b/fnl/config/orgmode.fnl
index 81c24a3..0def299 100644
--- a/fnl/config/orgmode.fnl
+++ b/fnl/config/orgmode.fnl
@@ -1,17 +1,17 @@
 ;; Orgmode for nvim.
-(module config.orgmode {autoload {nvim aniseed.nvim
-                                  util util}})
+(module config.orgmode {autoload {nvim aniseed.nvim : util}})
 
-(nvim.ex.set "conceallevel=2")
-(nvim.ex.set "concealcursor=nc")
+(nvim.ex.set :conceallevel=2)
+(nvim.ex.set :concealcursor=nc)
+
+(def- templates
+      {:t {:description :Task :template "* TODO %?\n %u\n DEADLINE: %T\n :TAGS:"}
+       :m {:description :Meeting
+           :template "* MEETING %? :MEETING: :LOGBOOK: CLOCK: %U :END:"}
+       :n {:description :Note :template "* NOTE %? :NOTE:\n %u\n :TAGS:"}})
 
 (let [orgmode (util.load-plugin :orgmode)]
   (orgmode.setup_ts_grammar)
   (orgmode.setup {:org_agenda_files ["~/.local/share/org/**/*"]
                   :org_default_notes_file "~/.local/share/org/refile.org"
-                  :org_agenda_templates {:t {:description :Task
-                                             :template "* TODO %?\n %u"}
-                                         :m {:description :Meeting
-                                             :template "* MEETING %? :MEETING: :LOGBOOK: CLOCK: %U :END:"}
-                                         :n {:description :Note
-                                             :template "* NOTE %? :NOTE:\n %u"}}}))
+                  :org_agenda_templates templates}))
diff --git a/fnl/config/packer.fnl b/fnl/config/packer.fnl
index bdb0d5e..36691b9 100644
--- a/fnl/config/packer.fnl
+++ b/fnl/config/packer.fnl
@@ -1,5 +1,5 @@
 ;; Load packer config
-(module config.packer {autoload {util util}})
+(module config.packer {autoload {: util}})
 
 (let [packer (util.load-plugin :packer)
       packer-util (require :packer.util)]
diff --git a/fnl/config/project.fnl b/fnl/config/project.fnl
index 7d50fee..27f689c 100644
--- a/fnl/config/project.fnl
+++ b/fnl/config/project.fnl
@@ -1,5 +1,5 @@
 ;; Provides project management.
-(module config.project {autoload {util util}})
+(module config.project {autoload {: util}})
 
 (let [project (util.load-plugin :project_nvim)]
   (project.setup {:active true
diff --git a/fnl/config/spectre.fnl b/fnl/config/spectre.fnl
index 5529714..c181367 100644
--- a/fnl/config/spectre.fnl
+++ b/fnl/config/spectre.fnl
@@ -1,5 +1,5 @@
 ;; Find and replace.
-(module config.spectre {autoload {util util}})
+(module config.spectre {autoload {: util}})
 
 (let [spectre (util.load-plugin :spectre)]
   (spectre.setup {:color_devicons true
diff --git a/fnl/config/spellsitter.fnl b/fnl/config/spellsitter.fnl
index 695c069..ee72d4b 100644
--- a/fnl/config/spellsitter.fnl
+++ b/fnl/config/spellsitter.fnl
@@ -1,5 +1,5 @@
 ;; Enable spell checking in comments.
-(module config.spellsitter {autoload {util util}})
+(module config.spellsitter {autoload {: util}})
 
 (let [spellsitter (util.load-plugin :spellsitter)]
   (spellsitter.setup {:enable true :debug false}))
diff --git a/fnl/config/telescope.fnl b/fnl/config/telescope.fnl
index e366e21..ea50f96 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 util nvim aniseed.nvim}})
+(module config.telescope {autoload {: util nvim aniseed.nvim}})
 
 (def- opts {:noremap true :silent true})
 
diff --git a/fnl/config/treesitter.fnl b/fnl/config/treesitter.fnl
index b94e442..d71e9ce 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 util}})
+(module config.treesitter {autoload {: util}})
 
 (let [treesitter (util.load-plugin :nvim-treesitter.configs)]
   (treesitter.setup {:ensure_installed [:c
diff --git a/fnl/config/trim.fnl b/fnl/config/trim.fnl
index fe23496..929ca1d 100644
--- a/fnl/config/trim.fnl
+++ b/fnl/config/trim.fnl
@@ -1,5 +1,5 @@
 ;; Trim whitespaces on save.
-(module config.trim {autoload {util util}})
+(module config.trim {autoload {: util}})
 
 (let [trim (util.load-plugin :trim)]
   (trim.setup {:disable [:python]}))
diff --git a/fnl/config/which-key.fnl b/fnl/config/which-key.fnl
index e78f038..54cd0e8 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 util nvim aniseed.nvim}})
+(module config.which-key {autoload {: 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 51d7fb4..1f9aaeb 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 util}})
+(module config.window-picker {autoload {: util}})
 
 (let [window-picker (util.load-plugin :window-picker)]
   (window-picker.setup {:other_win_hl_color "#171717"
diff --git a/fnl/config/zen.fnl b/fnl/config/zen.fnl
index 0f05710..b32ed9c 100644
--- a/fnl/config/zen.fnl
+++ b/fnl/config/zen.fnl
@@ -1,5 +1,5 @@
 ;; Zen mode.
-(module config.zen {autoload {util util}})
+(module config.zen {autoload {: util}})
 
 (let [zen-mode (util.load-plugin :zen-mode)]
   (zen-mode.setup {:window {:backdrop 1
diff --git a/fnl/init.fnl b/fnl/init.fnl
index ce1c84f..362dc78 100644
--- a/fnl/init.fnl
+++ b/fnl/init.fnl
@@ -1,4 +1,4 @@
 ;; Install, load settings, and load plugin configs.
-(module init {autoload {util util} require [settings config.packer]})
+(module init {autoload {: util} require [settings config.packer]})
 
 (util.load-plugins)