From c8d6c028e823f8dbcd81e004519cd0d9473eeac1 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 16 Nov 2022 01:11:34 +0100 Subject: [PATCH] finish nvim-tree config migration --- lua/nvim-tree-config.vim | 68 ---------------------------------------- lua/plugins.lua | 68 +++++++++++++++++++++++++++++++++++----- 2 files changed, 60 insertions(+), 76 deletions(-) diff --git a/lua/nvim-tree-config.vim b/lua/nvim-tree-config.vim index ce653ce..7f3996e 100644 --- a/lua/nvim-tree-config.vim +++ b/lua/nvim-tree-config.vim @@ -1,70 +1,2 @@ -let g:nvim_tree_quit_on_open = 0 "0 by default, closes the tree when you open a file -let g:nvim_tree_indent_markers = 1 "0 by default, this option shows indent markers when folders are open -let g:nvim_tree_git_hl = 1 "0 by default, will enable file highlight for git attributes (can be used without the icons). -let g:nvim_tree_highlight_opened_files = 1 "0 by default, will enable folder and file icon highlight for opened files/directories. -let g:nvim_tree_root_folder_modifier = ':~' "This is the default. See :help filename-modifiers for more options -let g:nvim_tree_add_trailing = 1 "0 by default, append a trailing slash to folder names -let g:nvim_tree_group_empty = 1 " 0 by default, compact folders that only contain a single folder into one node in the file tree -let g:nvim_tree_disable_window_picker = 1 "0 by default, will disable the window picker. -let 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. -let g:nvim_tree_symlink_arrow = ' >> ' " defaults to ' ➛ '. used as a separator between symlinks' source and target. -let 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. -let 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. -let g:nvim_tree_refresh_wait = 500 "1000 by default, control how often the tree can be refreshed, 1000 means the tree can be refresh once per 1000ms. -let g:nvim_tree_window_picker_exclude = { - \ 'filetype': [ - \ 'notify', - \ 'packer', - \ 'qf' - \ ], - \ 'buftype': [ - \ 'terminal' - \ ] - \ } -" 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. -let g:nvim_tree_special_files = { 'README.md': 1, 'Makefile': 1, 'MAKEFILE': 1 } " List of filenames that gets highlighted with NvimTreeSpecialFile -let g:nvim_tree_show_icons = { - \ 'git': 1, - \ 'folders': 1, - \ 'files': 1, - \ 'folder_arrows': 1, - \ } -"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 -let 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': "", - \ } - \ } - - -" set termguicolors " this variable must be enabled for colors to be applied properly - highlight NvimTreeFolderIcon guibg=blue set encoding=UTF-8 diff --git a/lua/plugins.lua b/lua/plugins.lua index e71b911..0f034b4 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -15,21 +15,18 @@ return require('packer').startup(function() 'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons', config = function() require'nvim-tree'.setup { + create_in_closed_folder = false, disable_netrw = true, hijack_netrw = true, open_on_setup = false, ignore_ft_on_setup = {}, - auto_close = false, + respect_buf_cwd = true, open_on_tab = false, hijack_cursor = false, update_cwd = false, git = { ignore = true }, - update_to_buf_dir = { - enable = true, - auto_open = true, - }, diagnostics = { enable = false, icons = { @@ -52,19 +49,74 @@ return require('packer').startup(function() dotfiles = false, custom = {} }, + actions = { + open_file = { + window_picker = { + enable = false, + exclude = { + filetype = { 'notify', 'packer', 'qf' }, + buftype = { 'terminal' } + } + }, + quit_on_open = false, + resize_window = false + } + }, + renderer = { + indent_markers = { + enable = true + }, + add_trailing = true, + group_empty = true, + highlight_opened_files = "all", + highlight_git = true, + root_folder_modifier = ':~', + special_files = { 'README.md', 'Makefile', 'MAKEFILE' }, + icons = { + padding = ' ', + symlink_arrow = ' >> ', + show = { + git = true, + file = true, + folder = true, + folder_arrow = true + }, + glyphs = { + default = '', + symlink = '', + git = { + unstaged = "✗", + staged = "✓", + unmerged = "-", + renamed = "➜", + untracked = "★", + deleted = "", + ignored = "◌" + }, + folder = { + arrow_open = "-", + arrow_closed = "|", + default = "", + open = "", + empty = "", + empty_open = "", + symlink = "", + symlink_open = "", + } + } + } + }, view = { width = 30, - height = 30, hide_root_folder = false, side = 'left', - auto_resize = false, mappings = { custom_only = false, list = {} } } } end - } +} -- LSP and completion use { 'neovim/nvim-lspconfig' }