diff --git a/.bashrc b/.bashrc index 17eae9a..e0a4aca 100644 --- a/.bashrc +++ b/.bashrc @@ -57,7 +57,7 @@ alias gs='git status' # less used aliases wttr() { - curl -H "Accept-Language: ${LANG%_*}" wttr.in/"${1:-Nancy}" + curl -H "Accept-Language: ${LANG%_*}" wttr.in/"${1:-Kontula}" } PATH="$PATH:$HOME/.local/bin" diff --git a/.vimrc b/.vimrc index 6a97691..28e2952 100644 --- a/.vimrc +++ b/.vimrc @@ -46,16 +46,17 @@ let g:UltiSnipsExpandTrigger="" " coc -" if isdirectory('./node_modules') && isdirectory('./node_modules/prettier') -" let g:coc_global_extensions += ['coc-prettier'] -" endif -" +if isdirectory('./node_modules') && isdirectory('./node_modules/prettier') + let g:coc_global_extensions += ['coc-prettier'] +endif + " disabled eslint in favor of xo -" if isdirectory('./node_modules') && isdirectory('./node_modules/eslint') -" let g:coc_global_extensions += ['coc-eslint'] -" endif +if isdirectory('./node_modules') && isdirectory('./node_modules/eslint') + let g:coc_global_extensions += ['coc-eslint'] +endif " coc shortcuts +inoremap y coc#pum#visible() ? coc#pum#confirm() : "\" nnoremap gK :call CocAction('doHover') nmap gd (coc-definition) nmap gy (coc-type-definition) @@ -103,6 +104,7 @@ nnoremap gb '`[' . strpart(getregtype(), 0, 1) . '`]' filetype plugin indent on set conceallevel=0 +let g:indentLine_setConceal = 0 " js/ts/... autocmd Filetype javascript setlocal ts=2 sw=2 expandtab @@ -127,3 +129,4 @@ if has('macunix') endif +" lua require('init')