I no longer use vim... now I use nvim

2 files changed, 26 insertions, 7 deletions

diff --git a/.vimrc b/.vimrc
index 35db1fc..08c71b1 100644
--- a/.vimrc
+++ b/.vimrc
@@ -11,12 +11,18 @@ call vundle#begin()
 Plugin 'VundleVim/Vundle.vim'
 
 " Keep Plugin commands between vundle#begin/end.
-" LSP
+" Actual code
 Plugin 'dense-analysis/ale'
+Plugin 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+Plugin 'peterhoeg/vim-qml'
 " Utilities
-Plugin 'preservim/nerdtree'
+Plugin 'kyazdani42/nvim-web-devicons'
+Plugin 'kyazdani42/nvim-tree.lua'
+" Plugin 'preservim/nerdtree'
 Plugin 'reedes/vim-pencil'
 Plugin 'thaerkh/vim-workspace'
+Plugin 'nvim-lua/plenary.nvim'
+Plugin 'nvim-telescope/telescope.nvim'
 " Appearance
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
@@ -55,16 +61,19 @@ let g:airline_theme='onedark'
 
 inoremap <C-s> <esc>:w<CR>i<right>
 
-nnoremap <leader>f :NERDTreeFocus<CR>
-nnoremap <C-n> :NERDTree<CR>
-nnoremap <C-t> :NERDTreeToggle<CR>
-nnoremap <C-f> :NERDTreeFind<CR>
+nnoremap <leader>n :noh<CR>
+nnoremap <leader>b :!black %<CR>:e<CR>
 
 nnoremap <leader>s :ToggleWorkspace<CR>
 let g:workspace_session_directory = $HOME . '/.vim/sessions/'
 let g:workspace_session_disable_on_args = 1
 let g:workspace_autosave = 0
 
+nnoremap <leader>f :Telescope find_files<CR>
+nnoremap <leader>g :Telescope live_grep<CR>
+nnoremap <leader>fb :Telescope buffers<CR>
+nnoremap <leader>fh :Telescope help_tags<CR>
+
 nnoremap <leader>c :Cmus<CR>
 
 nnoremap <leader>p :PencilToggle<CR>
@@ -77,3 +86,13 @@ augroup pencil
 augroup END
 
 nnoremap <leader>a :ALEToggle<CR>
+
+nnoremap <C-e> :NvimTreeToggle<CR>
+nnoremap <leader>t :NvimTreeFocus<CR>
+nnoremap <leader>r :NvimTreeRefresh<CR>
+" NvimTreeOpen, NvimTreeClose, NvimTreeFocus, NvimTreeFindFileToggle, and NvimTreeResize are also available if you need them
+
+set termguicolors " this variable must be enabled for colors to be applied properly
+
+" a list of groups can be found at `:help nvim_tree_highlight`
+highlight NvimTreeFolderIcon guibg=blue
diff --git a/.zshrc b/.zshrc
index 45f3f3f..28416d3 100644
--- a/.zshrc
+++ b/.zshrc
@@ -12,7 +12,7 @@ plugins=(
 
 source $ZSH/oh-my-zsh.sh
 
-export EDITOR=/usr/bin/vim
+export EDITOR=/usr/bin/nvim
 export BROWSER=/usr/bin/firefox
 export PROJECT_PATHS=(~/Projects/ ~/Projects/_cloned/ ~/Projects/_archive/)
 export GOPROXY=https://proxy.golang.com.cn,direct