Chris 4 年之前
父节点
当前提交
77eb63b9cd
共有 4 个文件被更改,包括 52 次插入51 次删除
  1. 18 17
      keys/which-key.vim
  2. 15 17
      lua/treesitter.lua
  3. 1 0
      themes/nvcode.vim
  4. 18 17
      vim-plug/plugins.vim

+ 18 - 17
keys/which-key.vim

@@ -40,6 +40,7 @@ let g:which_key_map['n'] = [ ':let @/ = ""'                       , 'no highligh
 let g:which_key_map['p'] = [ ':Files'                             , 'search files' ]
 let g:which_key_map['p'] = [ ':Files'                             , 'search files' ]
 let g:which_key_map['q'] = [ 'q'                                  , 'quit' ]
 let g:which_key_map['q'] = [ 'q'                                  , 'quit' ]
 let g:which_key_map['r'] = [ ':RnvimrToggle'                      , 'ranger' ]
 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['u'] = [ ':UndotreeToggle'                    , 'undo tree']
 let g:which_key_map['v'] = [ '<C-W>v'                             , 'split right']
 let g:which_key_map['v'] = [ '<C-W>v'                             , 'split right']
 let g:which_key_map['W'] = [ 'w'                                  , 'write' ]
 let g:which_key_map['W'] = [ 'w'                                  , 'write' ]
@@ -255,23 +256,23 @@ let g:which_key_map.t = {
       \ 's' : [':FloatermNew ncdu'                              , 'ncdu'],
       \ 's' : [':FloatermNew ncdu'                              , 'ncdu'],
       \ }
       \ }
 
 
-" 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'],
-      \ }
+" " 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'],
+"       \ }
 
 
 " w is for wiki
 " w is for wiki
 let g:which_key_map.w = {
 let g:which_key_map.w = {

+ 15 - 17
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
   ensure_installed = "all", -- one of "all", "maintained" (parsers with maintainers), or a list of languages
   highlight = {
   highlight = {
     enable = true,              -- false will disable the whole extension
     enable = true,              -- false will disable the whole extension
-    disable = { "c", "rust" },  -- list of language that will be disabled
   },
   },
 }
 }
 
 
@@ -15,21 +14,20 @@ require "nvim-treesitter.configs".setup {
   }
   }
 }
 }
 
 
-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",
-      },
-    },
-  },
-}
+-- 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",
+--       },
+--     },
+--   },
+-- }
 
 

+ 1 - 0
themes/nvcode.vim

@@ -2,6 +2,7 @@ hi Comment cterm=italic
 let g:nvcode_termcolors=256
 let g:nvcode_termcolors=256
 
 
 syntax on
 syntax on
+" colorscheme nord
 colorscheme nvcode
 colorscheme nvcode
 " colorscheme onedark
 " colorscheme onedark
 
 

+ 18 - 17
vim-plug/plugins.vim

@@ -31,17 +31,10 @@ call plug#begin('~/.config/nvim/autoload/plugged')
   else
   else
 
 
 
 
-    " Debug
-    " Plug 'mfussenegger/nvim-dap'
-    " Plug 'nvim-dap-virtual-text'
-    " Sneak
-    " Plug 'justinmk/vim-sneak'
     " Easymotion
     " Easymotion
     Plug 'easymotion/vim-easymotion'
     Plug 'easymotion/vim-easymotion'
     " Surround
     " Surround
     Plug 'tpope/vim-surround'
     Plug 'tpope/vim-surround'
-    " Files
-    Plug 'tpope/vim-eunuch'
     " Have the file system follow you around
     " Have the file system follow you around
     Plug 'airblade/vim-rooter'
     Plug 'airblade/vim-rooter'
     " auto set indent settings
     " auto set indent settings
@@ -50,12 +43,7 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     Plug 'sheerun/vim-polyglot'
     Plug 'sheerun/vim-polyglot'
     " Treesitter
     " Treesitter
     Plug 'nvim-treesitter/nvim-treesitter'
     Plug 'nvim-treesitter/nvim-treesitter'
-    Plug 'nvim-treesitter/nvim-treesitter-refactor'
-    Plug 'nvim-treesitter/nvim-treesitter-textobjects'
     Plug 'nvim-treesitter/playground'
     Plug 'nvim-treesitter/playground'
-    Plug 'romgrk/nvim-treesitter-context'
-    " Minimap
-    " Plug 'wfxr/minimap.vim'
     " Cool Icons
     " Cool Icons
     Plug 'kyazdani42/nvim-web-devicons'
     Plug 'kyazdani42/nvim-web-devicons'
     Plug 'ryanoasis/vim-devicons'
     Plug 'ryanoasis/vim-devicons'
@@ -96,20 +84,18 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     " Interactive code
     " Interactive code
     Plug 'metakirby5/codi.vim'
     Plug 'metakirby5/codi.vim'
     " Better tabline
     " Better tabline
