diff options
Diffstat (limited to 'lua/lvim')
| -rw-r--r-- | lua/lvim/core/nvimtree.lua | 68 | ||||
| -rw-r--r-- | lua/lvim/lsp/config.lua | 6 | ||||
| -rw-r--r-- | lua/lvim/plugins.lua | 38 |
3 files changed, 60 insertions, 52 deletions
diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua index cb91e344..287791b8 100644 --- a/lua/lvim/core/nvimtree.lua +++ b/lua/lvim/core/nvimtree.lua @@ -18,7 +18,7 @@ function M.config() enable = true, auto_open = true, }, - auto_close = true, + auto_close = false, open_on_tab = false, hijack_cursor = false, update_cwd = false, @@ -42,24 +42,30 @@ function M.config() }, git = { enable = true, - ignore = true, + ignore = false, timeout = 200, }, view = { width = 30, height = 30, + hide_root_folder = false, side = "left", - auto_resize = true, - number = false, - relativenumber = false, + auto_resize = false, mappings = { custom_only = false, list = {}, }, + number = false, + relativenumber = false, + signcolumn = "yes", }, filters = { dotfiles = false, - custom = { ".git", "node_modules", ".cache" }, + custom = { "node_modules", ".cache" }, + }, + trash = { + cmd = "trash", + require_confirm = true, }, }, show_icons = { @@ -130,41 +136,39 @@ function M.setup() } end - -- Add nvim_tree open callback - local tree_view = require "nvim-tree.view" - local open = tree_view.open - tree_view.open = function() - M.on_open() - open() + local function on_open() + if package.loaded["bufferline.state"] and lvim.builtin.nvimtree.setup.view.side == "left" then + require("bufferline.state").set_offset(lvim.builtin.nvimtree.setup.view.width + 1, "") + end end - vim.cmd "au WinClosed * lua require('lvim.core.nvimtree').on_close()" - - if lvim.builtin.nvimtree.on_config_done then - lvim.builtin.nvimtree.on_config_done(nvim_tree_config) + local function on_close() + local bufnr = vim.api.nvim_get_current_buf() + local ft = vim.api.nvim_buf_get_option(bufnr, "filetype") + if ft == "NvimTree" and package.loaded["bufferline.state"] then + require("bufferline.state").set_offset(0) + end end - require("nvim-tree").setup(lvim.builtin.nvimtree.setup) -end -function M.on_open() - if package.loaded["bufferline.state"] and lvim.builtin.nvimtree.setup.view.side == "left" then - require("bufferline.state").set_offset(lvim.builtin.nvimtree.setup.view.width + 1, "") + local tree_view = require "nvim-tree.view" + local default_open = tree_view.open + local default_close = tree_view.close + + tree_view.open = function() + on_open() + default_open() end -end -function M.on_close() - local buf = tonumber(vim.fn.expand "<abuf>") - local ft = vim.api.nvim_buf_get_option(buf, "filetype") - if ft == "NvimTree" and package.loaded["bufferline.state"] then - require("bufferline.state").set_offset(0) + tree_view.close = function() + on_close() + default_close() end -end -function M.change_tree_dir(dir) - local lib_status_ok, lib = pcall(require, "nvim-tree.lib") - if lib_status_ok then - lib.change_dir(dir) + if lvim.builtin.nvimtree.on_config_done then + lvim.builtin.nvimtree.on_config_done(nvim_tree_config) end + + require("nvim-tree").setup(lvim.builtin.nvimtree.setup) end function M.start_telescope(telescope_mode) diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua index 64cf52f0..b45142f5 100644 --- a/lua/lvim/lsp/config.lua +++ b/lua/lvim/lsp/config.lua @@ -23,8 +23,9 @@ return { prefix = "", format = function(d) local t = vim.deepcopy(d) - if d.code then - t.message = string.format("%s [%s]", t.message, t.code):gsub("1. ", "") + local code = d.code or d.user_data.lsp.code + if code then + t.message = string.format("%s [%s]", t.message, code):gsub("1. ", "") end return t.message end, @@ -77,6 +78,7 @@ return { "jedi_language_server", "ltex", "phpactor", + "psalm", "pylsp", "quick_lint_js", "remark_ls", diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 853869b1..023816f0 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -2,27 +2,27 @@ local commit = { barbar = "6e638309efcad2f308eb9c5eaccf6f62b794bbab", cmp_buffer = "f83773e2f433a923997c5faad7ea689ec24d1785", cmp_luasnip = "d6f837f4e8fe48eeae288e638691b91b97d1737f", - cmp_nvim_lsp = "b4251f0fca1daeb6db5d60a23ca81507acf858c2", - cmp_path = "4d58224e315426e5ac4c5b218ca86cab85f80c79", + cmp_nvim_lsp = "ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba", + cmp_path = "c5230cb439df9547294678d0f1c1465ad7989e5f", comment = "90df2f87c0b17193d073d1f72cea2e528e5b162d", dapinstall = "568d946a99edb6780912cb39ca68c368516cd853", dashboard_nvim = "d82ddae95fd4dc4c3b7bbe87f09b1840fbf20ecb", fixcursorhold = "0e4e22d21975da60b0fd2d302285b3b603f9f71e", - friendly_snippets = "9f04462bcabfd108341a6e47ed742b09a6a5b975", - gitsigns = "7aad5257fa043b9acf3d40ae064a1685003254da", + friendly_snippets = "d4f5c0507cfe4c67024f58c84ba982f7f5c71a7a", + gitsigns = "f4648dcc055a10573f36e83343592824155ab466", lua_dev = "03a44ec6a54b0a025a633978e8541584a02e46d9", - lualine = "bc5c2f5658821f98e55013eb3bec9d540c420470", - luasnip = "79662d8bb61bbee6af88bf559d9ed41c28eb5b88", - nlsp_settings = "1d74d46627204bb9bc32787b6d1360874ce9ae1d", - null_ls = "288c4582f62f04944412acaed098fc16a1818464", - nvim_autopairs = "c027bbb7eb417ad0be7d5263b66c1638e971e36b", - nvim_cmp = "ce0a3581e0fa6e3072bf06a97919d3e214ff00e6", - nvim_dap = "3499eb4368fa5835de761b4f6cd53f7bf0bd02f7", - nvim_lsp_installer = "a744a2a1c7fb9830b156a57a1327a6593f9b5bf8", - nvim_lspconfig = "2c70b7b0095b4bbe55aaf0dc27a2581d1cafe491", + lualine = "70691ae350fdbe1f15758e3b8e2973742a7967a9", + luasnip = "0222ee63c9e4b80e6000d064f8efd8edcc6d0c48", + nlsp_settings = "3a3942b5d1da30e3ca0dc431aada3191c5952054", + null_ls = "afd9a999fa29077e12b7284cf11dff37972fbce5", + nvim_autopairs = "97e454ce9b1371373105716d196c1017394bc947", + nvim_cmp = "4c0a6512a0f8a235213959badf70031b9fa0220a", + nvim_dap = "08349ab5da2148965deb2e778065017059bff584", + nvim_lsp_installer = "9894db12783fdd02be909cdd60e6d0fc20b9e46e", + nvim_lspconfig = "09130804eb27fd31539922967d14c28388765ae4", nvim_notify = "15f52efacd169ea26b0f4070451d3ea53f98cd5a", nvim_tree = "0a2f6b0b6ba558a88c77a6b262af647760e6eca8", - nvim_treesitter = "ed6143940c37c5c18625d46c071563a3b4338e72", + nvim_treesitter = "723d91e8217ae66ea75f809f404d801ed939f497", nvim_ts_context_commentstring = "097df33c9ef5bbd3828105e4bee99965b758dc3f", nvim_web_devicons = "ac71ca88b1136e1ecb2aefef4948130f31aa40d1", packer = "851c62c5ecd3b5adc91665feda8f977e104162a5", @@ -30,9 +30,9 @@ local commit = { popup = "b7404d35d5d3548a82149238289fa71f7f6de4ac", project = "71d0e23dcfc43cfd6bb2a97dc5a7de1ab47a6538", structlog = "6f1403a192791ff1fa7ac845a73de9e860f781f1", - telescope = "015a35626d5a293dc9c19dc2bb301f25850961f6", + telescope = "0011b1148d3975600f5a9f0be8058cdaac4e30d9", telescope_fzf_native = "b8662b076175e75e6497c59f3e2799b879d7b954", - toggleterm = "463843d1ba0288eedaf834872c3eca114d45bddf", + toggleterm = "f23866b8fbb0703be4e15d50c814ffe496242a67", which_key = "387fd676d3f9b419d38890820f6e262dc0fadb46", } @@ -120,9 +120,11 @@ return { commit = commit.cmp_path, }, { - "folke/lua-dev.nvim", + -- "folke/lua-dev.nvim", + "kylo252/lua-dev.nvim", + branch = "fix-on-new-config", module = "lua-dev", - commit = commit.lua_dev, + -- commit = commit.lua_dev, }, -- Autopairs |