diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | init.lua | 1 | ||||
| -rw-r--r-- | lua/nv-neogit/init.lua | 5 | ||||
| -rw-r--r-- | lua/plugins.lua | 28 | ||||
| -rw-r--r-- | vimscript/nv-whichkey/init.vim | 20 |
5 files changed, 25 insertions, 31 deletions
@@ -26,7 +26,7 @@ After installation run `nvim` and then `:PackerInstall` ## Get the latest version of Neovim -``` bash +```bash cd ~ sudo rm -r neovim git clone https://github.com/neovim/neovim @@ -20,7 +20,6 @@ require('nv-emmet') require('nv-quickscope') require('nv-gitsigns') require('nv-autopairs') -require('nv-neogit') require('nv-comment') require('nv-rnvimr') require('nv-telescope') diff --git a/lua/nv-neogit/init.lua b/lua/nv-neogit/init.lua deleted file mode 100644 index f5337749..00000000 --- a/lua/nv-neogit/init.lua +++ /dev/null @@ -1,5 +0,0 @@ -local neogit = require('neogit') - -neogit.setup {} - ---neogit.status.create("floating") diff --git a/lua/plugins.lua b/lua/plugins.lua index b00a78fd..06cad5b4 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -19,10 +19,10 @@ return require('packer').startup(function(use) use 'wbthomason/packer.nvim' -- Information - use 'nanotee/nvim-lua-guide' + -- use 'nanotee/nvim-lua-guide' -- Quality of life improvements - use 'norcalli/nvim_utils' + -- use 'norcalli/nvim_utils' -- LSP use 'neovim/nvim-lspconfig' @@ -44,8 +44,6 @@ return require('packer').startup(function(use) -- Treesitter use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} - use 'nvim-treesitter/nvim-treesitter-refactor' - use 'nvim-treesitter/playground' use 'p00f/nvim-ts-rainbow' use {'lukas-reineke/indent-blankline.nvim', branch = 'lua'} use 'JoosepAlviste/nvim-ts-context-commentstring' @@ -74,7 +72,7 @@ return require('packer').startup(function(use) use 'sheerun/vim-polyglot' -- Git - use 'TimUntersberger/neogit' + -- use 'TimUntersberger/neogit' use {'lewis6991/gitsigns.nvim', requires = {'nvim-lua/plenary.nvim'}} use 'f-person/git-blame.nvim' use 'tpope/vim-fugitive' @@ -87,15 +85,15 @@ return require('packer').startup(function(use) -- Webdev -- TODO add back when I learn it better -- use 'gennaro-tedesco/nvim-jqx' - use 'turbio/bracey.vim' + -- use 'turbio/bracey.vim' -- Registers - use 'gennaro-tedesco/nvim-peekup' + -- use 'gennaro-tedesco/nvim-peekup' -- Navigation - use 'unblevable/quick-scope' + use 'unblevable/quick-scope' -- hop may replace you use 'phaazon/hop.nvim' - use 'kevinhwang91/rnvimr' + use 'kevinhwang91/rnvimr' -- telescope may fully replace you -- General Plugins use 'liuchengxu/vim-which-key' @@ -103,18 +101,13 @@ return require('packer').startup(function(use) use 'airblade/vim-rooter' use 'ChristianChiarulli/dashboard-nvim' use 'metakirby5/codi.vim' - use 'psliwka/vim-smoothie' - use 'moll/vim-bbye' use {'iamcco/markdown-preview.nvim', run = 'cd app && npm install'} use 'voldikss/vim-floaterm' - use 'liuchengxu/vista.vim' use 'terrortylor/nvim-comment' - use 'bfredl/nvim-miniyank' use 'monaqa/dial.nvim' use 'junegunn/goyo.vim' use 'andymass/vim-matchup' use 'MattesGroeger/vim-bookmarks' - use 'brooth/far.vim' use 'windwp/nvim-autopairs' -- TODO put this back when stable for indent lines @@ -148,4 +141,11 @@ return require('packer').startup(function(use) -- use 'nelstrom/vim-visual-star-search' -- TODO switch back when config support snips -- use 'cohama/lexima.vim' + -- use 'bfredl/nvim-miniyank' + -- use 'brooth/far.vim' + -- use 'liuchengxu/vista.vim' + -- use 'psliwka/vim-smoothie' + -- use 'nvim-treesitter/nvim-treesitter-refactor' + -- use 'nvim-treesitter/playground' + -- use 'moll/vim-bbye' end) diff --git a/vimscript/nv-whichkey/init.vim b/vimscript/nv-whichkey/init.vim index 0fcd8a2f..6230dc5c 100644 --- a/vimscript/nv-whichkey/init.vim +++ b/vimscript/nv-whichkey/init.vim @@ -66,14 +66,14 @@ let g:which_key_map.a = { \ 'c' : [':ColorizerToggle' , 'colorizer'], \ 'h' : [':let @/ = ""' , 'remove search highlight'], \ 'i' : [':IndentBlanklineToggle' , 'toggle indent lines'], - \ 'l' : [':Bracey' , 'start live server'], - \ 'L' : [':BraceyStop' , 'stop live server'], \ 'n' : [':set nonumber!' , 'line-numbers'], \ 's' : [':s/\%V\(.*\)\%V/"\1"/' , 'surround'], \ 'r' : [':set norelativenumber!' , 'relative line nums'], \ 'v' : [':Codi' , 'virtual repl on'], \ 'V' : [':Codi!' , 'virtual repl off'], \ } + " \ 'l' : [':Bracey' , 'start live server'], + " \ 'L' : [':BraceyStop' , 'stop live server'], " b is for buffer let g:which_key_map.b = { @@ -81,7 +81,7 @@ let g:which_key_map.b = { \ '>' : [':BufferMoveNext' , 'move next'], \ '<' : [':BufferMovePrevious' , 'move prev'], \ 'b' : [':BufferPick' , 'pick buffer'], - \ 'd' : [':Bdelete' , 'delete-buffer'], + \ 'd' : [':BufferClose' , 'delete-buffer'], \ 'n' : ['bnext' , 'next-buffer'], \ 'p' : ['bprevious' , 'previous-buffer'], \ '?' : ['Buffers' , 'fzf-buffer'], @@ -160,7 +160,6 @@ let g:which_key_map.g = { \ 'j' : [':NextHunk' , 'next hunk'], \ 'k' : [':PrevHunk' , 'prev hunk'], \ 'l' : [':Git log' , 'log'], - \ 'n' : [':Neogit' , 'neogit'], \ 'p' : [':PreviewHunk' , 'preview hunk'], \ 'r' : [':ResetHunk' , 'reset hunk'], \ 'R' : [':ResetBuffer' , 'reset buffer'], @@ -168,6 +167,7 @@ let g:which_key_map.g = { \ 'S' : [':Gstatus' , 'status'], \ 'u' : [':UndoStageHunk' , 'undo stage hunk'], \ } + " \ 'n' : [':Neogit' , 'neogit'], " G is for gist let g:which_key_map.G = { @@ -195,7 +195,6 @@ let g:which_key_map.l = { \ 'v' : [':LspVirtualTextToggle' , 'lsp toggle virtual text'], \ 'l' : [':Lspsaga lsp_finder' , 'lsp finder'], \ 'L' : [':Lspsaga show_line_diagnostics' , 'line_diagnostics'], - \ 'o' : [':Vista!!' , 'outline'], \ 'p' : [':Lspsaga preview_definition' , 'preview definition'], \ 'q' : [':Telescope quickfix' , 'quickfix'], \ 'r' : [':Lspsaga rename' , 'rename'], @@ -205,6 +204,7 @@ let g:which_key_map.l = { \ 'S' : [':Telescope lsp_workspace_symbols' , 'workspace symbols'], \ } " \ 'H' : [':Lspsaga signature_help' , 'signature_help'], + " \ 'o' : [':Vista!!' , 'outline'], " t is for terminal let g:which_key_map.t = { @@ -223,10 +223,10 @@ let g:which_key_map.t = { \ } " \ 'r' : [':FloatermNew ranger' , 'ranger'], -let g:which_key_map.R = { - \ 'name' : '+Find_Replace' , - \ 'f' : [':Farr --source=vimgrep' , 'file'], - \ 'p' : [':Farr --source=rgnvim' , 'project'], - \ } +" let g:which_key_map.R = { +" \ 'name' : '+Find_Replace' , +" \ 'f' : [':Farr --source=vimgrep' , 'file'], +" \ 'p' : [':Farr --source=rgnvim' , 'project'], +" \ } call which_key#register('<Space>', "g:which_key_map") |