init.vim rework

7 files changed, 203 insertions, 1 deletions

diff --git a/.config/nvim/bindings.vim b/.config/nvim/bindings.vim
new file mode 100644
index 0000000..0165d7a
--- /dev/null
+++ b/.config/nvim/bindings.vim
@@ -0,0 +1,35 @@
+nnoremap c "_c
+nnoremap <M-;> :call NERDComment(0,"toggle")<CR>
+nnoremap <M-x> :
+nnoremap <M-1> :!
+nnoremap <silent> <M-k> :bprevious<CR>
+nnoremap <silent> <M-j> :bnext<CR>
+nnoremap <C-h> <C-w>h
+nnoremap <C-j> <C-w>j
+nnoremap <C-k> <C-w>k
+nnoremap <C-l> <C-w>l
+nnoremap <C-o> <C-w>o
+nnoremap <C-q> <C-w>q
+nnoremap <C-x>1 <C-w>o
+nnoremap <C-x>2 :sp<CR>
+nnoremap <C-x>3 :vsp<CR>
+nnoremap <C-x>0 <C-w>q
+nnoremap <silent> <leader>g :G<CR>
+nnoremap <silent> <leader>d :Vifm<CR>
+nnoremap <silent> <leader>e :Files<CR>
+nnoremap <silent> <leader>b :Buffers<CR>
+nnoremap <leader>s :w<CR>
+nnoremap <leader>w :w<CR>:bp<CR>:bd #<CR>
+nnoremap <leader>x :w<CR>:bp<CR>:bd #<CR>
+nmap <leader>1 <Plug>AirlineSelectTab1
+nmap <leader>2 <Plug>AirlineSelectTab2
+nmap <leader>3 <Plug>AirlineSelectTab3
+nmap <leader>4 <Plug>AirlineSelectTab4
+nmap <leader>5 <Plug>AirlineSelectTab5
+nmap <leader>6 <Plug>AirlineSelectTab6
+nmap <leader>7 <Plug>AirlineSelectTab7
+nmap <leader>8 <Plug>AirlineSelectTab8
+nmap <leader>9 <Plug>AirlineSelectTab9
+nmap <leader>0 <Plug>AirlineSelectTab10
+inoremap <expr> <C-j> pumvisible() ? "<C-n>" : "<C-j>"
+inoremap <expr> <C-k> pumvisible() ? "<C-p>" : "<C-k>"
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index cecdae0..00c792b 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -15,4 +15,3 @@ source /home/jozan/.config/nvim/sidebars.vim
 source /home/jozan/.config/nvim/plugins.vim
 source /home/jozan/.config/nvim/langs.vim
 source /home/jozan/.config/nvim/plug-config/coc.vim
