diff options
Diffstat (limited to 'fnl/plugins')
| -rw-r--r-- | fnl/plugins/bqf.fnl | 2 | ||||
| -rw-r--r-- | fnl/plugins/cmp.fnl | 4 | ||||
| -rw-r--r-- | fnl/plugins/colorscheme.fnl | 12 | ||||
| -rw-r--r-- | fnl/plugins/conform.fnl | 4 | ||||
| -rw-r--r-- | fnl/plugins/harpoon.fnl | 2 | ||||
| -rw-r--r-- | fnl/plugins/leap.fnl | 8 | ||||
| -rw-r--r-- | fnl/plugins/lsp/keymaps.fnl | 18 | ||||
| -rw-r--r-- | fnl/plugins/lsp/lspconfig.fnl | 2 | ||||
| -rw-r--r-- | fnl/plugins/lsp/mason-lspconfig.fnl | 5 | ||||
| -rw-r--r-- | fnl/plugins/lsp/servers.fnl | 2 | ||||
| -rw-r--r-- | fnl/plugins/lualine.fnl | 4 | ||||
| -rw-r--r-- | fnl/plugins/nvim-lint.fnl | 2 | ||||
| -rw-r--r-- | fnl/plugins/stay-in-place.fnl | 2 | ||||
| -rw-r--r-- | fnl/plugins/textobjs.fnl | 2 | ||||
| -rw-r--r-- | fnl/plugins/treesitter.fnl | 2 | ||||
| -rw-r--r-- | fnl/plugins/ts-comments.fnl | 2 | ||||
| -rw-r--r-- | fnl/plugins/unison.fnl | 11 | ||||
| -rw-r--r-- | fnl/plugins/window-picker.fnl | 4 |
18 files changed, 52 insertions, 36 deletions
diff --git a/fnl/plugins/bqf.fnl b/fnl/plugins/bqf.fnl index 38afd09..8d2ea2a 100644 --- a/fnl/plugins/bqf.fnl +++ b/fnl/plugins/bqf.fnl @@ -24,4 +24,4 @@ :ptoggleauto :a :ptogglemode :P}}) -{1 :kevinhwang91/nvim-bqf :event [:BufReadPost :BufNewFile] : opts} +{1 :kevinhwang91/nvim-bqf :event :VeryLazy : opts} diff --git a/fnl/plugins/cmp.fnl b/fnl/plugins/cmp.fnl index 1eb2e9e..a979633 100644 --- a/fnl/plugins/cmp.fnl +++ b/fnl/plugins/cmp.fnl @@ -3,8 +3,8 @@ (local opts {:keymap {:preset :default} :appearance {:use_nvim_cmp_as_default false :nerd_font_variant :mono} - :completion {:menu {:scrollbar false :border :none} - :documentation {:window {:border :none + :completion {:menu {:scrollbar false :border :single} + :documentation {:window {:border :single :scrollbar false}}} :signature {:enabled false :window {:scrollbar false}} :sources {:default [:lsp :path :snippets :buffer :dadbod] diff --git a/fnl/plugins/colorscheme.fnl b/fnl/plugins/colorscheme.fnl index 2d913ca..96ad95c 100644 --- a/fnl/plugins/colorscheme.fnl +++ b/fnl/plugins/colorscheme.fnl @@ -1,12 +1,16 @@ ;; Load neovim colorscheme. -(local opts {:styles {:type {:bold true} +(local opts {:theme :dark + :styles {:type {:bold true} :lsp {:underline true} :match_paren {:underline true}}}) (λ config [] (let [plugin (require :no-clown-fiesta)] - (plugin.setup opts) - (plugin.load))) + (plugin.load opts))) -{1 :aktersnurra/no-clown-fiesta.nvim :lazy false :priority 1000 : config} +{1 :aktersnurra/no-clown-fiesta.nvim + :lazy false + :priority 1000 + : config + :dev true} diff --git a/fnl/plugins/conform.fnl b/fnl/plugins/conform.fnl index b1b15ba..b84627d 100644 --- a/fnl/plugins/conform.fnl +++ b/fnl/plugins/conform.fnl @@ -17,7 +17,7 @@ :fennel [:fnlfmt] :haskell [:fourmolu] :html [:prettierd] - :http [:jq] + :http [:jq :kulala-fmt] :json [:jq] :lua [:stylua] :markdown [:prettierd] @@ -29,4 +29,4 @@ :toml [:taplo] :yaml [:yamlfmt]}}) -{1 :stevearc/conform.nvim : init : opts :event [:BufReadPost :BufNewFile]} +{1 :stevearc/conform.nvim : init : opts :event :BufRead} diff --git a/fnl/plugins/harpoon.fnl b/fnl/plugins/harpoon.fnl index 62ebf17..1ae632c 100644 --- a/fnl/plugins/harpoon.fnl +++ b/fnl/plugins/harpoon.fnl @@ -42,6 +42,6 @@ {1 :ThePrimeagen/harpoon :branch :harpoon2 - :event [:BufReadPost :BufNewFile] + :event :BufRead : init : keys} diff --git a/fnl/plugins/leap.fnl b/fnl/plugins/leap.fnl index 79b94c2..5a80dbe 100644 --- a/fnl/plugins/leap.fnl +++ b/fnl/plugins/leap.fnl @@ -1,14 +1,14 @@ ;; Leap through text. (local dependencies [{1 :ggandor/flit.nvim - :event [:BufReadPost :BufNewFile] + :event :VimEnter :opts {:keys {:f :f :F :F :t :t :T :T} :labeled_modes :v :multiline true :opts {}}} - {1 :tpope/vim-repeat :event [:BufReadPost :BufNewFile]} + {1 :tpope/vim-repeat :event :VeryLazy} {1 :ggandor/leap-spooky.nvim - :event [:BufReadPost :BufNewFile] + :event :VeryLazy :opts {;; Additional text objects, to be merged with the default ones. ;; E.g.: {'iq', 'aq'} :extra_text_objects [:iq :aq] @@ -38,5 +38,5 @@ {1 :ggandor/leap.nvim : dependencies - :event [:BufReadPost :BufNewFile] + :event :VeryLazy : config} diff --git a/fnl/plugins/lsp/keymaps.fnl b/fnl/plugins/lsp/keymaps.fnl index 72e03cd..f312581 100644 --- a/fnl/plugins/lsp/keymaps.fnl +++ b/fnl/plugins/lsp/keymaps.fnl @@ -4,15 +4,15 @@ [[:n :gD "<cmd>lua vim.lsp.buf.declaration()<CR>" {:desc :Declaration}] [:n :gd - "<cmd>Telescope lsp_definitions theme=dropdown<cr>" + "<cmd>Telescope lsp_definitions theme=get_dropdown<cr>" {:desc :Definition}] [:n :gI - "<cmd>Telescope lsp_implementations theme=dropdown<cr>" + "<cmd>Telescope lsp_implementations theme=get_dropdown<cr>" {:desc :Implementation}] [:n :gr - "<cmd>Telescope lsp_references theme=dropdown<cr>" + "<cmd>Telescope lsp_references theme=get_dropdown<cr>" {:desc :References}] [:n :gl @@ -20,24 +20,24 @@ {:desc :Diagnostics}] [:n :gj - "<cmd>Telescope diagnostics theme=dropdown<cr>" + "<cmd>Telescope diagnostics theme=get_dropdown<cr>" {:desc "Telescope Diagnostics"}] [:n :gw - "<cmd>Telescope lsp_dynamic_workspace_symbols theme=dropdown<cr>" + "<cmd>Telescope lsp_dynamic_workspace_symbols theme=get_dropdown<cr>" {:desc "Workspace Symbols"}] [:n :gE - "<cmd>Telescope lsp_type_definitions theme=dropdown<cr>" - {:desc "Workspace Symbols"}] + "<cmd>Telescope lsp_type_definitions theme=get_dropdown<cr>" + {:desc "Type Definitions"}] [:n :gm "<cmd>lua vim.lsp.buf.signature_help()<CR>" {:desc :Signature}] [:n :gM - "<cmd>Telescope lsp_document_symbols theme=dropdown<cr>" + "<cmd>Telescope lsp_document_symbols theme=get_dropdown<cr>" {:desc "Document Symbols"}] [:n :gh "<cmd>lua vim.lsp.buf.code_action()<cr>" {:desc "Code Action"}] [:n :gb "<cmd>lua vim.lsp.codelens.run()<cr>" {:desc "Code Lens"}] - [:n :K "<cmd>lua vim.lsp.hover()<cr>" {:desc "Hover documentation"}] + [:n :K "<cmd>lua vim.lsp.buf.hover()<cr>" {:desc "Hover documentation"}] [:n :<leader>li :<cmd>LspInfo<cr> {:desc "Lsp Info"}]]) (λ on-attach [buffer] diff --git a/fnl/plugins/lsp/lspconfig.fnl b/fnl/plugins/lsp/lspconfig.fnl index 5cd25d4..192954c 100644 --- a/fnl/plugins/lsp/lspconfig.fnl +++ b/fnl/plugins/lsp/lspconfig.fnl @@ -17,7 +17,7 @@ (mason-lspconfig.setup))) {1 :neovim/nvim-lspconfig - :event [:BufReadPost :BufNewFile] + :event :BufNew :dependencies [:mason.nvim :williamboman/mason-lspconfig.nvim :b0o/schemastore.nvim diff --git a/fnl/plugins/lsp/mason-lspconfig.fnl b/fnl/plugins/lsp/mason-lspconfig.fnl index 429e948..48ea0b5 100644 --- a/fnl/plugins/lsp/mason-lspconfig.fnl +++ b/fnl/plugins/lsp/mason-lspconfig.fnl @@ -2,9 +2,8 @@ ;; setup hooks for client configurations. (local textDocument-handlers - {:textDocument/hover (vim.lsp.with vim.lsp.handlers.hover {:border :single}) - :textDocument/signatureHelp (vim.lsp.with vim.lsp.handlers.signature_help - {:border :single})}) + {:textDocument/hover (vim.lsp.with vim.lsp.handlers.hover) + :textDocument/signatureHelp (vim.lsp.with vim.lsp.handlers.signature_help)}) (λ capabilities [] (let [blink-cmp (require :blink.cmp)] diff --git a/fnl/plugins/lsp/servers.fnl b/fnl/plugins/lsp/servers.fnl index fea4e89..7d213a8 100644 --- a/fnl/plugins/lsp/servers.fnl +++ b/fnl/plugins/lsp/servers.fnl @@ -16,7 +16,6 @@ [(vim.fn.line "$" 0)]))]}}} :ocamllsp {} - :pyright {} :rust_analyzer {:settings {:rust-analyzer {:lens {:enable true} :checkOnSave {:command :clippy}}}} :lua_ls {:settings {:Lua {:completion {:callSnippet :Replace} @@ -25,6 +24,7 @@ :path (vim.split package.path ";")}}}} :taplo {} :texlab {} + :ty {} :vale_ls {:filetypes [:markdown :text :org]} :sqls {} :yamlls {:settings {:yaml {:schemastore {:enable false :url ""} diff --git a/fnl/plugins/lualine.fnl b/fnl/plugins/lualine.fnl index b2f7e14..b331e79 100644 --- a/fnl/plugins/lualine.fnl +++ b/fnl/plugins/lualine.fnl @@ -55,7 +55,7 @@ :timer {:progress_enddelay 500 :lsp_client_name_enddelay 500}}) (local opts {:options {:icons_enabled true - :theme :auto + :theme :no-clown-fiesta :component_separators "" :section_separators {:left "" :right ""} :disabled_filetypes disable @@ -79,6 +79,6 @@ (local dependencies [:arkav/lualine-lsp-progress]) {1 :nvim-lualine/lualine.nvim - :event [:BufReadPost :BufNewFile] + :event :VeryLazy : opts : dependencies} diff --git a/fnl/plugins/nvim-lint.fnl b/fnl/plugins/nvim-lint.fnl index e2ecdc0..2d1887d 100644 --- a/fnl/plugins/nvim-lint.fnl +++ b/fnl/plugins/nvim-lint.fnl @@ -26,4 +26,4 @@ :yaml [:yamllint] :zsh [:zsh]}))) -{1 :mfussenegger/nvim-lint : init : config :event [:BufReadPost :BufNewFile]} +{1 :mfussenegger/nvim-lint : init : config :event :BufNew} diff --git a/fnl/plugins/stay-in-place.fnl b/fnl/plugins/stay-in-place.fnl index de6deb7..69066d7 100644 --- a/fnl/plugins/stay-in-place.fnl +++ b/fnl/plugins/stay-in-place.fnl @@ -1,3 +1,3 @@ ;; Keep cursor at character when indenting. -{1 :gbprod/stay-in-place.nvim :event [:BufReadPost :BufNewFile] :config true} +{1 :gbprod/stay-in-place.nvim :event :BufRead :config true} diff --git a/fnl/plugins/textobjs.fnl b/fnl/plugins/textobjs.fnl index 025e2b5..0f3a1e1 100644 --- a/fnl/plugins/textobjs.fnl +++ b/fnl/plugins/textobjs.fnl @@ -1,5 +1,5 @@ ;; Various text objects. {1 :chrisgrieser/nvim-various-textobjs - :event [:BufReadPost :BufNewFile] + :event :VeryLazy :opts {:keymaps {:useDefaults true}}} diff --git a/fnl/plugins/treesitter.fnl b/fnl/plugins/treesitter.fnl index e2a4b96..b75eba3 100644 --- a/fnl/plugins/treesitter.fnl +++ b/fnl/plugins/treesitter.fnl @@ -20,10 +20,12 @@ :make :markdown :ocaml + :ocaml_interface :python :rust :sql :toml + :unison :vim :vimdoc :xml diff --git a/fnl/plugins/ts-comments.fnl b/fnl/plugins/ts-comments.fnl index d8ce85a..9c08fec 100644 --- a/fnl/plugins/ts-comments.fnl +++ b/fnl/plugins/ts-comments.fnl @@ -1,3 +1,3 @@ ;; Enhance comments with treesitter. -{1 :folke/ts-comments.nvim :opts {} :event [:BufReadPost :BufNewFile]} +{1 :folke/ts-comments.nvim :opts {} :event :VeryLazy} diff --git a/fnl/plugins/unison.fnl b/fnl/plugins/unison.fnl new file mode 100644 index 0000000..ba03ad7 --- /dev/null +++ b/fnl/plugins/unison.fnl @@ -0,0 +1,11 @@ +;; Unison lang support + +(λ config [plugin] + (vim.opt.rtp:append (.. plugin.dir :/editor-support/vim)) + ((. (require :lazy.core.loader) :packadd) (.. plugin.dir :/editor-support/vim))) + +(λ init [plugin] + ((. (require :lazy.core.loader) :ftdetect) (.. plugin.dir + :/editor-support/vim))) + +{1 :unisonweb/unison :branch :trunk : config : init} diff --git a/fnl/plugins/window-picker.fnl b/fnl/plugins/window-picker.fnl index 41225f0..68b7786 100644 --- a/fnl/plugins/window-picker.fnl +++ b/fnl/plugins/window-picker.fnl @@ -1,4 +1,4 @@ -;; Trim whitespaces on save. +;; Select buffer (local opts {:other_win_hl_color "#171717" :fg_color "#E1E1E1" @@ -16,4 +16,4 @@ (vim.keymap.set :n :mw (λ [] (pick-window)) {}))) -{1 :s1n7ax/nvim-window-picker :event [:BufReadPost :BufNewFile] :version :2.0.0 : config} +{1 :s1n7ax/nvim-window-picker :event :VeryLazy :version :2.0.0 : config} |