From f116ecac181084351fa1aebf9b625645e67b66b9 Mon Sep 17 00:00:00 2001
From: Daniil Tsivinsky <daniil@tsivinsky.com>
Date: Thu, 14 Oct 2021 21:03:29 +0300
Subject: [PATCH] Move general settings and plugins out of init.vim

---
 nvim/coc.vim       | 11 ++++++++
 nvim/file-tree.vim |  1 +
 nvim/general.vim   | 23 ++++++++++++++++
 nvim/init.vim      | 65 +++++++---------------------------------------
 nvim/plugins.vim   | 19 ++++++++++++++
 nvim/remaps.vim    |  9 +++----
 6 files changed, 66 insertions(+), 62 deletions(-)
 create mode 100644 nvim/general.vim
 create mode 100644 nvim/plugins.vim

diff --git a/nvim/coc.vim b/nvim/coc.vim
index 32e3bf2..e38eb4e 100644
--- a/nvim/coc.vim
+++ b/nvim/coc.vim
@@ -61,3 +61,14 @@ let g:coc_global_extensions = [
 inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
 
 command! -nargs=0 Prettier :CocCommand prettier.formatFile
+
+" Use K to show documentation in preview window
+nnoremap <silent> K :call <SID>show_documentation()<CR>
+
+function! s:show_documentation()
+  if (index(['vim','help'], &filetype) >= 0)
+    execute 'h '.expand('<cword>')
+  else
+    call CocAction('doHover')
+  endif
+endfunction
diff --git a/nvim/file-tree.vim b/nvim/file-tree.vim
index 6cb10b3..ca9a0a4 100644
--- a/nvim/file-tree.vim
+++ b/nvim/file-tree.vim
@@ -7,6 +7,7 @@ let g:nvim_tree_ignore = [ '.git' ]
 let g:nvim_tree_add_trailing = 1
 let g:nvim_tree_quit_on_open = 1
 let g:nvim_tree_indent_markers = 1
+let g:nvim_tree_refresh_wait = 500
 let g:nvim_tree_show_icons = {
     \ 'git': 0,
     \ 'folders': 0,
diff --git a/nvim/general.vim b/nvim/general.vim
new file mode 100644
index 0000000..d1621dd
--- /dev/null
+++ b/nvim/general.vim
@@ -0,0 +1,23 @@
+syntax on
+
+set tabstop=2
+set shiftwidth=2
+set expandtab
+
+set number
+set relativenumber
+set wrap
+set noswapfile
+set encoding=utf-8
+set hidden
+set nowritebackup
+set cmdheight=2
+set updatetime=300
+set shortmess+=c
+set mouse=nv
+set cursorline
+
+set termguicolors
+
+" MY LEADER KEY IS GONNA BE A SPACE
+let mapleader = " "
diff --git a/nvim/init.vim b/nvim/init.vim
index 236d651..38e00bd 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -1,49 +1,9 @@
-" mark: modules
-call plug#begin('~/.config/nvim/plugged')
-
-Plug 'ayu-theme/ayu-vim'
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
-
-Plug 'tpope/vim-commentary'
-Plug 'neoclide/coc.nvim', {'branch': 'release'}
-Plug 'kyazdani42/nvim-tree.lua'
-Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && yarn install'  }
-Plug 'akinsho/bufferline.nvim'
-Plug 'alvan/vim-closetag'
-Plug 'turbio/bracey.vim', { 'do': 'npm install --prefix server' }
-Plug 'folke/zen-mode.nvim'
-Plug 'kyazdani42/nvim-web-devicons'
-Plug 'kevinoid/vim-jsonc'
-Plug 'HerringtonDarkholme/yats.vim'
-Plug 'fatih/vim-go'
-
-call plug#end()
-
-" mark: general
-syntax on
-
-set tabstop=2
-set shiftwidth=2
-set expandtab
-
-set number
-set wrap
-set noswapfile
-set encoding=utf-8
-set hidden
-set nowritebackup
-set cmdheight=2
-set updatetime=300
-set shortmess+=c
-set mouse=nv
-set cursorline
-
-set termguicolors
-set guifont=Fira\ Code:h20
-
-" MY LEADER KEY IS GONNA BE A SPACE
-let mapleader = " "
+source $HOME/dotfiles/nvim/plugins.vim
+source $HOME/dotfiles/nvim/general.vim
+source $HOME/dotfiles/nvim/remaps.vim
+source $HOME/dotfiles/nvim/file-tree.vim
+source $HOME/dotfiles/nvim/coc.vim
+source $HOME/dotfiles/nvim/tabs.vim
 
 " Colorscheme
 let ayucolor = 'mirage'
@@ -53,16 +13,6 @@ colorscheme ayu
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_theme = 'ayu_mirage'
 
-" Zen Mode plugin
-lua require'zen-mode'.setup()
-
-
-source $HOME/dotfiles/nvim/file-tree.vim
-source $HOME/dotfiles/nvim/remaps.vim
-source $HOME/dotfiles/nvim/coc.vim
-source $HOME/dotfiles/nvim/tabs.vim
-
-
 " Filetypes for markdown extension
 let g:mkdp_filetypes = ['md', 'mdx', 'markdown']
 
@@ -80,3 +30,6 @@ let g:bracey_refresh_on_save = 1
 let g:bracey_server_allow_remote_connections = 1
 let g:bracey_server_port = 3000
 let g:bracey_eval_on_save = 1
+
+" Ignore files inside .git directory by CtrlP
+let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
diff --git a/nvim/plugins.vim b/nvim/plugins.vim
new file mode 100644
index 0000000..1c7821a
--- /dev/null
+++ b/nvim/plugins.vim
@@ -0,0 +1,19 @@
+call plug#begin('~/.config/nvim/plugged')
+
+Plug 'ayu-theme/ayu-vim'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+
+Plug 'tpope/vim-commentary'
+Plug 'neoclide/coc.nvim', {'branch': 'release'}
+Plug 'kyazdani42/nvim-tree.lua'
+Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && yarn install'  }
+Plug 'akinsho/bufferline.nvim'
+Plug 'alvan/vim-closetag'
+Plug 'turbio/bracey.vim', { 'do': 'npm install --prefix server' }
+Plug 'kyazdani42/nvim-web-devicons'
+Plug 'kevinoid/vim-jsonc'
+Plug 'fatih/vim-go'
+Plug 'ctrlpvim/ctrlp.vim'
+
+call plug#end()
diff --git a/nvim/remaps.vim b/nvim/remaps.vim
index 663e12b..36715b1 100644
--- a/nvim/remaps.vim
+++ b/nvim/remaps.vim
@@ -8,11 +8,8 @@ nnoremap <C-j> :m .+1<CR>==
 vnoremap K :m '<-2<CR>gv=gv
 vnoremap J :m '>+1<CR>gv=gv
 
-" Remap to toggle markdown preview
-nmap <C-m> <Plug>MarkdownPreviewToggle
-
-" FuzzyFinder
-nnoremap <leader>f :FZF<CR>
-
 " Zen Mode
 noremap <leader>z :ZenMode<CR>
+
+" Remove search highlighting
+noremap <leader>nh :nohl<CR>