fix(nvim): remove plugins deprecated options

This commit is contained in:
Bruno Carlin 2022-08-31 09:51:21 +02:00
parent f05a7d116e
commit 9ce0455a48
Signed by: bcarlin
GPG key ID: 8E254EA0FFEB9B6D
2 changed files with 56 additions and 58 deletions

View file

@ -26,6 +26,7 @@ require("diffview").setup({
}, },
file_history_panel = { file_history_panel = {
log_options = { log_options = {
single_file = {
max_count = 256, -- Limit the number of commits max_count = 256, -- Limit the number of commits
follow = false, -- Follow renames (only for single file) follow = false, -- Follow renames (only for single file)
all = false, -- Include all refs under 'refs/' including HEAD all = false, -- Include all refs under 'refs/' including HEAD
@ -33,6 +34,15 @@ require("diffview").setup({
no_merges = false, -- List no merge commits no_merges = false, -- List no merge commits
reverse = false, -- List commits in reverse order reverse = false, -- List commits in reverse order
}, },
multi_file = {
max_count = 256, -- Limit the number of commits
follow = false, -- Follow renames (only for single file)
all = false, -- Include all refs under 'refs/' including HEAD
merges = false, -- List only merge commits
no_merges = false, -- List no merge commits
reverse = false, -- List commits in reverse order
},
},
win_config = { -- See ':h diffview-config-win_config' win_config = { -- See ':h diffview-config-win_config'
position = "bottom", position = "bottom",
height = 16, height = 16,

View file

@ -1,55 +1,3 @@
vim.g.nvim_tree_git_hl = 1 -- 0 by default, will enable file highlight for git attributes (can be used without the icons).
vim.g.nvim_tree_highlight_opened_files = 1 -- 0 by default, will enable folder and file icon highlight for opened files/directories.
vim.g.nvim_tree_root_folder_modifier = ':~' -- This is the default. See :help filename-modifiers for more options
vim.g.nvim_tree_add_trailing = 1 -- 0 by default, append a trailing slash to folder names
vim.g.nvim_tree_group_empty = 1 -- 0 by default, compact folders that only contain a single folder into one node in the file tree
vim.g.nvim_tree_icon_padding = ' ' -- one space by default, used for rendering the space between the icon and the filename. Use with caution, it could break rendering if you set an empty string depending on your font.
vim.g.nvim_tree_symlink_arrow = '->' -- defaults to ' ➛ '. used as a separator between symlinks' source and target.
vim.g.nvim_tree_respect_buf_cwd = 1 -- 0 by default, will change cwd of nvim-tree to that of new buffer's when opening nvim-tree.
vim.g.nvim_tree_create_in_closed_folder = 0 -- 1 by default, When creating files, sets the path of a file when cursor is on a closed folder to the parent folder when 0, and inside the folder when 1.
--
-- Dictionary of buffer option names mapped to a list of option values that
-- indicates to the window picker that the buffer's window should not be
-- selectable.
vim.g.nvim_tree_special_files = { ['README.md'] = 1, Makefile = 1, MAKEFILE = 1 } -- List of filenames that gets highlighted with NvimTreeSpecialFile
vim.g.nvim_tree_show_icons = {
git = 1,
folders = 1,
files = 1,
folder_arrows = 0,
}
-- If 0, do not show the icons for one of 'git' 'folder' and 'files'
-- 1 by default, notice that if 'files' is 1, it will only display
-- if nvim-web-devicons is installed and on your runtimepath.
-- if folder is 1, you can also tell folder_arrows 1 to show small arrows next to the folder icons.
-- but this will not work when you set indent_markers (because of UI conflict)
-- default will show icon by default if no icon is provided
-- default shows no icon by default
vim.g.nvim_tree_icons = {
default = '',
symlink = '',
git = {
unstaged = '',
staged = '',
unmerged = '',
renamed = '',
untracked = '',
deleted = '',
ignored = ''
},
folder = {
arrow_open = '',
arrow_closed = '',
default = '',
open = '',
empty = '',
empty_open = '',
symlink = '',
symlink_open = '',
}
}
vim.cmd [[ vim.cmd [[
nnoremap <C-n> :NvimTreeClose<CR> nnoremap <C-n> :NvimTreeClose<CR>
nnoremap <leader>n :NvimTreeFocus<CR> nnoremap <leader>n :NvimTreeFocus<CR>
@ -62,11 +10,13 @@ vim.cmd [[
-- each of these are documented in `:help nvim-tree.OPTION_NAME` -- each of these are documented in `:help nvim-tree.OPTION_NAME`
require('nvim-tree').setup { require('nvim-tree').setup {
create_in_closed_folder = false,
hijack_netrw = true, hijack_netrw = true,
auto_reload_on_write = true, auto_reload_on_write = true,
open_on_tab = false, open_on_tab = false,
hijack_cursor = false, hijack_cursor = false,
update_cwd = false, update_cwd = false,
respect_buf_cwd = true,
hijack_unnamed_buffer_when_opening = true, hijack_unnamed_buffer_when_opening = true,
hijack_directories = { hijack_directories = {
enable = true, enable = true,
@ -96,6 +46,12 @@ require('nvim-tree').setup {
side = 'left', side = 'left',
}, },
renderer = { renderer = {
add_trailing = true,
group_empty = true,
highlight_git = true,
highlight_opened_files = "all",
root_folder_modifier = ":~",
special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" },
indent_markers = { indent_markers = {
enable = false, enable = false,
icons = { icons = {
@ -105,7 +61,39 @@ require('nvim-tree').setup {
}, },
}, },
icons = { icons = {
padding = " ",
symlink_arrow = " -> ",
webdev_colors = true, webdev_colors = true,
show = {
file = true,
folder = true,
folder_arrow = false,
git = true,
},
glyphs = {
default = "",
symlink = "",
bookmark = "",
folder = {
arrow_closed = "",
arrow_open = "",
default = "",
open = "",
empty = "",
empty_open = "",
symlink = "",
symlink_open = "",
},
git = {
unstaged = "",
staged = "",
unmerged = "",
renamed = "",
untracked = "",
deleted = "",
ignored = "",
},
},
}, },
}, },
actions = { actions = {