diff options
| author | 2025-04-02 13:55:07 +0200 | |
|---|---|---|
| committer | 2025-04-02 13:55:07 +0200 | |
| commit | d2f4d5dec7eededffc956fe6745139d98d695509 (patch) | |
| tree | acd79555cdd16ae02794ce8b36bd0f153ee9d6b9 /dot_config/nvim/lua/plugins | |
| parent | nvim/conjure: move fennel support to nfnl (diff) | |
nvim: upgrade configs for v0.11
Bunch of stuff bundled with it.
`lsp/` subject to changes.
Diffstat (limited to '')
| -rw-r--r-- | dot_config/nvim/lua/plugins/flash.lua | 11 | ||||
| -rw-r--r-- | dot_config/nvim/lua/plugins/init.lua | 2 | ||||
| -rw-r--r-- | dot_config/nvim/lua/plugins/langs.lua | 2 | ||||
| -rw-r--r-- | dot_config/nvim/lua/plugins/lsp.lua | 45 | ||||
| -rw-r--r-- | dot_config/nvim/lua/plugins/mini.lua | 2 |
5 files changed, 10 insertions, 52 deletions
diff --git a/dot_config/nvim/lua/plugins/flash.lua b/dot_config/nvim/lua/plugins/flash.lua index 3a8feea..674dfe6 100644 --- a/dot_config/nvim/lua/plugins/flash.lua +++ b/dot_config/nvim/lua/plugins/flash.lua @@ -3,15 +3,18 @@ local function _1_() return require("flash").jump() end local function _2_() - return require("flash").treesitter() + return require("flash").jump() end local function _3_() - return require("flash").remote() + return require("flash").treesitter() end local function _4_() - return require("flash").treesitter_search() + return require("flash").remote() end local function _5_() + return require("flash").treesitter_search() +end +local function _6_() return require("flash").toggle() end -return {{"folke/flash.nvim", event = "VeryLazy", keys = {{"s", _1_, desc = "Flash", mode = {"n", "x", "o"}}, {"S", _2_, desc = "Flash Treesitter", mode = {"n", "x", "o"}}, {"r", _3_, desc = "Remote Flash", mode = "o"}, {"R", _4_, desc = "Flash Treesitter Search", mode = {"o", "x"}}, {"<c-s>", _5_, desc = "Toggle Flash Search", mode = "c"}}, opts = {modes = {search = {enabled = false}}}}} +return {{"folke/flash.nvim", event = "VeryLazy", keys = {{"<cr>", _1_, desc = "Flash", mode = {"n", "x", "o"}}, {"s", _2_, desc = "Flash", mode = {"n", "x", "o"}}, {"S", _3_, desc = "Flash Treesitter", mode = {"n", "x", "o"}}, {"r", _4_, desc = "Remote Flash", mode = "o"}, {"R", _5_, desc = "Flash Treesitter Search", mode = {"o", "x"}}, {"<c-s>", _6_, desc = "Toggle Flash Search", mode = "c"}}, opts = {modes = {search = {enabled = false}}}}} diff --git a/dot_config/nvim/lua/plugins/init.lua b/dot_config/nvim/lua/plugins/init.lua index 654e7c3..7b014e4 100644 --- a/dot_config/nvim/lua/plugins/init.lua +++ b/dot_config/nvim/lua/plugins/init.lua @@ -6,4 +6,4 @@ local function _1_(_, opts) end return nil end -return {{"folke/lazy.nvim", version = false}, {"Olical/nfnl", ft = "fennel"}, {"stevearc/dressing.nvim", opts = {}}, {"Olical/conjure", branch = "main", config = _1_, ft = conjureft, opts = {["mapping#prefix"] = "<localleader>e", ["extract#tree_sitter#enabled"] = true, filetypes = conjureft, ["filetype#janet"] = "conjure.client.janet.stdio"}}, {"tpope/vim-repeat"}} +return {{"folke/lazy.nvim", version = false}, {"folke/snacks.nvim", lazy = false, opts = {indent = {enabled = true, scope = {enabled = false}}, input = {enabled = true}, quickfile = {enabled = true}}, priority = 1000}, {"Olical/nfnl", ft = "fennel"}, {"Olical/conjure", branch = "main", config = _1_, ft = conjureft, opts = {["mapping#prefix"] = "<localleader>e", ["extract#tree_sitter#enabled"] = true, filetypes = conjureft, ["filetype#janet"] = "conjure.client.janet.stdio"}}, {"tpope/vim-repeat"}} diff --git a/dot_config/nvim/lua/plugins/langs.lua b/dot_config/nvim/lua/plugins/langs.lua index 84dea21..981113b 100644 --- a/dot_config/nvim/lua/plugins/langs.lua +++ b/dot_config/nvim/lua/plugins/langs.lua @@ -1,3 +1,3 @@ -- [nfnl] Compiled from fnl/plugins/langs.fnl by https://github.com/Olical/nfnl, do not edit. local lisps = {"clojure", "fennel", "janet", "scm"} -return {{"nvim-treesitter/nvim-treesitter", build = ":TSUpdate", dependnecies = {"nvim-treesitter/nvim-treesitter-textobjects"}, main = "nvim-treesitter.configs", opts = {ensure_installed = "all", ignore_install = {"norg"}, sync_install = "true", highlight = {enable = true, disable = {"markdown"}, additional_vim_regex_highlighting = {"markdown"}}}, version = false}, {"janet-lang/janet.vim", ft = "janet"}, {"preservim/vim-markdown", dependencies = {"godlygeek/tabular"}, ft = "markdown", version = false}, {"gpanders/nvim-parinfer", ft = lisps}, {"julienvincent/nvim-paredit", config = {indent = {enabled = true}}, ft = lisps}} +return {{"nvim-treesitter/nvim-treesitter", build = ":TSUpdate", dependnecies = {"nvim-treesitter/nvim-treesitter-textobjects"}, main = "nvim-treesitter.configs", opts = {ensure_installed = "all", ignore_install = {"norg"}, sync_install = "true", highlight = {enable = true, disable = {"markdown"}, additional_vim_regex_highlighting = {"markdown"}}}, version = false}, {"janet-lang/janet.vim", ft = "janet"}, {"preservim/vim-markdown", dependencies = {"godlygeek/tabular"}, ft = "markdown", version = false}, {"Apeiros-46B/uiua.vim", ft = "uiua"}, {"gpanders/nvim-parinfer", ft = lisps}, {"julienvincent/nvim-paredit", config = {indent = {enabled = true}}, ft = lisps}} diff --git a/dot_config/nvim/lua/plugins/lsp.lua b/dot_config/nvim/lua/plugins/lsp.lua deleted file mode 100644 index 1b32180..0000000 --- a/dot_config/nvim/lua/plugins/lsp.lua +++ /dev/null @@ -1,45 +0,0 @@ --- [nfnl] Compiled from fnl/plugins/lsp.fnl by https://github.com/Olical/nfnl, do not edit. -local _local_1_ = require("toast.core") -local assoc = _local_1_["assoc"] -local map = _local_1_["map"] -local _local_2_ = require("toast.table") -local insert = _local_2_["insert"] -local _local_3_ = require("toast.nvim") -local executable_3f = _local_3_["executable?"] -local function gopts(plist) - return {basedpyright = {}, clangd = {}, clojure_lsp = {root_dir = plist("project.clj", "deps.edn", "bb.edn", "build.boot", "shadow-cljs.edn", ".git")}, denols = {root_dir = plist("deno.json", "deno.jsonc"), autostart = false}, gopls = {}, ltex = {}, lua_ls = {}, ruff = {cmd = {"ruff", "server", "--preview"}}, texlab = {filetypes = {"tex", "plaintex", "bib", "latex"}}, ts_ls = {root_dir = plist("tsconfig.json", "jsconfig.json", "package.json"), autostart = false}, zls = {}} -end -local function attach(c, b) - local lsp = vim.lsp - local lbf = lsp.buf - local ll = {{"", group = "+lsp"}, {"w", group = "+workspace"}, {"D", lbf.declaration, desc = "goto declaration"}, {"d", lbf.definition, desc = "goto definition"}, {"k", lbf.hover, desc = "hover"}, {"K", lbf.signature_help, desc = "signature help"}, {"i", lbf.implementation, desc = "goto implementation"}, {"t", lbf.type_definition, desc = "goto type definition"}, {"r", lbf.rename, desc = "rename"}, {"c", lbf.code_action, desc = "code action"}, {"R", lbf.reference, desc = "list references"}} - local ll0 - local function _4_(_241) - return assoc(_241, 1, ("<localleader><localleader>" .. _241[1])) - end - ll0 = map(_4_, ll) - vim.api.nvim_buf_set_option(b, "omnifunc", "v:lua.vim.lsp.omnifunc") - local function _5_() - return vim.lsp.buf.format({async = true}) - end - return require("which-key").add({insert(ll0, {"<leader>F", _5_, desc = "run format"}), buffer = b}) -end -local function _6_(_, opts) - for k, v in pairs(opts) do - local s = require("lspconfig")[k] - local c = (v.cmd or s.document_config.default_config.cmd) - local att = (v.on_attach or attach) - if executable_3f(c[1]) then - s.setup(assoc(v, "on_attach", att)) - else - end - end - return nil -end -local function _8_() - local function _9_(...) - return require("lspconfig.util").root_pattern(...) - end - return gopts(_9_) -end -return {{"neovim/nvim-lspconfig", config = _6_, opts = _8_}} diff --git a/dot_config/nvim/lua/plugins/mini.lua b/dot_config/nvim/lua/plugins/mini.lua index cc358db..5c5430d 100644 --- a/dot_config/nvim/lua/plugins/mini.lua +++ b/dot_config/nvim/lua/plugins/mini.lua @@ -5,4 +5,4 @@ local function _1_(_, opts) end return nil end -return {{"echasnovski/mini.nvim", config = _1_, opts = {ai = {}, align = {}, basics = {}, bracketed = {indent = {options = {change_type = "diff"}}}, comment = {}, completion = {}, cursorword = {}, indentscope = {}, move = {}, splitjoin = {}, statusline = {}, tabline = {}, trailspace = {}}, version = false}} +return {{"echasnovski/mini.nvim", config = _1_, opts = {ai = {}, align = {}, basics = {}, bracketed = {indent = {options = {change_type = "diff"}}}, comment = {}, completion = {}, cursorword = {}, move = {}, splitjoin = {}, statusline = {}, tabline = {}, trailspace = {}}, version = false}} |
