diff --git a/lua/core/lsp/init.lua b/lua/core/lsp/init.lua index 02d2204..30de1e5 100644 --- a/lua/core/lsp/init.lua +++ b/lua/core/lsp/init.lua @@ -25,6 +25,11 @@ vim.api.nvim_create_autocmd("LspAttach", { callback = function(ev) if vim.fn.has("nvim-0.11") == 1 then vim.lsp.completion.enable(true, ev.data.client_id, ev.buf, { autotrigger = false }) + else + vim.keymap.set("i", "", vim.lsp.buf.signature_help, { buffer = ev.buf }) + vim.keymap.set("n", "gra", vim.lsp.buf.code_action, { buffer = ev.buf }) + vim.keymap.set("n", "grr", vim.lsp.buf.references, { buffer = ev.buf }) + vim.keymap.set("n", "grn", vim.lsp.buf.rename, { buffer = ev.buf }) end end, }) diff --git a/lua/core/options.lua b/lua/core/options.lua index b7b87cb..1cb38b3 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -39,6 +39,8 @@ vim.o.foldcolumn = "0" vim.o.foldenable = true vim.o.foldlevel = 99 vim.o.foldlevelstart = 99 +vim.o.foldmethod = "expr" +vim.o.foldexpr = "v:lua.vim.treesitter.foldexpr()" vim.o.formatexpr = "v:lua.require'conform'.formatexpr()" vim.o.formatoptions = "jcrqlnt" if vim.fn.executable("rg") ~= 0 then diff --git a/lua/plugins/nvim-ufo.lua b/lua/plugins/nvim-ufo.lua index 8be0eb7..20a0a4d 100644 --- a/lua/plugins/nvim-ufo.lua +++ b/lua/plugins/nvim-ufo.lua @@ -1,3 +1,4 @@ +vim.o.foldmethod = "manual" ---@diagnostic disable-next-line: missing-fields require("ufo").setup({ provider_selector = function(_bufnr, _filetype, _buftype) diff --git a/rocks.toml b/rocks.toml index d87c69e..d96a48e 100644 --- a/rocks.toml +++ b/rocks.toml @@ -15,11 +15,12 @@ nvim-nio = "1.10.0" # If the plugin name contains a dot then you must add quotes to the key name! [plugins] "rocks.nvim" = "2.40.0" -"rocks-git.nvim" = "2.0.1" -"rocks-dev.nvim" = "1.5.0" +"rocks-git.nvim" = "2.2.0" +"rocks-dev.nvim" = "1.7.0" "rocks-config.nvim" = "2.2.0" "rocks-edit.nvim" = "scm" -"rocks-treesitter.nvim" = "1.1.1" +"rocks-treesitter.nvim" = "1.1.2" + # harpoon uses plenary.nvim "plenary.nvim" = "scm" nvim-lspconfig = "0.1.8" @@ -32,10 +33,10 @@ neogit = "scm" "kanagawa.nvim" = "scm" "mini.ai" = "scm" nvim-surround = "2.1.5" -nvim-treesitter-legacy-api = "0.9.2" -fzf-lua = "0.0.1450" +# nvim-treesitter-legacy-api = "0.9.2" +fzf-lua = "0.0.1454" "quicker.nvim" = "1.1.1" -nvim-ufo = "1.4.0" +# nvim-ufo = "1.4.0" "telescope.nvim" = "scm" "octo.nvim" = "scm" "oil.nvim" = "2.12.1" @@ -44,12 +45,12 @@ treesj = "scm" "lazydev.nvim" = "1.8.0" tree-sitter-css = "0.0.3" -tree-sitter-ecma = "0.0.2" +tree-sitter-ecma = "scm" tree-sitter-go = "0.0.3" tree-sitter-html = "0.0.3" tree-sitter-javascript = "0.0.3" tree-sitter-json = "0.0.3" -tree-sitter-jsx = "0.0.2" +tree-sitter-jsx = "scm" tree-sitter-lua = "0.0.2" tree-sitter-make = "0.0.2" tree-sitter-query = "0.0.2" @@ -66,17 +67,17 @@ tree-sitter-yaml = "0.0.2" # nvim-treesitter-textobjects = { dir = "~/repo/nvim-treesitter-textobjects" } tree-sitter-gomod = "0.0.3" tree-sitter-dockerfile = "0.0.2" -tree-sitter-regex = "0.0.2" +tree-sitter-regex = "0.0.3" tree-sitter-gitignore = "0.0.2" tree-sitter-swift = "0.0.3" tree-sitter-kotlin = "0.0.4" tree-sitter-groovy = "0.0.3" -tree-sitter-ini = "0.0.2" +tree-sitter-ini = "0.0.3" tree-sitter-vimdoc = "0.0.2" tree-sitter-tmux = "0.0.3" tree-sitter-astro = "0.0.2" tree-sitter-jsonc = "0.0.2" -tree-sitter-html_tags = "0.0.2" +tree-sitter-html_tags = "scm" tree-sitter-editorconfig = "0.0.4" tree-sitter-gitattributes = "0.0.2" tree-sitter-graphql = "0.0.2" @@ -111,7 +112,7 @@ rev = "c099aecaf858574909bd38cbadb8543c4dd16611" [plugins."kulala.nvim"] git = "mistweaverco/kulala.nvim" -rev = "v3.5.0" +rev = "v3.7.0" [plugins.github-nvim-theme] git = "projekt0n/github-nvim-theme"