From f4d1821217edca3244479a69955226d0d263fe63 Mon Sep 17 00:00:00 2001 From: Leon Kowarschick Date: Fri, 6 Oct 2023 18:35:19 +0200 Subject: [PATCH] move to having a prelude --- nvim/.config/nvim/fnl/dots/keybinds.fnl | 5 +-- .../nvim/fnl/dots/plugins/bufferline.fnl | 5 +-- nvim/.config/nvim/fnl/dots/plugins/cmp.fnl | 3 +- .../nvim/fnl/dots/plugins/diffview.fnl | 3 +- nvim/.config/nvim/fnl/dots/plugins/feline.fnl | 6 +--- nvim/.config/nvim/fnl/dots/plugins/lsp.fnl | 4 +-- .../.config/nvim/fnl/dots/plugins/ltex-ls.fnl | 3 +- .../nvim/fnl/dots/plugins/nvim-colorizer.fnl | 34 ++++++++----------- .../nvim/fnl/dots/plugins/telescope.fnl | 3 +- .../.config/nvim/fnl/dots/plugins/trouble.fnl | 4 +-- nvim/.config/nvim/fnl/dots/prelude.fnl | 6 ++++ nvim/.config/nvim/fnl/dots/utils.fnl | 4 +-- 12 files changed, 30 insertions(+), 50 deletions(-) create mode 100644 nvim/.config/nvim/fnl/dots/prelude.fnl diff --git a/nvim/.config/nvim/fnl/dots/keybinds.fnl b/nvim/.config/nvim/fnl/dots/keybinds.fnl index 71e3c71..a8371ed 100644 --- a/nvim/.config/nvim/fnl/dots/keybinds.fnl +++ b/nvim/.config/nvim/fnl/dots/keybinds.fnl @@ -1,7 +1,4 @@ -(local {: autoload} (require :nfnl.module)) -(local a (autoload :nfnl.core)) -(local str (autoload :nfnl.string)) -(local utils (autoload :dots.utils)) +(local {: autoload : a : str : utils} (require :dots.prelude)) (local wk (autoload :which-key)) (local glance (autoload :glance)) (local crates (autoload :crates)) diff --git a/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl b/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl index 895ce28..2b8b92d 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl @@ -1,8 +1,5 @@ -(local {: autoload} (require :nfnl.module)) -(local a (autoload :aniseed.core)) -(local utils (autoload :dots.utils)) +(local {: autoload : a : utils : colors} (require :dots.prelude)) (local bufferline (autoload :bufferline)) -(local colors (autoload :dots.colors)) (vim.cmd "hi link BufferLineTabSeparatorSelected BufferLineSeparatorSelected") (vim.cmd "hi link BufferLineTabSeparator BufferLineSeparator") diff --git a/nvim/.config/nvim/fnl/dots/plugins/cmp.fnl b/nvim/.config/nvim/fnl/dots/plugins/cmp.fnl index 3f374f3..3587d7a 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/cmp.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/cmp.fnl @@ -1,5 +1,4 @@ -(local {: autoload} (require :nfnl.module)) -(local utils (autoload :dots.utils)) +(local {: autoload : utils} (require :dots.prelude)) (local cmp (autoload :cmp)) ; check this for coloring maybe diff --git a/nvim/.config/nvim/fnl/dots/plugins/diffview.fnl b/nvim/.config/nvim/fnl/dots/plugins/diffview.fnl index a403664..96b2489 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/diffview.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/diffview.fnl @@ -1,5 +1,4 @@ -(local {: autoload} (require :nfnl.module)) -(local utils (require :dots.utils)) +(local {: autoload : utils} (require :dots.prelude)) (local cb (autoload :diffview.config)) (local diffview (autoload :diffview)) diff --git a/nvim/.config/nvim/fnl/dots/plugins/feline.fnl b/nvim/.config/nvim/fnl/dots/plugins/feline.fnl index 1d20e21..9c107ba 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/feline.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/feline.fnl @@ -1,8 +1,4 @@ -(local {: autoload} (require :nfnl.module)) -(local utils (autoload :dots.utils)) -(local a (autoload :nfnl.core)) -(local str (autoload :nfnl.string)) -(local colors (autoload :dots.colors)) +(local {: autoload : utils : a : str : colors} (require :dots.prelude)) (local feline (autoload :feline)) diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl index 34bdf77..acb22e1 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl @@ -1,8 +1,6 @@ -(local {: autoload} (require :nfnl.module)) -(local a (autoload :aniseed.core)) +(local {: autoload : a : utils} (require :dots.prelude)) (local lsp (autoload :lspconfig)) (local lsp-configs (autoload :lspconfig/configs)) -(local utils (autoload :dots.utils)) (local cmp_nvim_lsp (autoload :cmp_nvim_lsp)) (fn setup [] diff --git a/nvim/.config/nvim/fnl/dots/plugins/ltex-ls.fnl b/nvim/.config/nvim/fnl/dots/plugins/ltex-ls.fnl index b0579dc..0709a43 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/ltex-ls.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/ltex-ls.fnl @@ -1,8 +1,7 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload : utils} (require :dots.prelude)) (local lsp (autoload :lspconfig)) (local configs (autoload :lspconfig/configs)) (local lsputil (autoload :lspconfig/util)) -(local utils (require :dots.utils)) (fn cmds [xs] diff --git a/nvim/.config/nvim/fnl/dots/plugins/nvim-colorizer.fnl b/nvim/.config/nvim/fnl/dots/plugins/nvim-colorizer.fnl index 1c7a881..a881728 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/nvim-colorizer.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/nvim-colorizer.fnl @@ -1,22 +1,16 @@ -(local {: autoload} (require :nfnl.module)) +(local {: autoload : utils} (require :dots.prelude)) (local colorizer (autoload :colorizer)) -(local utils (autoload :dots.utils)) -(fn setup [] - ; this really shouldn't be necessary,.. but it is - (set vim.o.termguicolors true) - - (colorizer.setup - ["*"] - {:RGB true - :RRGGBB true - :names true - :RRGGBBAA true - :rgb_fn true - :hsl_fn true - :mode "background"})) - -[(utils.plugin :norcalli/nvim-colorizer.lua - {:event "VeryLazy" - :lazy true - :config setup})] +[(utils.plugin + :norcalli/nvim-colorizer.lua + {:event "VeryLazy" + :lazy true + :config #(colorizer.setup + ["*"] + {:RGB true + :RRGGBB true + :names true + :RRGGBBAA true + :rgb_fn true + :hsl_fn true + :mode "background"})})] diff --git a/nvim/.config/nvim/fnl/dots/plugins/telescope.fnl b/nvim/.config/nvim/fnl/dots/plugins/telescope.fnl index c4e4399..8c2b88a 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/telescope.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/telescope.fnl @@ -1,5 +1,4 @@ -(local {: autoload} (require :nfnl.module)) -(local utils (autoload :dots.utils)) +(local {: autoload : utils} (require :dots.prelude)) (local telescope (autoload :telescope)) (local actions (autoload :telescope.actions)) diff --git a/nvim/.config/nvim/fnl/dots/plugins/trouble.fnl b/nvim/.config/nvim/fnl/dots/plugins/trouble.fnl index 1f7feba..7c34cd1 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/trouble.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/trouble.fnl @@ -1,6 +1,4 @@ -(local {: autoload} (require :nfnl.module)) -(local utils (autoload :dots.utils)) -(local colors (autoload :dots.colors)) +(local {: autoload : utils : colors} (require :dots.prelude)) (local trouble (autoload :trouble)) (fn setup [] diff --git a/nvim/.config/nvim/fnl/dots/prelude.fnl b/nvim/.config/nvim/fnl/dots/prelude.fnl new file mode 100644 index 0000000..65e1ec9 --- /dev/null +++ b/nvim/.config/nvim/fnl/dots/prelude.fnl @@ -0,0 +1,6 @@ +(local {: autoload} (require :nfnl.module)) +{: autoload + :a (autoload :nfnl.core) + :str (autoload :nfnl.string) + :utils (autoload :dots.utils) + :colors (autoload :dots.colors)} diff --git a/nvim/.config/nvim/fnl/dots/utils.fnl b/nvim/.config/nvim/fnl/dots/utils.fnl index db88d83..7c56ca4 100644 --- a/nvim/.config/nvim/fnl/dots/utils.fnl +++ b/nvim/.config/nvim/fnl/dots/utils.fnl @@ -1,6 +1,4 @@ -(local {: autoload} (require :nfnl.module)) -(local a (autoload :nfnl.core)) -(local str (autoload :nfnl.string)) +(local {: autoload : a : str} (require :dots.prelude)) (fn plugin [name ?opts] (if (= nil ?opts)