feat(nvim): update neo-tree to v3 and add nesting rules

This commit is contained in:
Bruno Carlin 2024-04-20 17:16:04 +02:00
parent b7ba229cf8
commit 00f6d6b3b1
Signed by: bcarlin
GPG key ID: 8E254EA0FFEB9B6D
2 changed files with 176 additions and 159 deletions

View file

@ -19,7 +19,7 @@ return require('packer').startup(function(use)
} }
use { use {
"nvim-neo-tree/neo-tree.nvim", "nvim-neo-tree/neo-tree.nvim",
branch = "v2.x", branch = "v3.x",
requires = { requires = {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
"kyazdani42/nvim-web-devicons", -- not strictly required, but recommended "kyazdani42/nvim-web-devicons", -- not strictly required, but recommended

View file

@ -10,171 +10,188 @@ vim.cmd [[
local config = { local config = {
close_if_last_window = false, -- Close Neo-tree if it is the last window left in the tab close_if_last_window = false, -- Close Neo-tree if it is the last window left in the tab
popup_border_style = "rounded", popup_border_style = "rounded",
enable_git_status = true, enable_git_status = true,
enable_diagnostics = true, enable_diagnostics = true,
default_component_configs = { default_component_configs = {
container = { container = {
enable_character_fade = true enable_character_fade = true
},
indent = {
indent_size = 2,
padding = 1, -- extra padding on left hand side
-- indent guides
with_markers = true,
indent_marker = "",
last_indent_marker = "",
highlight = "NeoTreeIndentMarker",
-- expander config, needed for nesting files
with_expanders = nil, -- if nil and file nesting is enabled, will enable expanders
expander_collapsed = "",
expander_expanded = "",
expander_highlight = "NeoTreeExpander",
},
icon = {
folder_closed = "",
folder_open = "",
folder_empty = "",
-- The next two settings are only a fallback, if you use nvim-web-devicons and configure default icons there
-- then these will never be used.
default = "*",
highlight = "NeoTreeFileIcon"
},
modified = {
symbol = "[+]",
highlight = "NeoTreeModified",
},
name = {
trailing_slash = false,
use_git_status_colors = true,
highlight = "NeoTreeFileName",
},
git_status = {
symbols = {
-- Change type
added = "", -- or "✚", but this is redundant info if you use git_status_colors on the name
modified = "", -- or "", but this is redundant info if you use git_status_colors on the name
deleted = "",-- this can only be used in the git_status source
renamed = "",-- this can only be used in the git_status source
-- Status type
untracked = "",
ignored = "",
unstaged = "",
staged = "",
conflict = "",
}
},
}, },
window = { indent = {
position = "left", indent_size = 2,
width = 40, padding = 1, -- extra padding on left hand side
mapping_options = { -- indent guides
noremap = true, with_markers = true,
nowait = true, indent_marker = "",
}, last_indent_marker = "",
mappings = { highlight = "NeoTreeIndentMarker",
["<space>"] = { -- expander config, needed for nesting files
"toggle_node", with_expanders = nil, -- if nil and file nesting is enabled, will enable expanders
nowait = false, -- disable `nowait` if you have existing combos starting with this char that you want to use expander_collapsed = "",
}, expander_expanded = "",
["<2-LeftMouse>"] = "open", expander_highlight = "NeoTreeExpander",
["<cr>"] = "open",
["S"] = "open_split",
["s"] = "open_vsplit",
-- ["S"] = "split_with_window_picker",
-- ["s"] = "vsplit_with_window_picker",
["t"] = "open_tabnew",
["w"] = "open_with_window_picker",
["C"] = "close_node",
["a"] = {
"add",
-- some commands may take optional config options, see `:h neo-tree-mappings` for details
config = {
show_path = "none" -- "none", "relative", "absolute"
}
},
["A"] = "add_directory", -- also accepts the config.show_path option.
["d"] = "delete",
["r"] = "rename",
["y"] = "copy_to_clipboard",
["x"] = "cut_to_clipboard",
["p"] = "paste_from_clipboard",
["c"] = "copy", -- takes text input for destination
["m"] = "move", -- takes text input for destination
["q"] = "close_window",
["R"] = "refresh",
["?"] = "show_help",
}
}, },
nesting_rules = {}, icon = {
filesystem = { folder_closed = "",
filtered_items = { folder_open = "",
visible = false, -- when true, they will just be displayed differently than normal items folder_empty = "",
hide_dotfiles = false, -- The next two settings are only a fallback, if you use nvim-web-devicons and configure default icons there
hide_gitignored = false, -- then these will never be used.
hide_hidden = true, -- only works on Windows for hidden files/directories default = "*",
hide_by_name = { highlight = "NeoTreeFileIcon"
".git",
},
hide_by_pattern = { -- uses glob style patterns
--"*.meta"
},
never_show = { -- remains hidden even if visible is toggled to true
--".DS_Store",
--"thumbs.db"
},
},
follow_current_file = false, -- This will find and focus the file in the active buffer every
-- time the current file is changed while the tree is open.
group_empty_dirs = false, -- when true, empty folders will be grouped together
hijack_netrw_behavior = "open_default", -- netrw disabled, opening a directory opens neo-tree
-- in whatever position is specified in window.position
-- "open_current", -- netrw disabled, opening a directory opens within the
-- window like netrw would, regardless of window.position
-- "disabled", -- netrw left alone, neo-tree does not handle opening dirs
use_libuv_file_watcher = false, -- This will use the OS level file watchers to detect changes
-- instead of relying on nvim autocmd events.
window = {
mappings = {
["<bs>"] = "navigate_up",
["."] = "set_root",
["H"] = "toggle_hidden",
["/"] = "fuzzy_finder",
["f"] = "filter_on_submit",
["<c-x>"] = "clear_filter",
["[g"] = "prev_git_modified",
["]g"] = "next_git_modified",
}
}
}, },
buffers = { modified = {
follow_current_file = true, -- This will find and focus the file in the active buffer every symbol = "[+]",
-- time the current file is changed while the tree is open. highlight = "NeoTreeModified",
group_empty_dirs = true, -- when true, empty folders will be grouped together },
show_unloaded = true, name = {
window = { trailing_slash = false,
mappings = { use_git_status_colors = true,
["bd"] = "buffer_delete", highlight = "NeoTreeFileName",
["<bs>"] = "navigate_up",
["."] = "set_root",
}
},
}, },
git_status = { git_status = {
window = { symbols = {
position = "float", -- Change type
mappings = { added = "", -- or "✚", but this is redundant info if you use git_status_colors on the name
["A"] = "git_add_all", modified = "", -- or "", but this is redundant info if you use git_status_colors on the name
["gu"] = "git_unstage_file", deleted = "",-- this can only be used in the git_status source
["ga"] = "git_add_file", renamed = "󰁕",-- this can only be used in the git_status source
["gr"] = "git_revert_file", -- Status type
["gc"] = "git_commit", untracked = "",
["gp"] = "git_push", ignored = "",
["gg"] = "git_commit_and_push", unstaged = "󰄱",
} staged = "",
conflict = "",
}
},
},
window = {
position = "left",
width = 40,
mapping_options = {
noremap = true,
nowait = true,
},
mappings = {
["<space>"] = {
"toggle_node",
nowait = false, -- disable `nowait` if you have existing combos starting with this char that you want to use
},
["<2-LeftMouse>"] = "open",
["<cr>"] = "open",
["S"] = "open_split",
["s"] = "open_vsplit",
-- ["S"] = "split_with_window_picker",
-- ["s"] = "vsplit_with_window_picker",
["t"] = "open_tabnew",
["w"] = "open_with_window_picker",
["C"] = "close_node",
["a"] = {
"add",
-- some commands may take optional config options, see `:h neo-tree-mappings` for details
config = {
show_path = "none" -- "none", "relative", "absolute"
} }
},
["A"] = "add_directory", -- also accepts the config.show_path option.
["d"] = "delete",
["r"] = "rename",
["y"] = "copy_to_clipboard",
["x"] = "cut_to_clipboard",
["p"] = "paste_from_clipboard",
["c"] = "copy", -- takes text input for destination
["m"] = "move", -- takes text input for destination
["q"] = "close_window",
["R"] = "refresh",
["?"] = "show_help",
} }
},
nesting_rules = {
["js"] = {
pattern = "(.+)%.js$",
files = { "%1.js.map", "%1.min.js", "%1.d.ts" },
},
["css"] = {
pattern = "(.+)%.css$",
files = { "%1.css.map", "%1.min.css" },
},
["go"] = {
pattern = "(.*)%.go$",
files = { "%1_test.go" },
},
["templ"] = {
pattern = "(.*)%.templ$",
files = { "%1_templ.go" },
},
},
filesystem = {
filtered_items = {
visible = false, -- when true, they will just be displayed differently than normal items
hide_dotfiles = false,
hide_gitignored = false,
hide_hidden = true, -- only works on Windows for hidden files/directories
hide_by_name = {
".git",
},
hide_by_pattern = { -- uses glob style patterns
--"*.meta"
},
never_show = { -- remains hidden even if visible is toggled to true
--".DS_Store",
--"thumbs.db"
},
},
follow_current_file = { enabled = false }, -- This will find and focus the file in the active buffer every
-- time the current file is changed while the tree is open.
group_empty_dirs = false, -- when true, empty folders will be grouped together
hijack_netrw_behavior = "open_default", -- netrw disabled, opening a directory opens neo-tree
-- in whatever position is specified in window.position
-- "open_current", -- netrw disabled, opening a directory opens within the
-- window like netrw would, regardless of window.position
-- "disabled", -- netrw left alone, neo-tree does not handle opening dirs
use_libuv_file_watcher = false, -- This will use the OS level file watchers to detect changes
-- instead of relying on nvim autocmd events.
window = {
mappings = {
["<bs>"] = "navigate_up",
["."] = "set_root",
["H"] = "toggle_hidden",
["/"] = "fuzzy_finder",
["f"] = "filter_on_submit",
["<c-x>"] = "clear_filter",
["[g"] = "prev_git_modified",
["]g"] = "next_git_modified",
}
}
},
buffers = {
follow_current_file = { enabled = false }, -- This will find and focus the file in the active buffer every
-- time the current file is changed while the tree is open.
group_empty_dirs = true, -- when true, empty folders will be grouped together
show_unloaded = true,
window = {
mappings = {
["bd"] = "buffer_delete",
["<bs>"] = "navigate_up",
["."] = "set_root",
}
},
},
git_status = {
window = {
position = "float",
mappings = {
["A"] = "git_add_all",
["gu"] = "git_unstage_file",
["ga"] = "git_add_file",
["gr"] = "git_revert_file",
["gc"] = "git_commit",
["gp"] = "git_push",
["gg"] = "git_commit_and_push",
}
}
}
} }
require("neo-tree").setup(config) require("neo-tree").setup(config)