-    Plug 'romgrk/lib.kom'
     Plug 'romgrk/barbar.nvim'
     Plug 'romgrk/barbar.nvim'
     " undo time travel
     " undo time travel
     Plug 'mbbill/undotree'
     Plug 'mbbill/undotree'
     " Find and replace
     " Find and replace
     Plug 'ChristianChiarulli/far.vim'
     Plug 'ChristianChiarulli/far.vim'
-    " Plug 'brooth/far.vim'
     " Auto change html tags
     " Auto change html tags
     Plug 'AndrewRadev/tagalong.vim'
     Plug 'AndrewRadev/tagalong.vim'
     " live server
     " live server
     Plug 'turbio/bracey.vim'
     Plug 'turbio/bracey.vim'
     " Smooth scroll
     " Smooth scroll
     Plug 'psliwka/vim-smoothie'
     Plug 'psliwka/vim-smoothie'
-    " async tasks
+    " " async tasks
     Plug 'skywind3000/asynctasks.vim'
     Plug 'skywind3000/asynctasks.vim'
     Plug 'skywind3000/asyncrun.vim'
     Plug 'skywind3000/asyncrun.vim'
     " Swap windows
     " Swap windows
@@ -121,22 +107,33 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     Plug 'mattn/webapi-vim'
     Plug 'mattn/webapi-vim'
     " Colorizer
     " Colorizer
     Plug 'norcalli/nvim-colorizer.lua'
     Plug 'norcalli/nvim-colorizer.lua'
+    " Intuitive buffer closing
+    Plug 'moll/vim-bbye'
     " Rainbow brackets
     " Rainbow brackets
     " Plug 'luochen1990/rainbow'
     " Plug 'luochen1990/rainbow'
     " Async Linting Engine
     " Async Linting Engine
     " TODO make sure to add ale config before plugin
     " TODO make sure to add ale config before plugin
     " Plug 'dense-analysis/ale'
     " Plug 'dense-analysis/ale'
     " Better Whitespace
     " Better Whitespace
-    Plug 'ntpeters/vim-better-whitespace'
+    " Plug 'ntpeters/vim-better-whitespace'
     " Multiple Cursors
     " Multiple Cursors
     " TODO add this back in change from C-n
     " TODO add this back in change from C-n
     " Plug 'mg979/vim-visual-multi', {'branch': 'master'}
     " Plug 'mg979/vim-visual-multi', {'branch': 'master'}
-    Plug 'moll/vim-bbye'
     " Plug 'yuezk/vim-js'
     " Plug 'yuezk/vim-js'
     " Plug 'maxmellon/vim-jsx-pretty'
     " Plug 'maxmellon/vim-jsx-pretty'
     " Plug 'jelera/vim-javascript-syntax'
     " Plug 'jelera/vim-javascript-syntax'
     " Plugin Graveyard
     " Plugin Graveyard
 
 
+    " Debug
+    " Plug 'mfussenegger/nvim-dap'
+    " Plug 'nvim-dap-virtual-text'
+    " Sneak
+    " Plug 'justinmk/vim-sneak'
+    " Plug 'nvim-treesitter/nvim-treesitter-refactor'
+    " Plug 'nvim-treesitter/nvim-treesitter-textobjects'
+    " Plug 'romgrk/nvim-treesitter-context'
+    " Minimap
+    " Plug 'wfxr/minimap.vim'
     " jsx syntax support
     " jsx syntax support
     " Typescript syntax
     " Typescript syntax
     " Plug 'HerringtonDarkholme/yats.vim'
     " Plug 'HerringtonDarkholme/yats.vim'
@@ -146,6 +143,8 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     " Plug 'NLKNguyen/papercolor-theme'
     " Plug 'NLKNguyen/papercolor-theme'
     " Plug 'tomasiser/vim-code-dark'
     " Plug 'tomasiser/vim-code-dark'
     " Plug 'mg979/vim-xtabline'
     " Plug 'mg979/vim-xtabline'
+    " Files
+    " Plug 'tpope/vim-eunuch'
     " Vim Wiki
     " Vim Wiki
     " Plug 'https://github.com/vimwiki/vimwiki.git'
     " Plug 'https://github.com/vimwiki/vimwiki.git'
     " Better Comments
     " Better Comments
@@ -165,6 +164,8 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     " Plug 'preservim/nerdcommenter'
     " Plug 'preservim/nerdcommenter'
     " Plug 'brooth/far.vim'
     " Plug 'brooth/far.vim'
     " Plug 'atishay/far.vim'
     " Plug 'atishay/far.vim'
+    " Plug 'romgrk/lib.kom'
+    " Plug 'brooth/far.vim'
     " Debugging
     " Debugging
     " Plug 'puremourning/vimspector'
     " Plug 'puremourning/vimspector'
   endif
   endif