diff --git a/.vimrc b/.vimrc index 0a908c2..bbd453d 100644 --- a/.vimrc +++ b/.vimrc @@ -87,7 +87,7 @@ autocmd! ColorScheme * hi clear CursorLine augroup END - set cmdheight=1 " get rid of the extra useless line at the bottom(not working, probably a plugin is changing the value) + set cmdheight=1 " get rid of the extra useless line at the bottom(if not working, probably a plugin is changing the value) "highlight clear SignColumn " SignColumn should match background "highlight clear LineNr " Current line number row will have same background color in relative mode @@ -157,21 +157,21 @@ noremap k gk " Stupid shift key fixes - if !exists('g:spf13_no_keyfixes') - if has("user_commands") - command! -bang -nargs=* -complete=file E e - command! -bang -nargs=* -complete=file W w - command! -bang -nargs=* -complete=file Wq wq - command! -bang -nargs=* -complete=file WQ wq - command! -bang Wa wa - command! -bang WA wa - command! -bang Q q - command! -bang QA qa - command! -bang Qa qa - endif + " if !exists('g:spf13_no_keyfixes') + " if has("user_commands") + " command! -bang -nargs=* -complete=file E e + " command! -bang -nargs=* -complete=file W w + " command! -bang -nargs=* -complete=file Wq wq + " command! -bang -nargs=* -complete=file WQ wq + " command! -bang Wa wa + " command! -bang WA wa + " command! -bang Q q + " command! -bang QA qa + " command! -bang Qa qa + " endif - cmap Tabe tabe - endif + " cmap Tabe tabe + " endif " Yank from the cursor to the end of the line, to be consistent with C and D. nnoremap Y y$ @@ -213,17 +213,7 @@ map zh zH " Easier formatting - nnoremap q gwip - -" Plugins { - - " AutoCloseTag { - " Make it so AutoCloseTag works for xml and xhtml files as well - au FileType xhtml,xml ru ftplugin/html/autoclosetag.vim - nmap ac ToggleAutoCloseMappings - " } - -" } + " nnoremap q gwip " Functions { diff --git a/.vimrc.bundles b/.vimrc.bundles index 2d5d901..acb11f9 100644 --- a/.vimrc.bundles +++ b/.vimrc.bundles @@ -68,16 +68,18 @@ Plug 'wellle/tmux-complete.vim' Plug 'NoahTheDuke/vim-just' - Plug 'ludovicchabant/vim-gutentags', { 'for': ['c', 'cpp'] } + Plug 'ludovicchabant/vim-gutentags', { 'for': ['c', 'cpp', 'vim'] } Plug 'lambdalisue/readablefold.vim' " only work with vim if g:vim_type == 'vim' Plug 'scrooloose/nerdtree' + " Plug 'tribela/vim-transparent' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' " The bottom buffer display - Plug 'bling/vim-bufferline' + Plug 'Donaldttt/vim-bufferline' + " Plug 'itchyny/lightline.vim' endif " only work with nvim > 0.5 @@ -96,6 +98,9 @@ endif if g:vim_version >= 0.7 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} + + " comment out this plugin if the machine doesn't have required + " font install Plug 'nvim-tree/nvim-web-devicons' endif if g:vim_version >= 0.8 @@ -131,10 +136,6 @@ if g:vim_type == 'nvim' if g:vim_version >= 0.7 " nvim-treesitter/nvim-treesitter { - if filereadable(expand(g:dotfile_path . '.vimrc.lua')) - execute('source ' . g:dotfile_path . '/.vimrc.lua') - endif - " } endif endif @@ -187,11 +188,13 @@ endif let g:bufferline_modified = '+' " scrolling with fixed current buffer position - let g:bufferline_rotate = 1 + let g:bufferline_rotate = 0 let g:bufferline_active_buffer_left = '' let g:bufferline_active_buffer_right = '' let g:bufferline_fixed_index = -1 + let g:bufferline_inactive_highlight = 'StatusLineNC' + let g:bufferline_active_highlight = 'StatusLine' " } @@ -215,8 +218,16 @@ endif let g:NERDTreeMinimalMenu=1 "nnoremap :NERDTreeToggle - nnoremap e :NERDTreeToggle - "nmap e :NERDTreeFind + " nnoremap e :NERDTreeToggle + function! NERDTreeFindToggle() + let my_filetype = &filetype + if my_filetype == 'nerdtree' || my_filetype == '' + :NERDTreeToggle + else + :NERDTreeFind + endif + endfunction + nnoremap e :call NERDTreeFindToggle() "let NERDTreeShowBookmarks=1 "let NERDTreeIgnore=['\.py[cd]$', '\~$', '\.swo$', '\.swp$', '^\.git$', '^\.hg$', '^\.svn$', '\.bzr$'] @@ -225,19 +236,18 @@ endif let NERDTreeMouseMode = 2 let NERDTreeShowHidden = 1 let NERDTreeKeepTreeInNewTab = 1 + + " Exit Vim if NERDTree is the only window remaining in the only tab. + autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif endif " } " nvim-tree.lua { if g:vim_type == 'nvim' && isdirectory(expand(plugin_dir . "/nvim-tree.lua")) - - nnoremap e :NvimTreeFindFileToggle - nnoremap r :NvimTreeRefresh - " Hide vim bottom statusline " autocmd FileType NvimTree setlocal noshowmode noruler laststatus=0 noshowcmd - set noshowmode noruler laststatus=0 noshowcmd + " set noshowmode noruler laststatus=0 noshowcmd " autocmd BufRead,BufNewFile NvimTree set laststatus=0 " This will work instead endif " } @@ -246,21 +256,45 @@ endif " nvim-lualine/lualine.nvim { " } "else + " + " itchyny/lightline.vim { + if g:vim_type == 'vim' && isdirectory(expand(plugin_dir . "/lightline.vim")) + set laststatus=2 + let g:lightline = { + \ 'colorscheme': 'wombat', + \ 'active': { + \ 'left': [ [ 'mode', 'paste' ], + \ [ 'buffers' ] ] + \ }, + \ 'component_function': { + \ 'buffers': 'bufferline#get_echo_string' + \ }, + \ } + endif + " } + " " vim-airline { if g:vim_type == 'vim' && isdirectory(expand(plugin_dir . "/vim-airline")) " Set configuration options for the statusline plugin vim-airline. " Use the powerline theme and optionally enable powerline symbols. - let g:airline_section_b = '' - let g:airline_section_z = '' - let g:airline_section_y = '' - let g:airline_section_x = '' - let g:airline_section_warning = '' - "let g:airline#extensions#tabline#left_sep = '' - "let g:airline#extensions#tabline#left_alt_sep = '|' + + " This must using my fork version of bufferline + " + let g:bufferline_max_length = &columns - 25 + function! BufferNumber() + return len(g:index_to_buffer) + endfunction + call airline#parts#define_function('bufnum', 'BufferNumber') - "let g:airline_left_sep='>' - "let g:airline_right_sep='<' - "let g:airline_skip_empty_sections = 1 + let g:airline_section_b = '' + let g:airline_section_x = '' + "let g:airline_section_gutter = '' + let g:airline_section_y = airline#section#create(['bufnum']) + let g:airline_section_z = airline#section#create(['filetype']) + let g:airline_section_warning = '' + let g:airline_section_error = '' + "let g:airline_exclude_filetypes = ['nerdtree'] " see source for current list + let g:airline#extensions#nerdtree_statusline = 0 "let g:airline#extensions#bufferline#overwrite_variables = 0 let g:airline_mode_map = { \ '__' : '-', @@ -326,6 +360,8 @@ endif if filereadable(expand(config_dir . "/.exp-coc-config")) exec "source " . config_dir . "/.exp-coc-config" endif + " warning that coc work best for vim >= 8.3 + let g:coc_disable_startup_warning = 1 endif " } @@ -359,7 +395,8 @@ endif " what to use for dark theme let g:dark_theme = 'default' - let g:airline_dark_theme = "deus" + " let g:airline_dark_theme = "violet" + let g:airline_dark_theme = "angr" " what to use for light theme let g:light_theme = 'default' @@ -431,48 +468,52 @@ endif function! EnableTransparent() if g:vim_type == 'nvim' && g:vim_version > 0.5 :TransparentEnable - elseif g:dark_or_white_theme == 'dark' - let g:PaperColor_Theme_Options = { - \ 'theme': { - \ 'default.dark': { - \ 'transparent_background': 1 - \ } - \ } - \ } - execute("colorscheme " . g:dark_theme) - elseif g:dark_or_white_theme == 'light' - let g:PaperColor_Theme_Options = { - \ 'theme': { - \ 'default.light': { - \ 'transparent_background': 1 - \ } - \ } - \ } - execute("colorscheme " . g:light_theme) + else + if g:dark_or_white_theme == 'dark' + let g:PaperColor_Theme_Options = { + \ 'theme': { + \ 'default.dark': { + \ 'transparent_background': 1 + \ } + \ } + \ } + execute("colorscheme " . g:dark_theme) + elseif g:dark_or_white_theme == 'light' + let g:PaperColor_Theme_Options = { + \ 'theme': { + \ 'default.light': { + \ 'transparent_background': 1 + \ } + \ } + \ } + execute("colorscheme " . g:light_theme) + endif endif endfunction function! DisableTransparent() if g:vim_type == 'nvim' && g:vim_version > 0.5 :TransparentDisable - elseif g:dark_or_white_theme == 'dark' - let g:PaperColor_Theme_Options = { - \ 'theme': { - \ 'default.dark': { - \ 'transparent_background': 0 - \ } - \ } - \ } - execute("colorscheme " . g:dark_theme) - elseif g:dark_or_white_theme == 'light' - let g:PaperColor_Theme_Options = { - \ 'theme': { - \ 'default.light': { - \ 'transparent_background': 0 - \ } - \ } - \ } - execute("colorscheme " . g:light_theme) + else + if g:dark_or_white_theme == 'dark' + let g:PaperColor_Theme_Options = { + \ 'theme': { + \ 'default.dark': { + \ 'transparent_background': 0 + \ } + \ } + \ } + execute("colorscheme " . g:dark_theme) + elseif g:dark_or_white_theme == 'light' + let g:PaperColor_Theme_Options = { + \ 'theme': { + \ 'default.light': { + \ 'transparent_background': 0 + \ } + \ } + \ } + execute("colorscheme " . g:light_theme) + endif endif endfunction @@ -592,34 +633,55 @@ endif " { " Toggle dark/light theme - noremap bg :call ToggleBG() + noremap bg :call ToggleBG() " Toggle transparent background - noremap tb :call ToggleTransparent() + noremap tb :call ToggleTransparent() " Buffer navigation - nnoremap q :bprevious - nnoremap e :bnext + nnoremap q :bprevious + nnoremap e :bnext " leader s change all occurence - nnoremap s :%s/\<\>/ + nnoremap s :%s/\<\>/ " leader num change tab - nnoremap 1 :b1 - nnoremap 2 :b2 - nnoremap 3 :b3 - nnoremap 4 :b4 - nnoremap 5 :b5 - nnoremap 6 :b6 - nnoremap 7 :b7 - nnoremap 8 :b8 - nnoremap 9 :b9 + " only for vim or nvim without lualine + if g:vim_type == 'vim' || (g:vim_type == 'nvim' && g:vim_version < 0.5) + " nnoremap 1 :b1 + " nnoremap 2 :b2 + " nnoremap 3 :b3 + " nnoremap 4 :b4 + " nnoremap 5 :b5 + " nnoremap 6 :b6 + " nnoremap 7 :b7 + " nnoremap 8 :b8 + " nnoremap 9 :b9 + nnoremap 1 :call bufferline#jump(1) + nnoremap 2 :call bufferline#jump(2) + nnoremap 3 :call bufferline#jump(3) + nnoremap 4 :call bufferline#jump(4) + nnoremap 5 :call bufferline#jump(5) + nnoremap 6 :call bufferline#jump(6) + nnoremap 7 :call bufferline#jump(7) + nnoremap 8 :call bufferline#jump(8) + nnoremap 9 :call bufferline#jump(9) + nnoremap 10 :call bufferline#jump(10) + nnoremap 11 :call bufferline#jump(11) + nnoremap 12 :call bufferline#jump(12) + nnoremap 13 :call bufferline#jump(13) + end " split window comform with other window management shortcuts - nnoremap % :vsplit - nnoremap " :split + nnoremap % :vsplit + nnoremap " :split " } " +" Lua configuration + if g:vim_type == 'nvim' && filereadable(expand(g:dotfile_path . '.vimrc.lua')) + execute('source ' . g:dotfile_path . '/.vimrc.lua') + endif +" " Useful_Info{ " show mapping info " :verbose map ,cf diff --git a/.vimrc.lua b/.vimrc.lua index 9cad90c..e55b5be 100644 --- a/.vimrc.lua +++ b/.vimrc.lua @@ -4,6 +4,21 @@ vim_version_minor = vim_version['minor'] -- debug -- print(vim.inspect(version)) +if vim_version_minor >= 5 then + + require("transparent").setup({ + enable = true, -- boolean: enable transparent + extra_groups = { -- table/string: additional groups that should be cleared + -- In particular, when you set it to 'all', that means all available groups + + "NvimTreeNormal", + "VertSplit", + }, + exclude = {}, -- table: groups you don't want to clear + }) + +end + if vim_version_minor >= 7 then require('nvim-treesitter.configs').setup { @@ -21,14 +36,34 @@ end if vim_version_minor >= 5 then + for i=1,9 do + vim.api.nvim_set_keymap('n', ''..i, ':LualineBuffersJump '..i..'', { noremap = true, silent = true, nowait = true }) + -- :nnoremap 1 :LualineBuffersJump 1 + end + for i=10,20 do + vim.api.nvim_set_keymap('n', ''..i, ':LualineBuffersJump '..i..'', { noremap = true, silent = true, nowait = true }) + -- :nnoremap 1 :LualineBuffersJump 1 + end + + local disabled_filetypes_data = {} + if vim_version_minor < 7 then + -- globalstatus only work for nvim >= 0.7 + disabled_filetypes_data = { -- Filetypes to disable lualine for. + statusline = {}, -- only ignores the ft for statusline. + winbar = {}, -- only ignores the ft for winbar. + 'NvimTree' + } + end + 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' - }, + -- theme = 'ayu', -- lualine theme + always_divide_middle = false, -- When set to true, left sections i.e. 'a','b' and 'c' + -- can't take over the entire statusline even + -- if neither of 'x', 'y' or 'z' are present. + globalstatus = true, + disabled_filetypes = disabled_filetypes_data, }, sections = { lualine_a = {'mode'}, @@ -36,43 +71,30 @@ if vim_version_minor >= 5 then lualine_c = { { 'buffers', - mode = 4, + mode = 2, filetype_names = { TelescopePrompt = 'Telescope', dashboard = 'Dashboard', packer = 'Packer', fzf = 'FZF', alpha = 'Alpha', - NvimTree = 'NvimTree' + NvimTree = '' + }, + max_length = vim.o.columns - 27, -- Maximum width of buffers component, + -- it can also be a function that returns + -- the value of `max_length` dynamically. + symbols = { + modified = ' ●', -- Text to show when the buffer is modified + alternate_file = '', -- Text to show to identify the alternate file + directory = '', -- Text to show when the buffer is a directory }, } }, -- lualine_x = {'encoding', 'fileformat', 'filetype'}, - lualine_x = {'encoding'}, + lualine_x = {}, lualine_y = {}, - lualine_z = {'location'} + lualine_z = {'encoding', '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 @@ -121,6 +143,8 @@ if vim_version_minor >= 8 then }, }) + vim.api.nvim_set_keymap('n', 'e', ':NvimTreeFindFileToggle', { noremap = true, silent = true }) + -- -- nvim-tree configuration end --