-source ~/.vimrc
diff --git a/.config/nvim/langs.vim b/.config/nvim/langs.vim
new file mode 100644
index 0000000..b6dc412
--- /dev/null
+++ b/.config/nvim/langs.vim
@@ -0,0 +1,6 @@
+let g:asmsyntax = 'asm'
+let perl_include_pod = 1
+autocmd FileType perl
+			\  setlocal com-=:# kp=perldoc\ -f
+			\| compiler perl
+let g:perl_compiler_force_warnings = 1
diff --git a/.config/nvim/plug.vim b/.config/nvim/plug.vim
new file mode 100644
index 0000000..5b4a271
--- /dev/null
+++ b/.config/nvim/plug.vim
@@ -0,0 +1,26 @@
+call plug#begin('~/.vim/plugged')
+Plug 'brglng/vim-sidebar-manager'
+Plug 'honza/vim-snippets'
+Plug 'jceb/vim-orgmode'
+Plug 'jiangmiao/auto-pairs'
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf.vim'
+Plug 'luochen1990/rainbow'
+Plug 'mbbill/undotree'
+Plug 'mg979/vim-visual-multi'
+Plug 'mhinz/vim-signify'
+Plug 'mhinz/vim-startify'
+Plug 'morhetz/gruvbox'
+Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}
+Plug 'preservim/tagbar'
+Plug 'preservim/nerdcommenter'
+Plug 'preservim/nerdtree'
+Plug 'ryanoasis/vim-devicons'
+Plug 'sainnhe/gruvbox-material'
+Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-surround'
+Plug 'tpope/vim-speeddating'
+Plug 'vifm/vifm.vim'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+call plug#end()
diff --git a/.config/nvim/plugins.vim b/.config/nvim/plugins.vim
new file mode 100644
index 0000000..d597412
--- /dev/null
+++ b/.config/nvim/plugins.vim
@@ -0,0 +1,70 @@
+" Startify
+let g:startify_custom_header = startify#pad([
+			\ '  _____________________________________ ',
+			\ ' /                                     \',
+			\ ' |    Hi, partner, welcome_back to     |',
+			\ ' |  _ __   ___  _____   _(_)_ __ ___   |',
+			\ ' | | ''_ \ / _ \/ _ \ \ / / | ''_ ` _ \  |',
+			\ ' | | | | |  __/ (_) \ V /| | | | | | | |',
+			\ ' | |_| |_|\___|\___/ \_/ |_|_| |_| |_| |',
+			\ ' \                                     /',
+			\ '  ------------------------------------- ',
+			\ '         \   ^__^                       ',
+			\ '          \  (oo)\_______               ',
+			\ '             (__)\       )\/\           ',
+			\ '                 ||----w |              ',
+			\ '                 ||     ||              ',
+			\ ])
+let g:startify_lists = [
+			\ { 'type': 'sessions',  'header': startify#pad(['Sessions'])	},
+			\ { 'type': 'files',     'header': startify#pad(['Recent'])		},
+			\ { 'type': 'bookmarks', 'header': startify#pad(['Bookmarks'])	},
+			\ { 'type': 'commands',  'header': startify#pad(['Commands'])	},
+			\ ]
+let g:startify_bookmarks = [
+			\ { 'v': '~/.config/nvim/init.vim' },
+			\ { 'z': '~/.config/zsh/.zshrc' },
+			\ { 'b': '~/.config/bspwm/bspwmrc' },
+			\ ]
+
+" Airline
+let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#tabline#fnamemod = ':t'
+let g:airline_detect_modified = 1
+let g:airline_detect_paste = 1
+let g:airline_detect_crypt = 1
+let g:airline_theme = 'base16_gruvbox_dark_hard'
+let g:airline_powerline_fonts = 1
+let g:airline_symbols_ascii = 1
+let g:airline#parts#ffenc#skip_expected_string = 'utf-8[unix]'
+
+" Rainbow
+let g:rainbow_active = 1
+
+" NERD Commenter
+let g:NERDSpaceDelims = 1
+let g:NERDCompactSexyComs = 1
+let g:NERDDefaultAlign = 'left'
+let g:NERDAltDelims_java = 1
+let g:NERDCustomDelimiters = { 'c': { 'left': '/*','right': '*/' } }
+let g:NERDCommentEmptyLines = 1
+let g:NERDTrimTrailingWhitespace = 1
+let g:NERDToggleCheckAllLines = 1
+
+" Cursor mode
+let g:airline#extensions#cursormode#enabled = 1
+let g:cursormode_color_map = {
+			\	"i": 		"#d79921",
+			\	"n": 		"#d79921",
+			\	"R": 		"#cc241d",
+			\	"r": 		"#cc241d",
+			\	"v": 		"#b06597",
+			\	"V": 		"#b06597",
+			\	"\<C-V>":	"#b06597",
+			\}
+
+" 10 buffers jump
+let g:airline#extensions#tabline#buffer_idx_mode = 1
+
+" Org-mode
+let g:org_todo_keywords = ['TODO',  '|', 'DONE', 'CANCELED']
diff --git a/.config/nvim/settings.vim b/.config/nvim/settings.vim
new file mode 100644
index 0000000..b75ed78
--- /dev/null
+++ b/.config/nvim/settings.vim
@@ -0,0 +1,28 @@
+set bg=dark
+set clipboard^=unnamedplus
+set encoding=utf-8
+set go=a
+set hidden
+set makeprg=gmake
+set mouse=a
+set nocompatible
+set nohlsearch
+set number
+set shiftwidth=4
+set shortmess+=c
+set softtabstop=4
+set ruler
+set tabstop=4
+set undodir=/tmp
+set undofile
+set wildmode=longest,list,full
+syntax on
+filetype plugin indent on
+autocmd ColorScheme * highlight Normal ctermbg=NONE guibg=NONE
+colorscheme gruvbox-material
+let mapleader="\\"
+let maplocalleader="\\"
+" Disables automatic commenting on newline:
+autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
+" Reopen Startify on close
+autocmd BufDelete * if empty(filter(tabpagebuflist(), '!buflisted(v:val)')) | Startify | endif
diff --git a/.config/nvim/sidebars.vim b/.config/nvim/sidebars.vim
new file mode 100644
index 0000000..f21cf8c
--- /dev/null
+++ b/.config/nvim/sidebars.vim
@@ -0,0 +1,38 @@
+let g:NERDTreeWinPos = 'left'
+let g:NERDTreeWinSize = 30
+let g:NERDTreeQuitOnOpen = 0
+let g:tagbar_left = 1
+let g:tagbar_width = 30
+let g:tagbar_autoclose = 0
+let g:tagbar_autofocus = 1
+let g:tagbar_sort = 0
+let g:undotree_SetFocusWhenToggle = 1
+let g:undotree_SplitWidth = 30
+
+let g:sidebars = {
+			\ 'nerdtree': {
+			\     'position': 'left',
+			\     'check_win': {nr -> getwinvar(nr, '&filetype') ==# 'nerdtree'},
+			\     'open': 'NERDTree',
+			\     'close': 'NERDTreeClose'
+			\ },
+			\ 'tagbar': {
+			\     'position': 'left',
+			\     'check_win': {nr -> bufname(winbufnr(nr)) =~ '__Tagbar__'},
+			\     'open': 'TagbarOpen',
+			\     'close': 'TagbarClose'
+			\ },
+			\ 'undotree': {
+			\     'position': 'left',
+			\     'check_win': {nr -> getwinvar(nr, '&filetype') ==# 'undotree'},
+			\     'open': 'UndotreeShow',
+			\     'close': 'UndotreeHide'
+			\ }
+			\ }
+
+noremap <silent> <F1> :sp<CR><C-w>j:term<CR>:resize -10<CR>i
+noremap <silent> <F2> :call sidebar#toggle('nerdtree')<CR>
+noremap <F4> :make<space>-j5<space>
+noremap <silent> <F3> :call sidebar#toggle('tagbar')<CR>
+noremap <silent> <F5> :call sidebar#toggle('undotree')<CR>
+let g:startify_session_before_save = ['call sidebar#close_all()']