From ffcfdf43062dd4a3a72eda4a657448354ec55262 Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Wed, 23 Feb 2022 14:29:09 +0330 Subject: refactor(nvim-tree): update settings structure (#2304) --- lua/lvim/core/nvimtree.lua | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) (limited to 'lua/lvim/core') diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua index 17b8f36a..8e40bb8c 100644 --- a/lua/lvim/core/nvimtree.lua +++ b/lua/lvim/core/nvimtree.lua @@ -14,6 +14,12 @@ function M.config() "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 +73,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 +134,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", "", "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 = "lua require'lvim.core.nvimtree'.start_telescope('find_files')" }, - { key = "gtg", cb = "lua require'lvim.core.nvimtree'.start_telescope('live_grep')" }, + { key = { "l", "", "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 -- cgit v1.2.3 From 2a9f9998aca359a41eefe3a1c429d049a5a1806b Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Sun, 27 Feb 2022 15:49:17 +0330 Subject: chore(plugins): bump version (#2315) --- lua/lvim/core/telescope.lua | 16 ++++++++++------ lua/lvim/core/telescope/custom-finders.lua | 4 +++- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'lua/lvim/core') diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua index 2c9ef1e7..0d9c1207 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, 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, { -- cgit v1.2.3 From c12338393ef70b338724244de1dad88538f8a36a Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Wed, 2 Mar 2022 17:36:06 +0330 Subject: chore(plugins): bump version (#2321) --- lua/lvim/core/nvimtree.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'lua/lvim/core') diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua index 8e40bb8c..6b6997ca 100644 --- a/lua/lvim/core/nvimtree.lua +++ b/lua/lvim/core/nvimtree.lua @@ -9,6 +9,7 @@ function M.config() disable_netrw = true, hijack_netrw = true, open_on_setup = false, + ignore_buffer_on_setup = false, ignore_ft_on_setup = { "startify", "dashboard", -- cgit v1.2.3 From 4c705bc07d7e0510e88d9ce95e45999e95719144 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Thu, 10 Mar 2022 09:54:38 +0100 Subject: feat(windows): add custom config_win.example.lua (#2330) --- lua/lvim/core/telescope.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lua/lvim/core') diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua index 0d9c1207..11a9655d 100644 --- a/lua/lvim/core/telescope.lua +++ b/lua/lvim/core/telescope.lua @@ -153,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 -- cgit v1.2.3