Merge branch 'master' of gitea.tforgione.fr:tforgione/dotfiles
This commit is contained in:
commit
b2eaace5e7
14
init.vim
14
init.vim
|
@ -57,10 +57,18 @@ set list
|
||||||
set listchars=tab: ,trail:·,extends:>,precedes:<,nbsp:¬
|
set listchars=tab: ,trail:·,extends:>,precedes:<,nbsp:¬
|
||||||
" Remove trailing spaces
|
" Remove trailing spaces
|
||||||
autocmd BufWritePre * :%s/\s\+$//e
|
autocmd BufWritePre * :%s/\s\+$//e
|
||||||
|
|
||||||
" Compile on F12
|
" Compile on F12
|
||||||
nnoremap <silent><F12> :wa \| !make-client.py<CR>
|
if executable('mars')
|
||||||
inoremap <silent><F12> <C-O>:wa \|!make-client.py<CR>
|
nnoremap <silent><F12> :wa \| !mars<CR>
|
||||||
vnoremap <silent><F12> :wa \|!make-client.py<CR>
|
inoremap <silent><F12> <C-O>:wa \|!mars<CR>
|
||||||
|
vnoremap <silent><F12> :wa \|!mars<CR>
|
||||||
|
elseif executable('make')
|
||||||
|
nnoremap <silent><F12> :wa \| !make<CR>
|
||||||
|
inoremap <silent><F12> <C-O>:wa \|!make<CR>
|
||||||
|
vnoremap <silent><F12> :wa \|!make<CR>
|
||||||
|
endif
|
||||||
|
|
||||||
" Escape on F1
|
" Escape on F1
|
||||||
map <F1> <Esc>
|
map <F1> <Esc>
|
||||||
imap <F1> <Esc>
|
imap <F1> <Esc>
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
# My editor
|
# My editor
|
||||||
export EDITOR="vim"
|
command -v nvim > /dev/null 2>&1
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
export EDITOR="nvim"
|
||||||
|
else
|
||||||
|
export EDITOR="vim"
|
||||||
|
fi
|
||||||
|
|
||||||
# Parallel conpilation with make
|
# Parallel conpilation with make
|
||||||
export MAKEFLAGS="+j`nproc`"
|
export MAKEFLAGS="+j`nproc`"
|
||||||
|
|
Loading…
Reference in New Issue