diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lvim/config/settings.lua | 3 | ||||
| -rw-r--r-- | lua/lvim/core/nvimtree.lua | 47 | ||||
| -rw-r--r-- | lua/lvim/core/telescope.lua | 20 | ||||
| -rw-r--r-- | lua/lvim/core/telescope/custom-finders.lua | 4 | ||||
| -rw-r--r-- | lua/lvim/lsp/config.lua | 1 | ||||
| -rw-r--r-- | lua/lvim/lsp/init.lua | 5 | ||||
| -rw-r--r-- | lua/lvim/plugins.lua | 48 |
7 files changed, 81 insertions, 47 deletions
diff --git a/lua/lvim/config/settings.lua b/lua/lvim/config/settings.lua index 3f850b85..2f47a2dc 100644 --- a/lua/lvim/config/settings.lua +++ b/lua/lvim/config/settings.lua @@ -51,7 +51,8 @@ M.load_default_options = function() } --- SETTINGS --- - vim.opt.shortmess:append "c" + vim.opt.shortmess:append "c" -- don't show redundant messages from ins-completion-menu + vim.opt.shortmess:append "I" -- don't show the default intro message vim.opt.whichwrap:append "<,>,[,],h,l" for k, v in pairs(default_options) do diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua index 17b8f36a..6b6997ca 100644 --- a/lua/lvim/core/nvimtree.lua +++ b/lua/lvim/core/nvimtree.lua @@ -9,11 +9,18 @@ function M.config() disable_netrw = true, hijack_netrw = true, open_on_setup = false, + ignore_buffer_on_setup = false, ignore_ft_on_setup = { "startify", "dashboard", "alpha", }, + auto_reload_on_write = true, + hijack_unnamed_buffer_when_opening = false, + hijack_directories = { + enable = true, + auto_open = true, + }, update_to_buf_dir = { enable = true, auto_open = true, @@ -67,17 +74,27 @@ function M.config() cmd = "trash", require_confirm = true, }, + actions = { + change_dir = { + global = false, + }, + open_file = { + quit_on_open = false, + }, + window_picker = { + enable = false, + chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", + exclude = {}, + }, + }, }, show_icons = { git = 1, folders = 1, files = 1, folder_arrows = 1, - tree_width = 30, }, - quit_on_open = 0, git_hl = 1, - disable_window_picker = 0, root_folder_modifier = ":t", icons = { default = "", @@ -118,21 +135,25 @@ function M.setup() if lvim.builtin.project.active then lvim.builtin.nvimtree.respect_buf_cwd = 1 lvim.builtin.nvimtree.setup.update_cwd = true - lvim.builtin.nvimtree.setup.disable_netrw = false - lvim.builtin.nvimtree.setup.hijack_netrw = false - vim.g.netrw_banner = false + lvim.builtin.nvimtree.setup.update_focused_file = { enable = true, update_cwd = true } + end + + local function telescope_find_files(_) + require("lvim.core.nvimtree").start_telescope "find_files" + end + local function telescope_live_grep(_) + require("lvim.core.nvimtree").start_telescope "live_grep" end -- Add useful keymaps - local tree_cb = nvim_tree_config.nvim_tree_callback if #lvim.builtin.nvimtree.setup.view.mappings.list == 0 then lvim.builtin.nvimtree.setup.view.mappings.list = { - { key = { "l", "<CR>", "o" }, cb = tree_cb "edit" }, - { key = "h", cb = tree_cb "close_node" }, - { key = "v", cb = tree_cb "vsplit" }, - { key = "C", cb = tree_cb "cd" }, - { key = "gtf", cb = "<cmd>lua require'lvim.core.nvimtree'.start_telescope('find_files')<cr>" }, - { key = "gtg", cb = "<cmd>lua require'lvim.core.nvimtree'.start_telescope('live_grep')<cr>" }, + { key = { "l", "<CR>", "o" }, action = "edit", mode = "n" }, + { key = "h", action = "close_node" }, + { key = "v", action = "vsplit" }, + { key = "C", action = "cd" }, + { key = "gtf", action = "telescope_find_files", action_cb = telescope_find_files }, + { key = "gtg", action = "telescope_live_grep", action_cb = telescope_live_grep }, } end diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua index 2c9ef1e7..11a9655d 100644 --- a/lua/lvim/core/telescope.lua +++ b/lua/lvim/core/telescope.lua @@ -25,7 +25,15 @@ function M.config() layout_config = { width = 0.75, preview_cutoff = 120, - horizontal = { mirror = false }, + horizontal = { + preview_width = function(_, cols, _) + if cols < 120 then + return math.floor(cols * 0.5) + end + return math.floor(cols * 0.6) + end, + mirror = false, + }, vertical = { mirror = false }, }, vimgrep_arguments = { @@ -91,11 +99,7 @@ function M.code_actions() width = 80, height = 12, }, - borderchars = { - prompt = { "─", "│", " ", "│", "â•", "â•®", "│", "│" }, - results = { "─", "│", "─", "│", "├", "┤", "╯", "â•°" }, - preview = { "─", "│", "─", "│", "â•", "â•®", "╯", "â•°" }, - }, + borderchars = lvim.builtin.telescope.defaults.borderchars, border = {}, previewer = false, shorten_path = false, @@ -149,7 +153,9 @@ function M.setup() end if lvim.builtin.telescope.extensions and lvim.builtin.telescope.extensions.fzf then - require("telescope").load_extension "fzf" + pcall(function() + require("telescope").load_extension "fzf" + end) end end diff --git a/lua/lvim/core/telescope/custom-finders.lua b/lua/lvim/core/telescope/custom-finders.lua index 18307fbd..b0ee1c07 100644 --- a/lua/lvim/core/telescope/custom-finders.lua +++ b/lua/lvim/core/telescope/custom-finders.lua @@ -50,7 +50,9 @@ local copy_to_clipboard_action = function(prompt_bufnr) end function M.view_lunarvim_changelog() - local opts = themes.get_ivy { cwd = get_lvim_base_dir() } + local opts = themes.get_ivy { + cwd = get_lvim_base_dir(), + } opts.entry_maker = make_entry.gen_from_git_commits(opts) pickers.new(opts, { diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua index 4feb64a9..72a1941f 100644 --- a/lua/lvim/lsp/config.lua +++ b/lua/lvim/lsp/config.lua @@ -78,6 +78,7 @@ return { "graphql", "jedi_language_server", "ltex", + "ocamllsp", "phpactor", "psalm", "pylsp", diff --git a/lua/lvim/lsp/init.lua b/lua/lvim/lsp/init.lua index 308eba1d..0d2e79a2 100644 --- a/lua/lvim/lsp/init.lua +++ b/lua/lvim/lsp/init.lua @@ -144,7 +144,10 @@ function M.setup() require("lvim.lsp.templates").generate_templates() end - bootstrap_nlsp { config_home = utils.join_paths(get_config_dir(), "lsp-settings") } + bootstrap_nlsp { + config_home = utils.join_paths(get_config_dir(), "lsp-settings"), + append_default_schemas = true, + } require("lvim.lsp.null-ls").setup() diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index f4c2b05a..bd788f1d 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -1,39 +1,39 @@ local commit = { - bufferline = "e97a404bd7449ecebab243c796c1016c98397fc0", - cmp_buffer = "f83773e2f433a923997c5faad7ea689ec24d1785", + bufferline = "871495d9e2dbe3314a421fd2d5e46f47de7ee537", + cmp_buffer = "d66c4c2d376e5be99db68d2362cd94d250987525", cmp_luasnip = "d6f837f4e8fe48eeae288e638691b91b97d1737f", cmp_nvim_lsp = "ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba", cmp_path = "466b6b8270f7ba89abd59f402c73f63c7331ff6e", - comment = "18a8dc0bbdfc089d5f5a850e4640d8e75381c598", + comment = "00ed8f612b7bcbaf9df870781ed372ee8c00d6a8", dapinstall = "24923c3819a450a772bb8f675926d530e829665f", dashboard_nvim = "d82ddae95fd4dc4c3b7bbe87f09b1840fbf20ecb", fixcursorhold = "1bfb32e7ba1344925ad815cb0d7f901dbc0ff7c1", - friendly_snippets = "2e575549910571ff5abb6b02178c69ad760a4e00", - gitsigns = "1d1f043acf025f919b8dd12bb672569109c7f099", + friendly_snippets = "ad07b2844021b20797adda5b483265802559a693", + gitsigns = "779f4eb59047ef7faa41e71d261d041edfabfb39", lua_dev = "a0ee77789d9948adce64d98700cc90cecaef88d5", - lualine = "40849728b6c9b3389c7b54739f426f9899b53778", - luasnip = "c1d07078dce0c9631e89a299e4b4a93334650a7b", - nlsp_settings = "80cb4d3051366afb019ddabe619b6eb967c82f63", - null_ls = "3059dc761b27c4c836f88879c460cd7a989caa47", - nvim_autopairs = "784398a8f184431fd4329f20b0e4f52e87707bbd", - nvim_cmp = "13d64460cba64950aff41e230cc801225bd9a3e2", - nvim_dap = "9fcff6e02e1a549d47a2c559a4b833798537c0bc", - nvim_lsp_installer = "c95ffd31428da0abaffa2459c0231fa9971fcbaa", - nvim_lspconfig = "19a21d5a8681f721c584125a920d4cbeda1c80cc", - nvim_notify = "8038d04d5371e49cf15728ae98cc6bff655b923b", - nvim_tree = "2e1f82d8c0c57cbc2bfdc041a3aff26947559a1e", - nvim_treesitter = "2298a7584414af40a6a09cbe72a81175382992c7", + lualine = "d2e0ac595b8e315b454f4384edb2eba7807a8401", + luasnip = "3d544b66c0ded7c01151559a83bd3ff9be6a40e8", + nlsp_settings = "61d95800be78ecea8e16297f36fef52c412d3602", + null_ls = "15d3aabc2b440293ecf6c85f25ca9fa645a468ae", + nvim_autopairs = "d2cde7c5802b34d6391a8a3555a3b7b56482f2aa", + nvim_cmp = "1001683bee3a52a7b7e07ba9d391472961739c7b", + nvim_dap = "edb22a824e33f5244c98dbaa91f749f0d6390a94", + nvim_lsp_installer = "6e6d75b7a446a13ec2bdaaf7934c071936ad3d8c", + nvim_lspconfig = "cf2fc1d5149dc097e8c02c607f0f0c97c5099ae8", + nvim_notify = "f81b48d298c0ff7479b66568d9cc1a4794c196d0", + nvim_tree = "ac858a28a2ca673bbca74af005442e58e015f19e", + nvim_treesitter = "cada76c4901e2389c0f82ac11d0c9c61d5205e90", nvim_ts_context_commentstring = "097df33c9ef5bbd3828105e4bee99965b758dc3f", - nvim_web_devicons = "e3294f687626b40754bb40ac2d636d166098b2fb", - packer = "963cb58c3dd15699c801baf3e64393c6795b62e9", - plenary = "66472128c3191b786966798fc956a689705ab1be", + nvim_web_devicons = "4415d1aaa56f73b9c05795af84d625c610b05d3b", + packer = "c576ab3f1488ee86d60fd340d01ade08dcabd256", + plenary = "14dfb4071022b22e08384ee125a5607464b6d397", popup = "b7404d35d5d3548a82149238289fa71f7f6de4ac", project = "cef52b8da07648b750d7f1e8fb93f12cb9482988", - schemastore = "c0c11c832fa812174cd196c723b97c493f528b5c", + schemastore = "120e95a9e3d60a7410adb1be102268091ed400fb", structlog = "6f1403a192791ff1fa7ac845a73de9e860f781f1", - telescope = "df0b35c8bc0944164828ccba8ea17941423c6725", - telescope_fzf_native = "b8662b076175e75e6497c59f3e2799b879d7b954", - toggleterm = "f9845199f1d647890ca47f6185f7ac935991b442", + telescope = "b501d9ecb7d8181e2238620c919740025e8b2096", + telescope_fzf_native = "8ec164b541327202e5e74f99bcc5fe5845720e18", + toggleterm = "e97d0c1046512e975a9f3fa95afe98f312752b1c", which_key = "28d2bd129575b5e9ebddd88506601290bb2bb221", } |