From 0bf78b35e13e592afd82127ba727dada2d741ae1 Mon Sep 17 00:00:00 2001 From: Nachuan Tang Date: Sun, 5 Feb 2023 20:28:26 -0500 Subject: [PATCH 1/2] . --- .vimrc.bundles | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vimrc.bundles b/.vimrc.bundles index d997746..f55c265 100644 --- a/.vimrc.bundles +++ b/.vimrc.bundles @@ -76,10 +76,10 @@ Plug 'scrooloose/nerdtree' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' + " The bottom buffer display + Plug 'bling/vim-bufferline' endif - " The bottom buffer display - Plug 'bling/vim-bufferline' " only work with nvim > 0.5 " For other versions, just loading the plugin may " cause error From aa309dcc208413ee9f15baec402f7c0eee0a49f3 Mon Sep 17 00:00:00 2001 From: Nachuan Tang Date: Sun, 5 Feb 2023 20:33:02 -0500 Subject: [PATCH 2/2] . --- .vimrc.bundles | 5 +- .vimrc.lua | 214 ++++++++++++++++++++++++++----------------------- 2 files changed, 119 insertions(+), 100 deletions(-) diff --git a/.vimrc.bundles b/.vimrc.bundles index f55c265..2d5d901 100644 --- a/.vimrc.bundles +++ b/.vimrc.bundles @@ -101,6 +101,9 @@ if g:vim_version >= 0.8 Plug 'nvim-tree/nvim-tree.lua' endif + if g:vim_version < 0.8 + Plug 'scrooloose/nerdtree' + endif endif call plug#end() @@ -205,7 +208,7 @@ endif " } " NerdTree { - if g:vim_type == 'vim' && isdirectory(expand(plugin_dir . "/nerdtree")) + if (g:vim_type == 'vim' || g:vim_version < 0.8) && isdirectory(expand(plugin_dir . "/nerdtree")) let g:NERDShutUp=1 " work around for nerdtree bug: https://github.com/preservim/nerdtree/issues/1321 diff --git a/.vimrc.lua b/.vimrc.lua index b5ff333..9cad90c 100644 --- a/.vimrc.lua +++ b/.vimrc.lua @@ -1,111 +1,127 @@ +vim_version = vim.version() +vim_version_minor = vim_version['minor'] -require('nvim-treesitter.configs').setup { - -- ensure_installed = { "c", "bash", "lua" }, - sync_install = false, - auto_install = true, - -- ignore_install = { "javascript" }, - highlight = { - enable = true, - additional_vim_regex_highlighting = false, - }, -} +-- debug +-- print(vim.inspect(version)) -require('lualine').setup { - options = { - theme = 'auto', -- lualine theme - disabled_filetypes = { -- Filetypes to disable lualine for. - statusline = {}, -- only ignores the ft for statusline. - winbar = {}, -- only ignores the ft for winbar. - 'NvimTree' +if vim_version_minor >= 7 then + + require('nvim-treesitter.configs').setup { + -- ensure_installed = { "c", "bash", "lua" }, + sync_install = false, + auto_install = true, + -- ignore_install = { "javascript" }, + highlight = { + enable = true, + additional_vim_regex_highlighting = false, }, - }, - sections = { - lualine_a = {'mode'}, - lualine_b = {}, - lualine_c = { - { - 'buffers', - mode = 4, - filetype_names = { - TelescopePrompt = 'Telescope', - dashboard = 'Dashboard', - packer = 'Packer', - fzf = 'FZF', - alpha = 'Alpha', - NvimTree = 'NvimTree' - }, - } - }, - -- lualine_x = {'encoding', 'fileformat', 'filetype'}, - lualine_x = {'encoding'}, - lualine_y = {}, - lualine_z = {'location'} - }, - -- tabline = { - -- lualine_a = { - -- { - -- 'buffers', - -- mode = 4, - -- } - -- }, - -- lualine_b = {}, - -- lualine_c = {}, - -- lualine_x = {}, - -- lualine_y = {}, - -- lualine_z = {'tabs'} - -- }, - -- winbar = { - -- lualine_a = {}, - -- lualine_b = {}, - -- lualine_c = {'filename'}, - -- lualine_x = {}, - -- lualine_y = {}, - -- lualine_z = {} - -- }, -} + } --- nvim-tree configuration --- +end --- disable netrw at the very start of your init.lua (strongly advised) -vim.g.loaded_netrw = 1 -vim.g.loaded_netrwPlugin = 1 +if vim_version_minor >= 5 then --- set termguicolors to enable highlight groups -vim.opt.termguicolors = true - --- setup with some options -require("nvim-tree").setup({ - sort_by = "case_sensitive", - view = { - width = 30, - mappings = { - list = { - { key = "C-[", action = "dir_up" }, - { key = "C-]", action = "cd" }, - { key = "", action = "toggle_file_info" }, + require('lualine').setup { + options = { + theme = 'auto', -- lualine theme + disabled_filetypes = { -- Filetypes to disable lualine for. + statusline = {}, -- only ignores the ft for statusline. + winbar = {}, -- only ignores the ft for winbar. + 'NvimTree' }, }, - }, - renderer = { - group_empty = true, - }, - filters = { - dotfiles = false, - }, - actions = { - open_file = { - quit_on_open = true, - resize_window = true, - window_picker = { - exclude = { - filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" }, - buftype = { "nofile", "terminal", "help" }, + sections = { + lualine_a = {'mode'}, + lualine_b = {}, + lualine_c = { + { + 'buffers', + mode = 4, + filetype_names = { + TelescopePrompt = 'Telescope', + dashboard = 'Dashboard', + packer = 'Packer', + fzf = 'FZF', + alpha = 'Alpha', + NvimTree = 'NvimTree' + }, + } + }, + -- lualine_x = {'encoding', 'fileformat', 'filetype'}, + lualine_x = {'encoding'}, + lualine_y = {}, + lualine_z = {'location'} + }, + -- tabline = { + -- lualine_a = { + -- { + -- 'buffers', + -- mode = 4, + -- } + -- }, + -- lualine_b = {}, + -- lualine_c = {}, + -- lualine_x = {}, + -- lualine_y = {}, + -- lualine_z = {'tabs'} + -- }, + -- winbar = { + -- lualine_a = {}, + -- lualine_b = {}, + -- lualine_c = {'filename'}, + -- lualine_x = {}, + -- lualine_y = {}, + -- lualine_z = {} + -- }, + } + +end + +if vim_version_minor >= 8 then + -- nvim-tree configuration + -- + + -- disable netrw at the very start of your init.lua (strongly advised) + vim.g.loaded_netrw = 1 + vim.g.loaded_netrwPlugin = 1 + + -- set termguicolors to enable highlight groups + vim.opt.termguicolors = true + + -- setup with some options + require("nvim-tree").setup({ + sort_by = "case_sensitive", + view = { + width = 30, + mappings = { + list = { + { key = "C-[", action = "dir_up" }, + { key = "C-]", action = "cd" }, + { key = "", action = "toggle_file_info" }, }, }, }, - }, -}) + renderer = { + group_empty = true, + }, + filters = { + dotfiles = false, + }, + actions = { + open_file = { + quit_on_open = true, + resize_window = true, + window_picker = { + exclude = { + filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" }, + buftype = { "nofile", "terminal", "help" }, + }, + }, + }, + }, + }) --- --- nvim-tree configuration end + -- + -- nvim-tree configuration end + -- +end