forked from jeanclaude/Dotfiles
NEW: Replaced vim by neovim and restructured vim config
This commit is contained in:
parent
5dd07fd122
commit
19569f2722
GPG Key ID:
8A300F57CBB9F63E
|
|
@ -1,4 +1,3 @@
|
|||
vim/bundle
|
||||
!vim/bundle/Vundle.vim
|
||||
*.env
|
||||
*.pem
|
||||
Vim/autoload/plug.vim
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[submodule "vim/bundle/Vundle.vim"]
|
||||
path = vim/bundle/Vundle.vim
|
||||
url = https://github.com/VundleVim/Vundle.vim.git
|
||||
199
.vimrc
199
.vimrc
|
|
@ -1,199 +0,0 @@
|
|||
set nocompatible
|
||||
filetype off
|
||||
|
||||
" set the runtime path to include Vundle and initialize
|
||||
set rtp+=~/.vim/bundle/Vundle.vim
|
||||
call vundle#begin()
|
||||
|
||||
Plugin 'VundleVim/Vundle.vim'
|
||||
|
||||
" Colorize color values
|
||||
Plugin 'chrisbra/Colorizer'
|
||||
|
||||
" Pandoc base and syntax
|
||||
Plugin 'vim-pandoc/vim-pandoc'
|
||||
Plugin 'vim-pandoc/vim-pandoc-syntax'
|
||||
|
||||
" Inkscape integration
|
||||
Plugin 'silverbulletmdc/vim-inkscape-insert'
|
||||
|
||||
" i3 syntax
|
||||
Plugin 'mboughaba/i3config.vim'
|
||||
|
||||
" Latex liveview
|
||||
Plugin 'xuhdev/vim-latex-live-preview'
|
||||
|
||||
" Fuzzy File manager
|
||||
Plugin 'ctrlpvim/ctrlp.vim'
|
||||
|
||||
" Align text
|
||||
Plugin 'godlygeek/tabular'
|
||||
|
||||
" File tree
|
||||
Plugin 'preservim/nerdtree'
|
||||
|
||||
call vundle#end()
|
||||
"
|
||||
" Brief help
|
||||
" :PluginList - lists configured plugins
|
||||
" :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate
|
||||
" :PluginSearch foo - searches for foo; append `!` to refresh local cache
|
||||
" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal
|
||||
|
||||
syntax enable
|
||||
filetype plugin indent on
|
||||
|
||||
set t_Co=256 " enable 256 colors
|
||||
|
||||
"" Tabs and Spaces
|
||||
set tabstop=4 " number of visual spaces per TAB
|
||||
set softtabstop=4 " number of spaces in tab when editing
|
||||
set expandtab " tabs are spaces
|
||||
set shiftwidth=4 " number of spaced per shift
|
||||
autocmd FileType yaml,yml setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab
|
||||
|
||||
"" UI Visuals
|
||||
set number " show line numbers
|
||||
"set showcmd " show command in bottom bar
|
||||
set cursorline " highlight current line
|
||||
set wildmenu " visual autocomplete for command menu
|
||||
set lazyredraw " redraw only when we need to.
|
||||
set showmatch " highlight matching [{()}]
|
||||
|
||||
"" Leader Shortcuts
|
||||
" Change leader to comma
|
||||
let mapleader=","
|
||||
nnoremap <leader>c :ColorToggle<CR>
|
||||
|
||||
"" Searching
|
||||
set incsearch " search as characters are entered
|
||||
set hlsearch " highlight matches
|
||||
" turn off search highlighting
|
||||
nnoremap <leader><space> :nohlsearch<CR>
|
||||
|
||||
"" Folding
|
||||
set foldenable " enable folding
|
||||
set foldlevelstart=1 " fold everything at start
|
||||
" open/closes folds
|
||||
nnoremap <space> za
|
||||
set foldmethod=syntax " fold based on syntax
|
||||
" Save folds on save and restore automatically when open file
|
||||
augroup remember_folds
|
||||
autocmd!
|
||||
autocmd BufWinLeave * mkview
|
||||
autocmd BufWinEnter * silent! loadview
|
||||
augroup END
|
||||
" Shell foldings
|
||||
au FileType sh let g:sh_fold_enabled=5
|
||||
au FileType sh let g:is_bash=1
|
||||
au FileType sh set foldmethod=syntax
|
||||
" Python foldings
|
||||
au FileType python set foldmethod=indent
|
||||
au FileType yaml set foldmethod=indent
|
||||
" Markdown folding
|
||||
let g:markdown_folding = 1
|
||||
|
||||
"" Movement
|
||||
" move vertically by visual line
|
||||
nnoremap j gj
|
||||
nnoremap k gk
|
||||
" In insert or command mode, move normally by using Ctrl
|
||||
inoremap <C-h> <Left>
|
||||
inoremap <C-j> <Down>
|
||||
inoremap <C-k> <Up>
|
||||
inoremap <C-l> <Right>
|
||||
cnoremap <C-h> <Left>
|
||||
cnoremap <C-j> <Down>
|
||||
cnoremap <C-k> <Up>
|
||||
cnoremap <C-l> <Right>
|
||||
" Exit insert mode
|
||||
inoremap jj <Esc>
|
||||
" Insert new line without enterint insert
|
||||
nmap oo o<Esc>k
|
||||
nmap OO O<Esc>j
|
||||
|
||||
" highlight last inserted text
|
||||
nnoremap gV `[v`]
|
||||
|
||||
"" Launch Config
|
||||
execute pathogen#infect()
|
||||
|
||||
"" Backup
|
||||
set undodir=~/.vim/undo//
|
||||
set backupdir=~/.vim/backup//
|
||||
set directory=~/.vim/swap//
|
||||
|
||||
"" Markdown
|
||||
" pandoc , markdown
|
||||
command! -nargs=* RunSilent
|
||||
\ | execute ':silent !'.'<args>'
|
||||
\ | execute ':redraw!'
|
||||
nmap <Leader>pc :RunSilent pandoc -o /tmp/vim-pandoc-out.pdf %<CR>
|
||||
nmap <Leader>pp :RunSilent xdg-open /tmp/vim-pandoc-out.pdf<CR>
|
||||
|
||||
"" Remove Trailing Spaces by calling `TrimWhitespaces` or using a shortcut
|
||||
fun! TrimWhitespace()
|
||||
let l:save = winsaveview()
|
||||
keeppatterns %s/\s\+$//e
|
||||
call winrestview(l:save)
|
||||
endfun
|
||||
command! TrimWhitespace call TrimWhitespace()
|
||||
:noremap <Leader>w :call TrimWhitespace()<CR>
|
||||
|
||||
"" Spell correction
|
||||
" Enable for some default programs
|
||||
augroup enableSpell
|
||||
autocmd!
|
||||
autocmd FileType gitcommit setlocal spell
|
||||
autocmd FileType markdown setlocal spell
|
||||
autocmd BufRead /tmp/neomutt-* setlocal spell
|
||||
augroup END
|
||||
|
||||
" Allow saving of files as sudo when I forgot to start vim using sudo.
|
||||
cmap w!! w !sudo tee > /dev/null %
|
||||
|
||||
"" CtrlP Config
|
||||
" Search directory will be set to nearest anchestor og .git and cwd
|
||||
let g:ctrlp_working_path_mode = 'ra'
|
||||
|
||||
"" Tabular
|
||||
" Tabular on | for nice tables (https://gist.github.com/tpope/287147)
|
||||
inoremap <silent> <Bar> <Bar><Esc>:call <SID>align()<CR>a
|
||||
|
||||
function! s:align()
|
||||
let p = '^\s*|\s.*\s|\s*$'
|
||||
if exists(':Tabularize') && getline('.') =~# '^\s*|' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p)
|
||||
let column = strlen(substitute(getline('.')[0:col('.')],'[^|]','','g'))
|
||||
let position = strlen(matchstr(getline('.')[0:col('.')],'.*|\s*\zs.*'))
|
||||
Tabularize/|/l1
|
||||
normal! 0
|
||||
call search(repeat('[^|]*|',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" Search for selected text, forwards or backwards.
|
||||
vnoremap <silent> * :<C-U>
|
||||
\let old_reg=getreg('"')<Bar>let old_regtype=getregtype('"')<CR>
|
||||
\gvy/<C-R>=&ic?'\c':'\C'<CR><C-R><C-R>=substitute(
|
||||
\escape(@", '/\.*$^~['), '\_s\+', '\\_s\\+', 'g')<CR><CR>
|
||||
\gVzv:call setreg('"', old_reg, old_regtype)<CR>
|
||||
vnoremap <silent> # :<C-U>
|
||||
\let old_reg=getreg('"')<Bar>let old_regtype=getregtype('"')<CR>
|
||||
\gvy?<C-R>=&ic?'\c':'\C'<CR><C-R><C-R>=substitute(
|
||||
\escape(@", '?\.*$^~['), '\_s\+', '\\_s\\+', 'g')<CR><CR>
|
||||
\gVzv:call setreg('"', old_reg, old_regtype)<CR>
|
||||
|
||||
"" Nerdtree
|
||||
" Open a NerdTree if no file is given as CLI argument
|
||||
autocmd StdinReadPre * let s:std_in=1
|
||||
autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
|
||||
|
||||
" Toggle nerdtree
|
||||
nnoremap <Leader>f :NERDTreeToggle<Enter>
|
||||
|
||||
" Close nerdtree after opening a file
|
||||
let NERDTreeQuitOnOpen = 1
|
||||
|
||||
" Disable help message at top
|
||||
let NERDTreeMinimalUI = 1
|
||||
let NERDTreeDirArrows = 1
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
"" Leader Shortcuts
|
||||
" Change leader to comma
|
||||
let mapleader=","
|
||||
|
||||
" move vertically by visual line
|
||||
nnoremap j gj
|
||||
nnoremap k gk
|
||||
" In insert or command mode, move normally by using Ctrl
|
||||
inoremap <C-h> <Left>
|
||||
inoremap <C-j> <Down>
|
||||
inoremap <C-k> <Up>
|
||||
inoremap <C-l> <Right>
|
||||
cnoremap <C-h> <Left>
|
||||
cnoremap <C-j> <Down>
|
||||
cnoremap <C-k> <Up>
|
||||
cnoremap <C-l> <Right>
|
||||
"
|
||||
" Exit insert mode
|
||||
inoremap jj <Esc>
|
||||
inoremap jk <Esc>
|
||||
inoremap kj <Esc>
|
||||
"
|
||||
" Insert new line without enterint insert
|
||||
nmap oo o<Esc>k
|
||||
nmap OO O<Esc>j
|
||||
|
||||
nmap <leader>t :set expandtab tabstop=4 shiftwidth=4 softtabstop=4<CR>
|
||||
nmap <leader>m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2<CR>
|
||||
|
||||
" turn off search highlighting
|
||||
nnoremap <leader><space> :nohlsearch<CR>
|
||||
|
||||
" open/closes folds
|
||||
nnoremap <space> za
|
||||
|
||||
" highlight last inserted text
|
||||
nnoremap gV `[v`]
|
||||
|
||||
" Allow saving of files as sudo when I forgot to start vim using sudo.
|
||||
cmap w!! w !sudo tee > /dev/null %
|
||||
|
||||
" Search for selected text, forwards or backwards.
|
||||
vnoremap <silent> * :<C-U>
|
||||
\let old_reg=getreg('"')<Bar>let old_regtype=getregtype('"')<CR>
|
||||
\gvy/<C-R>=&ic?'\c':'\C'<CR><C-R><C-R>=substitute(
|
||||
\escape(@", '/\.*$^~['), '\_s\+', '\\_s\\+', 'g')<CR><CR>
|
||||
\gVzv:call setreg('"', old_reg, old_regtype)<CR>
|
||||
vnoremap <silent> # :<C-U>
|
||||
\let old_reg=getreg('"')<Bar>let old_regtype=getregtype('"')<CR>
|
||||
\gvy?<C-R>=&ic?'\c':'\C'<CR><C-R><C-R>=substitute(
|
||||
\escape(@", '?\.*$^~['), '\_s\+', '\\_s\\+', 'g')<CR><CR>
|
||||
\gVzv:call setreg('"', old_reg, old_regtype)<CR>
|
||||
|
||||
"" Remove Trailing Spaces by calling `TrimWhitespaces` or using a shortcut
|
||||
fun! TrimWhitespace()
|
||||
let l:save = winsaveview()
|
||||
keeppatterns %s/\s\+$//e
|
||||
call winrestview(l:save)
|
||||
endfun
|
||||
command! TrimWhitespace call TrimWhitespace()
|
||||
:noremap <Leader>w :call TrimWhitespace()<CR>
|
||||
|
||||
"" Markdown
|
||||
" pandoc , markdown
|
||||
command! -nargs=* RunSilent
|
||||
\ | execute ':silent !'.'<args>'
|
||||
\ | execute ':redraw!'
|
||||
nmap <Leader>pc :RunSilent pandoc -o /tmp/vim-pandoc-out.pdf %<CR>
|
||||
nmap <Leader>pp :RunSilent xdg-open /tmp/vim-pandoc-out.pdf<CR>
|
||||
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
" install vim-plug
|
||||
if empty(glob('~/.config/nvim/autoload/plug.vim'))
|
||||
silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs
|
||||
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||
autocmd VimEnter * PlugInstall | source $MYVIMRC
|
||||
endif
|
||||
|
||||
|
||||
call plug#begin('~/.config/nvim/plugged')
|
||||
|
||||
" Colorize color values
|
||||
Plug 'chrisbra/Colorizer'
|
||||
|
||||
" Pandoc base and syntax
|
||||
Plug 'vim-pandoc/vim-pandoc'
|
||||
Plug 'vim-pandoc/vim-pandoc-syntax'
|
||||
|
||||
" Inkscape integration
|
||||
Plug 'silverbulletmdc/vim-inkscape-insert'
|
||||
|
||||
" i3 syntax
|
||||
Plug 'mboughaba/i3config.vim'
|
||||
|
||||
" Latex liveview
|
||||
"Plug 'xuhdev/vim-latex-live-preview'
|
||||
|
||||
" Fuzzy File manager
|
||||
Plug 'ctrlpvim/ctrlp.vim'
|
||||
|
||||
" Align text
|
||||
Plug 'godlygeek/tabular'
|
||||
|
||||
" File tree
|
||||
Plug 'preservim/nerdtree'
|
||||
|
||||
" Autocomplete and loockup
|
||||
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
||||
|
||||
call plug#end()
|
||||
|
||||
" Automatically install missing plugins on startup
|
||||
autocmd VimEnter *
|
||||
\ if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
|
||||
\| PlugInstall --sync | q
|
||||
\| endif
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
set t_Co=256 " enable 256 colors
|
||||
|
||||
"" Tabs and Spaces
|
||||
set tabstop=4 " number of visual spaces per TAB
|
||||
set softtabstop=4 " number of spaces in tab when editing
|
||||
set expandtab " tabs are spaces
|
||||
set shiftwidth=4 " number of spaced per shift
|
||||
set smartindent " enable smart indentation
|
||||
"autocmd FileType yaml,yml setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab
|
||||
|
||||
"" UI Visuals
|
||||
set number " show line numbers
|
||||
"set showcmd " show command in bottom bar
|
||||
set cursorline " highlight current line
|
||||
set wildmenu " visual autocomplete for command menu
|
||||
set lazyredraw " redraw only when we need to.
|
||||
set showmatch " highlight matching [{()}]
|
||||
|
||||
|
||||
"" Searching
|
||||
set incsearch " search as characters are entered
|
||||
set hlsearch " highlight matches
|
||||
set smartcase " search caseinsensitive unless capital entered
|
||||
|
||||
"" Folding
|
||||
set foldenable " enable folding
|
||||
set foldlevelstart=1 " fold everything at start
|
||||
set foldmethod=syntax " fold based on syntax
|
||||
" Save folds on save and restore automatically when open file
|
||||
augroup remember_folds
|
||||
autocmd!
|
||||
autocmd BufWinLeave * mkview
|
||||
autocmd BufWinEnter * silent! loadview
|
||||
augroup END
|
||||
" Shell foldings
|
||||
au FileType sh let g:sh_fold_enabled=5
|
||||
au FileType sh let g:is_bash=1
|
||||
au FileType sh set foldmethod=syntax
|
||||
" Python foldings
|
||||
au FileType python set foldmethod=indent
|
||||
au FileType yaml set foldmethod=indent
|
||||
" Markdown folding
|
||||
let g:markdown_folding = 1
|
||||
|
||||
"" Backup
|
||||
set undodir=~/.local/share/nvim/swap/undo//
|
||||
set undofile
|
||||
set nobackup " Do not create backup
|
||||
set nowritebackup " Do not create backup
|
||||
set noswapfile
|
||||
" set directory=~/.local/share/nvim/swap//
|
||||
|
||||
|
||||
"" Spell correction
|
||||
" Enable for some default programs
|
||||
augroup enableSpell
|
||||
autocmd!
|
||||
autocmd FileType gitcommit setlocal spell
|
||||
autocmd FileType markdown setlocal spell
|
||||
autocmd BufRead /tmp/neomutt-* setlocal spell
|
||||
augroup END
|
||||
|
||||
"" Ignore files for nerdtree and ctrlp
|
||||
set wildignore+=*/.git/*,*/node_modules/*,*/__pycache__/,*/env/*,*/.log,*/.aux,*/.cls,*/.aux,*/.bbl,*/.blg,*/.fls,*/.fdb*/,*/.toc,*/.out,*/.glo,*/.log,*/.ist,*/.fdb_latexmk
|
||||
|
|
@ -0,0 +1 @@
|
|||
nnoremap <leader>c :ColorToggle<CR>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
"" CtrlP Config
|
||||
" Search directory will be set to nearest anchestor og .git and cwd
|
||||
let g:ctrlp_working_path_mode = 'ra'
|
||||
let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
|
||||
let g:ctrlp_use_cachint = 0
|
||||
|
||||
"" Ignore files for nerdtree and ctrlp
|
||||
set wildignore+=*/.git/*,*/node_modules/*,*/__pycache__/,*/env/*,*/.log,*/.aux,*/.cls,*/.aux,*/.bbl,*/.blg,*/.fls,*/.fdb*/,*/.toc,*/.out,*/.glo,*/.log,*/.ist,*/.fdb_latexmk
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
"" Nerdtree
|
||||
" Open a NerdTree if no file is given as CLI argument
|
||||
autocmd StdinReadPre * let s:std_in=1
|
||||
autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
|
||||
|
||||
" Toggle nerdtree
|
||||
nnoremap <Leader>f :NERDTreeToggle<Enter>
|
||||
|
||||
" Close nerdtree after opening a file
|
||||
let NERDTreeQuitOnOpen = 1
|
||||
|
||||
" Disable help message at top
|
||||
let NERDTreeMinimalUI = 1
|
||||
let NERDTreeDirArrows = 1
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
"" Tabular
|
||||
" Tabular on | for nice tables (https://gist.github.com/tpope/287147)
|
||||
inoremap <silent> <Bar> <Bar><Esc>:call <SID>align()<CR>a
|
||||
|
||||
function! s:align()
|
||||
let p = '^\s*|\s.*\s|\s*$'
|
||||
if exists(':Tabularize') && getline('.') =~# '^\s*|' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p)
|
||||
let column = strlen(substitute(getline('.')[0:col('.')],'[^|]','','g'))
|
||||
let position = strlen(matchstr(getline('.')[0:col('.')],'.*|\s*\zs.*'))
|
||||
Tabularize/|/l1
|
||||
normal! 0
|
||||
call search(repeat('[^|]*|',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
|
||||
endif
|
||||
endfunction
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
|
||||
" General
|
||||
source ~/.config/nvim/General/plugins.vim
|
||||
source ~/.config/nvim/General/settings.vim
|
||||
source ~/.config/nvim/General/mappings.vim
|
||||
|
||||
" Plugins
|
||||
source ~/.config/nvim/PluginConfig/ctrlp.vim
|
||||
source ~/.config/nvim/PluginConfig/tabular.vim
|
||||
source ~/.config/nvim/PluginConfig/nerdtree.vim
|
||||
source ~/.config/nvim/PluginConfig/colorizer.vim
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit b255382d6242d7ea3877bf059d2934125e0c4d95
|
||||
Loading…
Reference in New Issue