From 19e371afc918162e521cf2f271b1c897fe0c938d Mon Sep 17 00:00:00 2001 From: Hai Ninh Hoang Date: Thu, 7 Jan 2021 08:54:28 +0700 Subject: [PATCH] updates until 2/11/2020 --- coc-settings.json | 8 +- general/functions.vim | 12 -- init.vim | 21 +-- keys/which-key.vim | 69 ++++++---- lua/nvcodeline.lua | 258 +++++++++++++++++++++++++++++++++++++ lua/treesitter.lua | 19 ++- plug-config/barbar.vim | 56 ++++++++ plug-config/easymotion.vim | 12 +- plug-config/minimap.vim | 6 + plug-config/neovide.vim | 3 + plug-config/xtabline.vim | 16 +++ themes/airline.vim | 2 +- themes/nvcode.vim | 6 +- vim-plug/plugins.vim | 117 +++++++++-------- 14 files changed, 487 insertions(+), 118 deletions(-) create mode 100644 lua/nvcodeline.lua create mode 100644 plug-config/barbar.vim create mode 100644 plug-config/minimap.vim create mode 100644 plug-config/neovide.vim diff --git a/coc-settings.json b/coc-settings.json index c212b91..d6b18de 100644 --- a/coc-settings.json +++ b/coc-settings.json @@ -16,8 +16,9 @@ // "diagnostic.displayByAle": true, // "diagnostic.virtualText": true, // this won't work with codelens when error on same line - // codelens TODO what does this get me? - // "codeLens.enable": true, + // codelens + "codeLens.enable": true, + "java.referencesCodeLens.enabled": true, // list "list.indicator": ">", @@ -64,7 +65,8 @@ "explorer.icon.enableNerdfont": true, "explorer.previewAction.onHover": false, "explorer.icon.enableVimDevicons": false, - "explorer.keyMappings": { + "explorer.file.showHiddenFiles": false, + "explorer.keyMappings.global": { "": ["expandable?", "expand", "open"], "v": "open:vsplit", "l": ["expandable?", "expand", "preview:labeling"] diff --git a/general/functions.vim b/general/functions.vim index 513adf9..f04276c 100644 --- a/general/functions.vim +++ b/general/functions.vim @@ -29,18 +29,6 @@ if executable(s:clip) augroup END endif -" function! OpenLiveServer() -" echo 'live server is on' -" silent !live-server % & -" endfunction - -command Serve :call OpenLiveServer() -nnoremap bs :call OpenLiveServer() - -" augroup strip_ws -" autocmd BufWritePre * call utils#stripTrailingWhitespaces() -" augroup END - " If one has a particular extension that one uses for binary files (such as exe, " bin, etc), you may find it helpful to automate the process with the following " bit of autocmds for your <.vimrc>. Change that "*.bin" to whatever diff --git a/init.vim b/init.vim index ccd2e73..df842c4 100644 --- a/init.vim +++ b/init.vim @@ -13,7 +13,6 @@ source $HOME/.config/nvim/vim-plug/plugins.vim source $HOME/.config/nvim/general/settings.vim source $HOME/.config/nvim/general/functions.vim source $HOME/.config/nvim/keys/mappings.vim -source $HOME/.config/nvim/plug-config/quickscope.vim " Source depending on if VSCode is our client if exists('g:vscode') @@ -25,23 +24,19 @@ else " Themes source $HOME/.config/nvim/themes/syntax.vim source $HOME/.config/nvim/themes/nvcode.vim - " source $HOME/.config/nvim/themes/papercolor.vim - " source $HOME/.config/nvim/themes/material.vim - source $HOME/.config/nvim/themes/airline.vim - " source $HOME/.config/nvim/themes/nord.vim " Plugin configuration source $HOME/.config/nvim/keys/which-key.vim source $HOME/.config/nvim/plug-config/vim-commentary.vim - " source $HOME/.config/nvim/plug-config/rainbow.vim source $HOME/.config/nvim/plug-config/rnvimr.vim source $HOME/.config/nvim/plug-config/better-whitespace.vim source $HOME/.config/nvim/plug-config/fzf.vim - source $HOME/.config/nvim/plug-config/sneak.vim source $HOME/.config/nvim/plug-config/codi.vim + luafile $HOME/.config/nvim/lua/nvcodeline.lua luafile $HOME/.config/nvim/lua/treesitter.lua source $HOME/.config/nvim/plug-config/coc.vim + source $HOME/.config/nvim/plug-config/easymotion.vim source $HOME/.config/nvim/plug-config/goyo.vim source $HOME/.config/nvim/plug-config/vim-rooter.vim source $HOME/.config/nvim/plug-config/start-screen.vim @@ -49,16 +44,16 @@ else source $HOME/.config/nvim/plug-config/git-messenger.vim source $HOME/.config/nvim/plug-config/closetags.vim source $HOME/.config/nvim/plug-config/floaterm.vim - source $HOME/.config/nvim/plug-config/xtabline.vim + source $HOME/.config/nvim/plug-config/barbar.vim source $HOME/.config/nvim/plug-config/far.vim source $HOME/.config/nvim/plug-config/tagalong.vim - " source $HOME/.config/nvim/plug-config/illuminate.vim source $HOME/.config/nvim/plug-config/bracey.vim source $HOME/.config/nvim/plug-config/asynctask.vim source $HOME/.config/nvim/plug-config/window-swap.vim source $HOME/.config/nvim/plug-config/markdown-preview.vim + source $HOME/.config/nvim/plug-config/neovide.vim luafile $HOME/.config/nvim/lua/plug-colorizer.lua - source $HOME/.config/nvim/plug-config/semshi.vim + " source $HOME/.config/nvim/plug-config/semshi.vim " source $HOME/.config/nvim/plug-config/vimspector.vim " Uncomment if you want to use Vimspector " source $HOME/.config/nvim/plug-config/ale.vim " source $HOME/.config/nvim/plug-config/jupytext.vim @@ -68,7 +63,12 @@ else " source $HOME/.config/nvim/plug-config/leetcode.vim " source $HOME/.config/nvim/plug-config/vim-wiki.vim " source $HOME/.config/nvim/plug-config/vista.vim + " source $HOME/.config/nvim/plug-config/rainbow.vim + " source $HOME/.config/nvim/plug-config/xtabline.vim + " source $HOME/.config/nvim/plug-config/illuminate.vim + " source $HOME/.config/nvim/plug-config/sneak.vim endif +source $HOME/.config/nvim/plug-config/quickscope.vim " Add paths to node and python here if !empty(glob("~/.config/nvim/paths.vim")) @@ -78,3 +78,4 @@ endif " Better nav for omnicomplete TODO figure out why this is being overridden inoremap ("\") inoremap ("\") + diff --git a/keys/which-key.vim b/keys/which-key.vim index 66fda1f..3495b86 100644 --- a/keys/which-key.vim +++ b/keys/which-key.vim @@ -36,11 +36,12 @@ let g:which_key_map['='] = [ '=' , 'balance windows' let g:which_key_map['e'] = [ ':CocCommand explorer' , 'explorer' ] let g:which_key_map['h'] = [ 's' , 'split below'] let g:which_key_map['m'] = [ ':call WindowSwap#EasyWindowSwap()' , 'move window' ] -" let g:which_key_map['n'] = [ ':let @/ = ""' , 'no highlight' ] -let g:which_key_map['n'] = [ ':enew' , 'new file' ] +let g:which_key_map['n'] = [ ':let @/ = ""' , 'no highlight' ] +let g:which_key_map['N'] = [ ':enew' , 'new file' ] " let g:which_key_map['p'] = [ ':Files' , 'search files' ] let g:which_key_map['q'] = [ 'q' , 'quit' ] let g:which_key_map['r'] = [ ':RnvimrToggle' , 'ranger' ] +let g:which_key_map['T'] = [ ':TSHighlightCapturesUnderCursor' , 'treesitter highlight' ] let g:which_key_map['u'] = [ ':UndotreeToggle' , 'undo tree'] let g:which_key_map['v'] = [ 'v' , 'split right'] let g:which_key_map['W'] = [ 'w' , 'write' ] @@ -82,7 +83,7 @@ let g:which_key_map.a = { \ 'p' : [':set paste!' , 'toggle paste mode'], \ 'w' : [':StripWhitespace' , 'strip whitespace'], \ '.' : [':set nospell!' , 'toggle spell check'], - \ 'h' : [':cd %:h' , 'set current path'], + \ 'P' : [':cd %:h' , 'set current path'], \ 'q' : [':set list!' , 'toggle dot space'], \ } " \ 'r' : [ ':Semshi rename' , 'Semshi Rename'], @@ -97,15 +98,27 @@ let g:which_key_map.p = { " b is for buffer let g:which_key_map.b = { \ 'name' : 'buffer' , - \ '1' : ['b1' , 'buffer 1'], - \ '2' : ['b2' , 'buffer 2'], - \ 'd' : [':Bdelete' , 'delete-buffer'], - \ 'f' : ['bfirst' , 'first-buffer'], - \ 'h' : ['Startify' , 'home-buffer'], - \ 'l' : ['blast' , 'last-buffer'], - \ 'n' : ['bnext' , 'next-buffer'], - \ 'p' : ['bprevious' , 'previous-buffer'], - \ '?' : ['Buffers' , 'fzf-buffer'], + \ '>' : [':BufferMoveNext' , 'move next'], + \ '<' : [':BufferMovePrevious' , 'move prev'], + \ '1' : [':BufferGoto 1' , 'buffer 1'], + \ '2' : [':BufferGoto 2' , 'buffer 2'], + \ '3' : [':BufferGoto 3' , 'buffer 3'], + \ '4' : [':BufferGoto 4' , 'buffer 4'], + \ '5' : [':BufferGoto 5' , 'buffer 5'], + \ '6' : [':BufferGoto 6' , 'buffer 6'], + \ '7' : [':BufferGoto 7' , 'buffer 7'], + \ '8' : [':BufferGoto 8' , 'buffer 8'], + \ '9' : [':BufferGoto 9' , 'buffer 9'], + \ '0' : [':BufferGoto 0' , 'buffer 0'], + \ 'b' : [':BufferPick' , 'pick buffer'], + \ 'd' : [':Bdelete' , 'delete-buffer'], + \ 'D' : [':BufferOrderByDirectory', 'order by directory'], + \ 'f' : ['bfirst' , 'first-buffer'], + \ 'l' : ['blast' , 'last buffer'], + \ 'L' : [':BufferOrderByLanguage' , 'order by language'], + \ 'n' : ['bnext' , 'next-buffer'], + \ 'p' : ['bprevious' , 'previous-buffer'], + \ '?' : ['Buffers' , 'fzf-buffer'], \ } let g:which_key_map.f = { @@ -274,22 +287,22 @@ let g:which_key_map.t = { \ } " T is for terminal -let g:which_key_map.T = { - \ 'name' : '+tabline' , - \ 'b' : [':XTabListBuffers' , 'list buffers'], - \ 'd' : [':XTabCloseBuffer' , 'close buffer'], - \ 'D' : [':XTabDeleteTab' , 'close tab'], - \ 'h' : [':XTabHideBuffer' , 'hide buffer'], - \ 'i' : [':XTabInfo' , 'info'], - \ 'l' : [':XTabLock' , 'lock tab'], - \ 'm' : [':XTabMode' , 'toggle mode'], - \ 'n' : [':tabNext' , 'next tab'], - \ 'N' : [':XTabMoveBufferNext' , 'buffer->'], - \ 't' : [':tabnew' , 'new tab'], - \ 'p' : [':tabprevious' , 'prev tab'], - \ 'P' : [':XTabMoveBufferPrev' , '<-buffer'], - \ 'x' : [':XTabPinBuffer' , 'pin buffer'], - \ } +" let g:which_key_map.T = { +" \ 'name' : '+tabline' , +" \ 'b' : [':XTabListBuffers' , 'list buffers'], +" \ 'd' : [':XTabCloseBuffer' , 'close buffer'], +" \ 'D' : [':XTabDeleteTab' , 'close tab'], +" \ 'h' : [':XTabHideBuffer' , 'hide buffer'], +" \ 'i' : [':XTabInfo' , 'info'], +" \ 'l' : [':XTabLock' , 'lock tab'], +" \ 'm' : [':XTabMode' , 'toggle mode'], +" \ 'n' : [':tabNext' , 'next tab'], +" \ 'N' : [':XTabMoveBufferNext' , 'buffer->'], +" \ 't' : [':tabnew' , 'new tab'], +" \ 'p' : [':tabprevious' , 'prev tab'], +" \ 'P' : [':XTabMoveBufferPrev' , '<-buffer'], +" \ 'x' : [':XTabPinBuffer' , 'pin buffer'], +" \ } " w is for wiki let g:which_key_map.w = { diff --git a/lua/nvcodeline.lua b/lua/nvcodeline.lua new file mode 100644 index 0000000..f66c2e9 --- /dev/null +++ b/lua/nvcodeline.lua @@ -0,0 +1,258 @@ +-- require'nvim-web-devicons'.setup() + +local gl = require('galaxyline') +local gls = gl.section +gl.short_line_list = {'LuaTree','vista','dbui'} + +local colors = { + bg = '#282c34', + yellow = '#fabd2f', + cyan = '#008080', + darkblue = '#081633', + green = '#608B4E', + orange = '#FF8800', + purple = '#5d4d7a', + magenta = '#d16d9e', + grey = '#c0c0c0', + blue = '#569CD6', + red = '#D16969' +} + +local buffer_not_empty = function() + if vim.fn.empty(vim.fn.expand('%:t')) ~= 1 then + return true + end + return false +end + +-- gls.left[1] = { +-- FirstElement = { +-- -- provider = function() return '▋' end, +-- provider = function() return ' ' end, +-- highlight = {colors.bg,colors.bg} +-- }, +-- } +-- gls.left[2] = { +-- ViMode = { +-- provider = function() +-- local alias = {n = 'NORMAL',i = 'INSERT',c= 'COMMAND',V= 'VISUAL', [''] = 'VISUAL'} +-- return alias[vim.fn.mode()] +-- end, +-- separator = ' ', +-- separator_highlight = {colors.yellow,function() +-- if not buffer_not_empty() then +-- return colors.purple +-- end +-- return colors.purple +-- end}, +-- highlight = {colors.grey,colors.purple,'bold'}, +-- }, +-- } +gls.left[2] = { + ViMode = { + provider = function() + -- auto change color according the vim mode + local mode_color = {n = colors.purple, + i = colors.green, + v = colors.blue, + [''] = colors.blue, + V = colors.blue, + c = colors.purple, + no = colors.magenta, + s = colors.orange, + S = colors.orange, + [''] = colors.orange, + ic = colors.yellow, + R = colors.red, + Rv = colors.red, + cv = colors.red, + ce=colors.red, + r = colors.cyan, + rm = colors.cyan, + ['r?'] = colors.cyan, + ['!'] = colors.red, + t = colors.red} + vim.api.nvim_command('hi GalaxyViMode guibg='..mode_color[vim.fn.mode()]) + return ' NVCode ' + end, + separator = ' ', + separator_highlight = {colors.yellow,function() + if not buffer_not_empty() then + return colors.bg + end + return colors.bg + end}, + highlight = {colors.grey,colors.bg,'bold'}, + }, +} +-- gls.left[3] ={ +-- FileIcon = { +-- separator = ' ', +-- provider = 'FileIcon', +-- condition = buffer_not_empty, +-- highlight = {require('galaxyline.provider_fileinfo').get_file_icon_color,colors.bg}, +-- }, +-- } +-- gls.left[4] = { +-- FileName = { +-- provider = {'FileSize'}, +-- condition = buffer_not_empty, +-- separator = ' ', +-- separator_highlight = {colors.purple,colors.bg}, +-- highlight = {colors.magenta,colors.bg} +-- } +-- } + +gls.left[3] = { + GitIcon = { + provider = function() return ' ' end, + condition = buffer_not_empty, + highlight = {colors.orange,colors.bg}, + } +} +gls.left[4] = { + GitBranch = { + provider = 'GitBranch', + separator = ' ', + separator_highlight = {colors.purple,colors.bg}, + condition = buffer_not_empty, + highlight = {colors.grey,colors.bg}, + } +} + +local checkwidth = function() + local squeeze_width = vim.fn.winwidth(0) / 2 + if squeeze_width > 40 then + return true + end + return false +end + +gls.left[5] = { + DiffAdd = { + provider = 'DiffAdd', + condition = checkwidth, + -- separator = ' ', + -- separator_highlight = {colors.purple,colors.bg}, + icon = '  ', + highlight = {colors.green,colors.bg}, + } +} +gls.left[6] = { + DiffModified = { + provider = 'DiffModified', + condition = checkwidth, + -- separator = ' ', + -- separator_highlight = {colors.purple,colors.bg}, + icon = '  ', + highlight = {colors.blue,colors.bg}, + } +} +gls.left[7] = { + DiffRemove = { + provider = 'DiffRemove', + condition = checkwidth, + -- separator = ' ', + -- separator_highlight = {colors.purple,colors.bg}, + icon = '  ', + highlight = {colors.red,colors.bg}, + } +} +gls.left[8] = { + LeftEnd = { + provider = function() return ' ' end, + separator = ' ', + separator_highlight = {colors.purple,colors.bg}, + highlight = {colors.purple,colors.bg} + } +} +gls.left[9] = { + DiagnosticError = { + provider = 'DiagnosticError', + icon = '  ', + highlight = {colors.red,colors.bg} + } +} +gls.left[10] = { + Space = { + provider = function () return '' end + } +} +gls.left[11] = { + DiagnosticWarn = { + provider = 'DiagnosticWarn', + icon = '  ', + highlight = {colors.yellow,colors.bg}, + } +} +gls.left[12] = { + DiagnosticHint = { + provider = 'DiagnosticHint', + icon = '  ', + highlight = {colors.blue,colors.bg}, + } +} +gls.left[13] = { + DiagnosticInfo = { + provider = 'DiagnosticInfo', + icon = '  ', + highlight = {colors.orange,colors.bg}, + } +} +gls.right[1]= { + FileFormat = { + provider = 'FileFormat', + separator = ' ', + separator_highlight = {colors.bg,colors.bg}, + highlight = {colors.grey,colors.bg}, + } +} +gls.right[2] = { + LineInfo = { + provider = 'LineColumn', + separator = ' | ', + separator_highlight = {colors.darkblue,colors.bg}, + highlight = {colors.grey,colors.bg}, + }, +} +gls.right[3] = { + PerCent = { + provider = 'LinePercent', + separator = ' |', + separator_highlight = {colors.darkblue,colors.bg}, + highlight = {colors.grey,colors.bg}, + } +} +gls.right[4] = { + ScrollBar = { + provider = 'ScrollBar', + highlight = {colors.yellow,colors.purple}, + } +} + +-- gls.short_line_left[1] = { +-- BufferType = { +-- provider = 'FileTypeName', +-- separator = ' ', +-- separator_highlight = {colors.purple,colors.bg}, +-- highlight = {colors.grey,colors.purple} +-- } +-- } + +gls.short_line_left[1] = { + LeftEnd = { + provider = function() return ' ' end, + separator = ' ', + separator_highlight = {colors.purple,colors.bg}, + highlight = {colors.purple,colors.bg} + } +} + +-- gls.short_line_right[1] = { +-- BufferIcon = { +-- provider= 'BufferIcon', +-- separator = ' ', +-- separator_highlight = {colors.purple,colors.bg}, +-- highlight = {colors.grey,colors.purple} +-- } +-- } diff --git a/lua/treesitter.lua b/lua/treesitter.lua index 106c373..b9549a4 100644 --- a/lua/treesitter.lua +++ b/lua/treesitter.lua @@ -2,7 +2,6 @@ require'nvim-treesitter.configs'.setup { ensure_installed = "all", -- one of "all", "maintained" (parsers with maintainers), or a list of languages highlight = { enable = true, -- false will disable the whole extension - disable = { "c", "rust" }, -- list of language that will be disabled }, } @@ -14,3 +13,21 @@ require "nvim-treesitter.configs".setup { persist_queries = false -- Whether the query persists across vim sessions } } + +-- require'nvim-treesitter.configs'.setup { +-- refactor = { +-- highlight_current_scope = { enable = false }, +-- }, +-- } + +-- require'nvim-treesitter.configs'.setup { +-- refactor = { +-- smart_rename = { +-- enable = true, +-- keymaps = { +-- smart_rename = "grr", +-- }, +-- }, +-- }, +-- } + diff --git a/plug-config/barbar.vim b/plug-config/barbar.vim new file mode 100644 index 0000000..73d1ce2 --- /dev/null +++ b/plug-config/barbar.vim @@ -0,0 +1,56 @@ +let bufferline = {} + +" Show a shadow over the editor in buffer-pick mode +let bufferline.shadow = v:true + +" Enable/disable icons +let bufferline.icons = v:true + +" Enables/disable clickable tabs +" - left-click: go to buffer +" - middle-click: delete buffer +" +" NOTE disabled by default because this might cause E541 (too many items) +" if you have many tabs open +let bufferline.clickable = v:true + +" If set, the letters for each buffer in buffer-pick mode will be +" assigned based on their name. Otherwise or in case all letters are +" already assigned, the behavior is to assign letters in order of +" usability (see order below) +let bufferline.semantic_letters = v:true + +" New buffer letters are assigned in this order. This order is +" optimal for the qwerty keyboard layout but might need adjustement +" for other layouts. +let bufferline.letters = + \ 'asdfjkl;ghnmxcbziowerutyqpASDFJKLGHNMXCBZIOWERUTYQP' + +let bg_current = get(nvim_get_hl_by_name('Normal', 1), 'background', '#000000') +let bg_visible = get(nvim_get_hl_by_name('TabLineSel', 1), 'background', '#000000') +let bg_inactive = get(nvim_get_hl_by_name('TabLine', 1), 'background', '#000000') + +" For the current active buffer +hi default link BufferCurrent Normal +" For the current active buffer when modified +hi default link BufferCurrentMod Normal +" For the current active buffer icon +hi default link BufferCurrentSign Normal +" For the current active buffer target when buffer-picking +exe 'hi default BufferCurrentTarget guifg=red gui=bold guibg=' . bg_current + +" For buffers visible but not the current one +hi default link BufferVisible TabLineSel +hi default link BufferVisibleMod TabLineSel +hi default link BufferVisibleSign TabLineSel +exe 'hi default BufferVisibleTarget guifg=red gui=bold guibg=' . bg_visible + +" For buffers invisible buffers +hi default link BufferInactive TabLine +hi default link BufferInactiveMod TabLine +hi default link BufferInactiveSign TabLine +exe 'hi default BufferInactiveTarget guifg=red gui=bold guibg=' . bg_inactive + + +" For the shadow in buffer-picking mode +hi default BufferShadow guifg=#000000 guibg=#000000 diff --git a/plug-config/easymotion.vim b/plug-config/easymotion.vim index 7a665c0..3778f2e 100644 --- a/plug-config/easymotion.vim +++ b/plug-config/easymotion.vim @@ -1,6 +1,8 @@ " let g:EasyMotion_do_mapping = 0 " Disable default mappings " " Turn on case-insensitive feature -" let g:EasyMotion_smartcase = 1 +let g:EasyMotion_smartcase = 1 +let g:EasyMotion_verbose = 0 +let g:EasyMotion_do_shade = 0 " " JK motions: Line motions " map j (easymotion-j) @@ -15,10 +17,10 @@ " nmap f (easymotion-overwin-f) " s{char}{char} to move to {char}{char} -nmap s (easymotion-s2) +nmap s (easymotion-s2) +nmap S (easymotion-overwin-f2) " map n (easymotion-next) " map N (easymotion-prev) -" nmap s (easymotion-overwin-f2) " nmap S (easymotion-overwin-t) " Move to line @@ -31,9 +33,7 @@ nmap s (easymotion-s2) " hi link EasyMotionTarget ErrorMsg " hi link EasyMotionShade Comment - -" hi link EasyMotionTarget2First MatchParen -" hi link EasyMotionTarget2Second MatchParen +let g:EasyMotion_prompt = '🔎 ' " hi link EasyMotionMoveHL Search " hi link EasyMotionIncSearch Search diff --git a/plug-config/minimap.vim b/plug-config/minimap.vim new file mode 100644 index 0000000..f518276 --- /dev/null +++ b/plug-config/minimap.vim @@ -0,0 +1,6 @@ +let g:minimap_auto_start=0 +let g:minimap_width 10 +let g:minimap_highlight=#4ec9b0 +let g:minimap_base_highlight=#1e1e1e +let g:minimap_block_filetypes=['fugitive', 'nerdtree'] +let g:minimap_left=0 diff --git a/plug-config/neovide.vim b/plug-config/neovide.vim new file mode 100644 index 0000000..0204b37 --- /dev/null +++ b/plug-config/neovide.vim @@ -0,0 +1,3 @@ +set guifont=FiraCode\ Nerd\ Font\ Mono:h22 +" set guifont=Hack\ Nerd\ Font:h22 +" set guifont=Noto\ Color\ Emoji:h22 diff --git a/plug-config/xtabline.vim b/plug-config/xtabline.vim index a9e52f6..3436c60 100644 --- a/plug-config/xtabline.vim +++ b/plug-config/xtabline.vim @@ -37,3 +37,19 @@ let g:xtabline_settings.icons = { \'lens': '🔍', \'flag': '🏁', \} +" let g:which_key_map.T = { +" \ 'name' : '+tabline' , +" \ 'b' : [':XTabListBuffers' , 'list buffers'], +" \ 'd' : [':XTabCloseBuffer' , 'close buffer'], +" \ 'D' : [':XTabDeleteTab' , 'close tab'], +" \ 'h' : [':XTabHideBuffer' , 'hide buffer'], +" \ 'i' : [':XTabInfo' , 'info'], +" \ 'l' : [':XTabLock' , 'lock tab'], +" \ 'm' : [':XTabMode' , 'toggle mode'], +" \ 'n' : [':tabNext' , 'next tab'], +" \ 'N' : [':XTabMoveBufferNext' , 'buffer->'], +" \ 't' : [':tabnew' , 'new tab'], +" \ 'p' : [':tabprevious' , 'prev tab'], +" \ 'P' : [':XTabMoveBufferPrev' , '<-buffer'], +" \ 'x' : [':XTabPinBuffer' , 'pin buffer'], +" \ } diff --git a/themes/airline.vim b/themes/airline.vim index aa29bf8..55eca31 100644 --- a/themes/airline.vim +++ b/themes/airline.vim @@ -38,7 +38,7 @@ let g:airline#extensions#default#layout = [['a', 'b', 'c'], ['x', 'z', 'warning' " Switch to your current theme -" let g:airline_theme = 'onedark' +let g:airline_theme = 'one' " Always show tabs set showtabline=2 diff --git a/themes/nvcode.vim b/themes/nvcode.vim index 4126e77..54bff9b 100644 --- a/themes/nvcode.vim +++ b/themes/nvcode.vim @@ -10,12 +10,14 @@ "autocmd ColorScheme * call onedark#set_highlight("Normal", { "fg": s:white }) " `bg` will not be styled since there is no `bg` setting hi Comment cterm=italic -let g:nvcode_hide_endofbuffer=1 -let g:nvcode_terminal_italics=1 let g:nvcode_termcolors=256 syntax on +" colorscheme nord colorscheme nvcode +" colorscheme onedark +" colorscheme TSnazzy +" colorscheme aurora " checks if your terminal has 24-bit color support if (has("termguicolors")) diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index da8d90c..a2b31fc 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -23,15 +23,15 @@ call plug#begin('~/.config/nvim/autoload/plugged') if exists('g:vscode') " Easy motion for VSCode - Plug 'asvetliakov/vim-easymotion' + " Plug 'asvetliakov/vim-easymotion' + Plug 'ChristianChiarulli/vscode-easymotion' Plug 'machakann/vim-highlightedyank' else - " Sneak - Plug 'justinmk/vim-sneak' + + " Easymotion + Plug 'easymotion/vim-easymotion' " Surround Plug 'tpope/vim-surround' - " Files - Plug 'tpope/vim-eunuch' " Have the file system follow you around Plug 'airblade/vim-rooter' " auto set indent setting @@ -41,11 +41,9 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'sheerun/vim-polyglot' " Treesitter Plug 'nvim-treesitter/nvim-treesitter' - Plug 'nvim-treesitter/nvim-treesitter-refactor' - Plug 'nvim-treesitter/nvim-treesitter-textobjects' Plug 'nvim-treesitter/playground' - Plug 'romgrk/nvim-treesitter-context' " Cool Icons + Plug 'kyazdani42/nvim-web-devicons' Plug 'ryanoasis/vim-devicons' " Auto pairs for '(' '[' '{' Plug 'jiangmiao/auto-pairs' @@ -54,16 +52,13 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Themes Plug 'christianchiarulli/nvcode-color-schemes.vim' " Plug 'kyazdani42/blue-moon' - Plug 'NLKNguyen/papercolor-theme' - Plug 'morhetz/gruvbox' - Plug 'phanviet/vim-monokai-pro' + " Plug 'NLKNguyen/papercolor-theme' + " Plug 'morhetz/gruvbox' + " Plug 'phanviet/vim-monokai-pro' " Intellisense Plug 'neoclide/coc.nvim', {'branch': 'release'} - Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'} " Status Line - Plug 'vim-airline/vim-airline' - Plug 'vim-airline/vim-airline-themes' - Plug 'Yavor-Ivanov/airline-monokai-subtle.vim' + Plug 'glepnir/galaxyline.nvim' " Ranger Plug 'kevinhwang91/rnvimr' "fzf @@ -90,22 +85,19 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'mattn/emmet-vim' " Interactive code Plug 'metakirby5/codi.vim' - " Debugging - " Plug 'puremourning/vimspector' " Better tabline - Plug 'mg979/vim-xtabline' + Plug 'romgrk/barbar.nvim' " undo time travel Plug 'mbbill/undotree' " Find and replace Plug 'ChristianChiarulli/far.vim' - " Plug 'brooth/far.vim' " Auto change html tags Plug 'AndrewRadev/tagalong.vim' " live server Plug 'turbio/bracey.vim' " Smooth scroll Plug 'psliwka/vim-smoothie' - " asynt tasks + " async tasks Plug 'skywind3000/asynctasks.vim' Plug 'skywind3000/asyncrun.vim' " Swap windows @@ -117,57 +109,72 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'mattn/webapi-vim' " Colorizer Plug 'norcalli/nvim-colorizer.lua' + " Intuitive buffer closing + Plug 'moll/vim-bbye' + " Auto refresh + Plug 'djoshea/vim-autoread' " Rainbow " Plug 'luochen1990/rainbow' " Async Linting Engine " TODO make sure to add ale config before plugin " Plug 'dense-analysis/ale' " Better Whitespace - Plug 'ntpeters/vim-better-whitespace' + " Plug 'ntpeters/vim-better-whitespace' " Multiple Cursors " TODO add this back in change from C-n " Plug 'mg979/vim-visual-multi', {'branch': 'master'} - Plug 'moll/vim-bbye' " Plug 'yuezk/vim-js' " Plug 'maxmellon/vim-jsx-pretty' " Plug 'jelera/vim-javascript-syntax' " Python jupyter - Plug 'goerz/jupytext.vim' - " Auto refresh - Plug 'djoshea/vim-autoread' + " Plug 'goerz/jupytext.vim' - " Plugin Graveyard + " Plugin Graveyard - " Typescript syntax - " Plug 'HerringtonDarkholme/yats.vim' - " Multiple Cursors - " Plug 'terryma/vim-multiple-cursors' - " Async Linting Engine - " Plug 'kaicataldo/material.vim' - " Plug 'NLKNguyen/papercolor-theme' - " Plug 'tomasiser/vim-code-dark' - " Vim Wiki - " Plug 'https://github.com/vimwiki/vimwiki.git' - " Better Comments - " Plug 'jbgutierrez/vim-better-comments' - " Echo doc - " Plug 'Shougo/echodoc.vim' - " Plug 'hardcoreplayers/spaceline.vim' - " Plug 'vim-airline/vim-airline-themes' + " Debug + " Plug 'mfussenegger/nvim-dap' + " Plug 'nvim-dap-virtual-text' + " Sneak + " Plug 'justinmk/vim-sneak' + " Files + " Plug 'tpope/vim-eunuch' + " Plug 'nvim-treesitter/nvim-treesitter-refactor' + " Plug 'nvim-treesitter/nvim-treesitter-textobjects' + " Plug 'romgrk/nvim-treesitter-context' + " Minimap + " Plug 'wfxr/minimap.vim' + " Plug 'romgrk/lib.kom' + " Plug 'brooth/far.vim' + " Typescript syntax + " Plug 'HerringtonDarkholme/yats.vim' + " Multiple Cursors + " Plug 'terryma/vim-multiple-cursors' + " Async Linting Engine + " Plug 'tomasiser/vim-code-dark' + " Plug 'mg979/vim-xtabline' + " Vim Wiki + " Plug 'https://github.com/vimwiki/vimwiki.git' + " Better Comments + " Plug 'jbgutierrez/vim-better-comments' + " Echo doc + " Plug 'Shougo/echodoc.vim' + " Plug 'hardcoreplayers/spaceline.vim' + " Plug 'vim-airline/vim-airline-themes' " Plug 'kaicataldo/material.vim', { 'branch': 'main' } - " Plug 'arcticicestudio/nord-vim' - " Ranger - " Plug 'francoiscabrol/ranger.vim' - " Plug 'rbgrouleff/bclose.vim' - " Making stuff - " Plug 'neomake/neomake' - " Plug 'mhinz/vim-signify' - " Plug 'easymotion/vim-easymotion' - " Plug 'preservim/nerdcommenter' - " Plug 'atishay/far.vim' - " Combine with Tmux - " Plug 'christoomey/vim-tmux-navigator' - " Plug 'cjrh/vim-conda' + " Ranger + " Plug 'francoiscabrol/ranger.vim' + " Plug 'rbgrouleff/bclose.vim' + " Making stuff + " Plug 'neomake/neomake' + " Plug 'mhinz/vim-signify' + " Plug 'preservim/nerdcommenter' + " Plug 'atishay/far.vim' + " Combine with Tmux + " Plug 'christoomey/vim-tmux-navigator' + " Plug 'cjrh/vim-conda' + " Debugging + " Plug 'puremourning/vimspector' + " Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'} endif "Add Plug end here