Moved config to ~/.vim/config/*.vim instead of having them all in .vimrc
Tuan-Dat Tran
parent
2d9a91bbc3
commit
6b7ca41818
|
|
@ -0,0 +1,21 @@
|
||||||
|
" Basics
|
||||||
|
syntax on
|
||||||
|
filetype indent plugin on
|
||||||
|
set background=light
|
||||||
|
set encoding=utf-8
|
||||||
|
set autowrite
|
||||||
|
set smartcase
|
||||||
|
set incsearch
|
||||||
|
set hlsearch
|
||||||
|
set nospell
|
||||||
|
|
||||||
|
" Tab behavior
|
||||||
|
set expandtab
|
||||||
|
set tabstop=4
|
||||||
|
set shiftwidth=4
|
||||||
|
set softtabstop=4
|
||||||
|
|
||||||
|
"" New window positions
|
||||||
|
set splitbelow
|
||||||
|
set splitright
|
||||||
|
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
" This callback will be executed when the entire command is completed
|
||||||
|
function! BackgroundCommandClose(channel)
|
||||||
|
" Read the output from the command into the quickfix window
|
||||||
|
unlet g:backgroundCommandOutput
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! RunBackgroundCommand(command)
|
||||||
|
" Make sure we're running VIM version 8 or higher.
|
||||||
|
if v:version < 800
|
||||||
|
echoerr 'RunBackgroundCommand requires VIM version 8 or higher'
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
if exists('g:backgroundCommandOutput')
|
||||||
|
echo 'Already running task in background'
|
||||||
|
else
|
||||||
|
echo 'Running task in background'
|
||||||
|
" Launch the job.
|
||||||
|
" Notice that we're only capturing out, and not err here. This is because, for some reason, the callback
|
||||||
|
" will not actually get hit if we write err out to the same file. Not sure if I'm doing this wrong or?
|
||||||
|
let g:backgroundCommandOutput = tempname()
|
||||||
|
call job_start(a:command, {'close_cb': 'BackgroundCommandClose', 'out_io': 'file', 'out_name': g:backgroundCommandOutput})
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
" So we can use :BackgroundCommand to call our function.
|
||||||
|
command! -nargs=+ -complete=shellcmd RunBackgroundCommand call RunBackgroundCommand(<q-args>)
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
" Remaps
|
||||||
|
nnoremap <C-J> <C-W><C-J>
|
||||||
|
nnoremap <C-K> <C-W><C-K>
|
||||||
|
nnoremap <C-L> <C-W><C-L>
|
||||||
|
nnoremap <C-H> <C-W><C-H>
|
||||||
|
nnoremap J :bn<Enter>
|
||||||
|
nnoremap K :bp<Enter>
|
||||||
|
noremap <leader>y "+y
|
||||||
|
noremap <C-E> :tabedit<Space>
|
||||||
|
noremap <F1> :ter<Enter>
|
||||||
|
nmap 0 ^
|
||||||
|
|
||||||
|
" Diaeresis for e.g. german
|
||||||
|
inoremap a" ä
|
||||||
|
inoremap o" ö
|
||||||
|
inoremap u" ü
|
||||||
|
inoremap A" Ä
|
||||||
|
inoremap U" Ü
|
||||||
|
inoremap O" Ö
|
||||||
|
inoremap jj <Esc>
|
||||||
|
inoremap ;s ß
|
||||||
|
inoremap ;e €
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
" Vim Settings
|
||||||
|
"" Move the swap file location to protect against CVE-2017-1000382
|
||||||
|
if exists('$XDG_CACHE_HOME')
|
||||||
|
let &g:directory=$XDG_CACHE_HOME
|
||||||
|
else
|
||||||
|
let &g:directory=$HOME . '/.cache'
|
||||||
|
endif
|
||||||
|
let &g:directory.='/vim/swap//'
|
||||||
|
"" Create swap directory if it doesn't exist
|
||||||
|
if ! isdirectory(expand(&g:directory))
|
||||||
|
silent! call mkdir(expand(&g:directory), 'p', 0700)
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
113
vim/.vimrc
113
vim/.vimrc
|
|
@ -1,108 +1,5 @@
|
||||||
" Plugins
|
" Load files from somewhere else
|
||||||
set nocompatible
|
source ~/.vim/config/settings.vim
|
||||||
filetype off
|
source ~/.vim/config/basics.vim
|
||||||
|
source ~/.vim/config/remaps.vim
|
||||||
set rtp+=~/.vim/bundle/Vundle.vim
|
source ~/.vim/config/functions.vim
|
||||||
call vundle#begin()
|
|
||||||
Plugin 'VundleVim/Vundle.vim'
|
|
||||||
Plugin 'sheerun/vim-polyglot'
|
|
||||||
call vundle#end()
|
|
||||||
filetype plugin indent on
|
|
||||||
|
|
||||||
" Filetypes
|
|
||||||
au BufNewFile,BufRead *.md set filetype=md
|
|
||||||
au BufNewFile,BufRead *.tex set filetype=tex
|
|
||||||
au BufNewFile,BufRead config set filetype=config
|
|
||||||
" Functions
|
|
||||||
|
|
||||||
"" Move the swap file location to protect against CVE-2017-1000382
|
|
||||||
if exists('$XDG_CACHE_HOME')
|
|
||||||
let &g:directory=$XDG_CACHE_HOME
|
|
||||||
else
|
|
||||||
let &g:directory=$HOME . '/.cache'
|
|
||||||
endif
|
|
||||||
let &g:directory.='/vim/swap//'
|
|
||||||
"" Create swap directory if it doesn't exist
|
|
||||||
if ! isdirectory(expand(&g:directory))
|
|
||||||
silent! call mkdir(expand(&g:directory), 'p', 0700)
|
|
||||||
endif
|
|
||||||
|
|
||||||
" Basics
|
|
||||||
syntax on
|
|
||||||
filetype indent plugin on
|
|
||||||
set background=light
|
|
||||||
set encoding=utf-8
|
|
||||||
set autowrite
|
|
||||||
set smartcase
|
|
||||||
set incsearch
|
|
||||||
set hlsearch
|
|
||||||
set nofoldenable
|
|
||||||
set nospell
|
|
||||||
" Line Numbers
|
|
||||||
"set number
|
|
||||||
"set relativenumber
|
|
||||||
|
|
||||||
" Tab behavior
|
|
||||||
set expandtab
|
|
||||||
set tabstop=4
|
|
||||||
set shiftwidth=4
|
|
||||||
set softtabstop=4
|
|
||||||
|
|
||||||
"" New window positions
|
|
||||||
set splitbelow
|
|
||||||
set splitright
|
|
||||||
|
|
||||||
" Remaps
|
|
||||||
nnoremap <C-J> <C-W><C-J>
|
|
||||||
nnoremap <C-K> <C-W><C-K>
|
|
||||||
nnoremap <C-L> <C-W><C-L>
|
|
||||||
nnoremap <C-H> <C-W><C-H>
|
|
||||||
nnoremap J :bn<Enter>
|
|
||||||
nnoremap K :bp<Enter>
|
|
||||||
noremap <leader>y "+y
|
|
||||||
noremap <C-E> :tabedit<Space>
|
|
||||||
noremap <F1> :ter<Enter>
|
|
||||||
nmap 0 ^
|
|
||||||
|
|
||||||
" Latex
|
|
||||||
"let g:tex_nospell=1
|
|
||||||
" Shortcuts
|
|
||||||
inoremap <leader>date <C-R>=strftime("%Y/%m/%d")<Enter>
|
|
||||||
inoremap <leader>time <C-R>=strftime("%H:%M:%S")<Enter>
|
|
||||||
" Diaeresis for e.g. german
|
|
||||||
inoremap a" ä
|
|
||||||
inoremap o" ö
|
|
||||||
inoremap u" ü
|
|
||||||
inoremap A" Ä
|
|
||||||
inoremap U" Ü
|
|
||||||
inoremap O" Ö
|
|
||||||
inoremap jj <Esc>
|
|
||||||
inoremap ;s ß
|
|
||||||
inoremap ;e €
|
|
||||||
|
|
||||||
" This callback will be executed when the entire command is completed
|
|
||||||
function! BackgroundCommandClose(channel)
|
|
||||||
" Read the output from the command into the quickfix window
|
|
||||||
unlet g:backgroundCommandOutput
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! RunBackgroundCommand(command)
|
|
||||||
" Make sure we're running VIM version 8 or higher.
|
|
||||||
if v:version < 800
|
|
||||||
echoerr 'RunBackgroundCommand requires VIM version 8 or higher'
|
|
||||||
return
|
|
||||||
endif
|
|
||||||
if exists('g:backgroundCommandOutput')
|
|
||||||
echo 'Already running task in background'
|
|
||||||
else
|
|
||||||
echo 'Running task in background'
|
|
||||||
" Launch the job.
|
|
||||||
" Notice that we're only capturing out, and not err here. This is because, for some reason, the callback
|
|
||||||
" will not actually get hit if we write err out to the same file. Not sure if I'm doing this wrong or?
|
|
||||||
let g:backgroundCommandOutput = tempname()
|
|
||||||
call job_start(a:command, {'close_cb': 'BackgroundCommandClose', 'out_io': 'file', 'out_name': g:backgroundCommandOutput})
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" So we can use :BackgroundCommand to call our function.
|
|
||||||
command! -nargs=+ -complete=shellcmd RunBackgroundCommand call RunBackgroundCommand(<q-args>)
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue