summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keys/which-key.vim35
-rw-r--r--lua/treesitter.lua32
-rw-r--r--themes/nvcode.vim1
-rw-r--r--vim-plug/plugins.vim35
4 files changed, 52 insertions, 51 deletions
diff --git a/keys/which-key.vim b/keys/which-key.vim
index 55acaab3..412517a9 100644
--- a/keys/which-key.vim
+++ b/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['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'] = [ '<C-W>v' , 'split right']
let g:which_key_map['W'] = [ 'w' , 'write' ]
@@ -255,23 +256,23 @@ let g:which_key_map.t = {
\ '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
let g:which_key_map.w = {
diff --git a/lua/treesitter.lua b/lua/treesitter.lua
index 4506f9c3..b9549a46 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
},
}
@@ -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",
+-- },
+-- },
+-- },
+-- }
diff --git a/themes/nvcode.vim b/themes/nvcode.vim
index 9f010681..d36b82d0 100644
--- a/themes/nvcode.vim
+++ b/themes/nvcode.vim
@@ -2,6 +2,7 @@ hi Comment cterm=italic
let g:nvcode_termcolors=256
syntax on
+" colorscheme nord
colorscheme nvcode
" colorscheme onedark
diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim
index 58b19be7..305af954 100644
--- a/vim-plug/plugins.vim
+++ b/vim-plug/plugins.vim
@@ -31,17 +31,10 @@ call plug#begin('~/.config/nvim/autoload/plugged')
else
- " Debug
- " Plug 'mfussenegger/nvim-dap'
- " Plug 'nvim-dap-virtual-text'
- " 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 settings
@@ -50,12 +43,7 @@ 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'
- " Minimap
- " Plug 'wfxr/minimap.vim'
" Cool Icons
Plug 'kyazdani42/nvim-web-devicons'
Plug 'ryanoasis/vim-devicons'
@@ -96,20 +84,18 @@ call plug#begin('~/.config/nvim/autoload/plugged')
" Interactive code
Plug 'metakirby5/codi.vim'
" Better tabline
- Plug 'romgrk/lib.kom'
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'
- " async tasks
+ " " async tasks
Plug 'skywind3000/asynctasks.vim'
Plug 'skywind3000/asyncrun.vim'
" Swap windows
@@ -121,22 +107,33 @@ call plug#begin('~/.config/nvim/autoload/plugged')
Plug 'mattn/webapi-vim'
" Colorizer
Plug 'norcalli/nvim-colorizer.lua'
+ " Intuitive buffer closing
+ Plug 'moll/vim-bbye'
" Rainbow brackets
" 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'
" 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
" Typescript syntax
" Plug 'HerringtonDarkholme/yats.vim'
@@ -146,6 +143,8 @@ call plug#begin('~/.config/nvim/autoload/plugged')
" Plug 'NLKNguyen/papercolor-theme'
" Plug 'tomasiser/vim-code-dark'
" Plug 'mg979/vim-xtabline'
+ " Files
+ " Plug 'tpope/vim-eunuch'
" Vim Wiki
" Plug 'https://github.com/vimwiki/vimwiki.git'
" Better Comments
@@ -165,6 +164,8 @@ call plug#begin('~/.config/nvim/autoload/plugged')
" Plug 'preservim/nerdcommenter'
" Plug 'brooth/far.vim'
" Plug 'atishay/far.vim'
+ " Plug 'romgrk/lib.kom'
+ " Plug 'brooth/far.vim'
" Debugging
" Plug 'puremourning/vimspector'
endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-14 19:05:51 +0000