Compare commits

..

6 Commits

View File

@ -2,11 +2,11 @@
" Download vim-plug " Download vim-plug
"""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""
if has('nvim') if has('nvim')
if ! filereadable(system('echo -n "$HOME/.config/nvim/autoload/plug.vim"')) if ! filereadable(system('echo -n "$HOME/.config/nvim/autoload/plug.vim"'))
silent !mkdir -p $HOME/.config/nvim/autoload/ silent !mkdir -p $HOME/.config/nvim/autoload/
silent !curl --silent "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > $HOME/.config/nvim/autoload/plug.vim silent !curl --silent "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > $HOME/.config/nvim/autoload/plug.vim
autocmd VimEnter * PlugInstall autocmd VimEnter * PlugInstall
endif endif
endif endif
"""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""
@ -19,8 +19,8 @@ set autoindent
set noexpandtab set noexpandtab
set softtabstop=4 set softtabstop=4
set shiftwidth=4 set shiftwidth=4
set softtabstop=4
set tabstop=4 set tabstop=4
set expandtab
set nocompatible set nocompatible
set noshowmode set noshowmode
set noerrorbells set noerrorbells
@ -145,9 +145,6 @@ let NERDTreeShowHidden=1
" latex " latex
let g:tex_flavor = "latex" let g:tex_flavor = "latex"
" Preetier
autocmd FileType sh
\ autocmd BufWritePre <buffer> :Prettier <CR>
"""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""
" Theme " Theme
@ -178,12 +175,12 @@ highlight ColorColumn ctermbg=236
" Status Line " Status Line
"""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""
function! GitBranch() function! GitBranch()
return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'") return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'")
endfunction endfunction
function! StatuslineGit() function! StatuslineGit()
let l:branchname = GitBranch() let l:branchname = GitBranch()
return strlen(l:branchname) > 0?' '.l:branchname.' ':'' return strlen(l:branchname) > 0?' '.l:branchname.' ':''
endfunction endfunction
set statusline= set statusline=
@ -328,6 +325,10 @@ map <F4> :setlocal spell! spelllang=pl<CR>
" Ansible " Ansible
au BufRead,BufNewFile *.yml set filetype=yaml.ansible au BufRead,BufNewFile *.yml set filetype=yaml.ansible
" Bash
autocmd FileType sh
\ autocmd BufWritePre <buffer> :Prettier <CR>
" Python " Python
autocmd BufRead,BufNewFile *.py set textwidth=0 autocmd BufRead,BufNewFile *.py set textwidth=0
autocmd BufRead,BufNewFile *.py set fo-=t autocmd BufRead,BufNewFile *.py set fo-=t
@ -352,6 +353,7 @@ autocmd BufRead,BufNewFile *.yaml let g:indentLine_enabled = 1
autocmd BufRead,BufNewFile *.yaml let g:indentLine_char = '⦙' autocmd BufRead,BufNewFile *.yaml let g:indentLine_char = '⦙'
" Go " Go
autocmd BufRead *.go set noexpandtab
autocmd BufWritePre *.go :silent call CocAction('runCommand', 'editor.action.organizeImport') autocmd BufWritePre *.go :silent call CocAction('runCommand', 'editor.action.organizeImport')
" Conf " Conf