Skip to content

Commit f1c97db

Browse files
committed
update 24/04/2020
1 parent fb47cf1 commit f1c97db

File tree

2 files changed

+299
-276
lines changed

2 files changed

+299
-276
lines changed

config/init.vim

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,30 @@ nnoremap <Up> <nop>
44
nnoremap <Down> <nop>
55
nnoremap <Left> <nop>
66
nnoremap <Right> <nop>
7-
inoremap <Up> <nop>
8-
inoremap <Down> <nop>
9-
inoremap <Left> <nop>
10-
inoremap <Right> <nop>
7+
"inoremap <Up> <nop>
8+
"inoremap <Down> <nop>
9+
"inoremap <Left> <nop>
10+
"inoremap <Right> <nop>
1111

1212
" usability
1313
set tabstop=8
1414
set shiftwidth=8
1515
set softtabstop=8
1616
set list lcs=tab:\|\
17+
set showbreak=\
1718
set nu
1819

20+
" folding
21+
set foldmethod=syntax
22+
set foldclose=all
23+
set foldnestmax=1
24+
set foldminlines=10
25+
26+
" usefull
27+
28+
set inccommand=nosplit
29+
30+
1931
" python paths pretty much
2032
let g:python_host_prog = '/usr/bin/python2.7'
2133
let g:python3_host_prog = '/usr/bin/python3.8'
@@ -30,8 +42,8 @@ call plug#begin('~/.neovim/plug')
3042

3143
" utility
3244
Plug 'junegunn/fzf'
33-
Plug 'scrooloose/nerdtree'
34-
Plug 'Xuyuanp/nerdtree-git-plugin'
45+
" Plug 'scrooloose/nerdtree'
46+
" Plug 'Xuyuanp/nerdtree-git-plugin'
3547
Plug 'tpope/vim-fugitive'
3648
Plug 'sirver/ultisnips'
3749
Plug 'honza/vim-snippets'
@@ -41,6 +53,8 @@ call plug#begin('~/.neovim/plug')
4153
Plug 'vim-airline/vim-airline'
4254
Plug 'vim-airline/vim-airline-themes'
4355
Plug 'ryanoasis/vim-devicons'
56+
Plug 'endel/vim-github-colorscheme'
57+
4458
call plug#end()
4559

4660
" PLUGIN SETTINGS
@@ -50,20 +64,28 @@ let g:deoplete#enable_at_startup = 1
5064

5165
let g:LanguageClient_serverCommands = {
5266
\'c': ['ccls'],
53-
\'cpp': ['ccls', '--init={"clang":{"resourceDir":"/usr/lib/clang/9.0.1"}}'],
67+
\'cpp': ['ccls', '--init={"clang":{"resourceDir":"/usr/lib/clang/10.0.0"}}'],
5468
\'cuda': ['ccls'],
5569
\'python':['$HOME/.local/bin/pyls'],
5670
\'rust':['rustup', 'run', 'stable', 'rls'],
5771
\'go':['gopls'],
72+
\'tex':['texlab'],
73+
\'js':['$HOME/npm/bin/javascript-typescript-langserver'],
74+
\'html':['$HOME/npm/bin/html-languageserver', '--stdio'],
75+
\'php':['php','vendor/felixfbecker/language-server/bin/php-language-server.php'],
5876
\}
5977

6078
let g:LanguageClient_loadSettings = 1
6179

6280
" utility
6381

64-
let g:UltiSnipsExpandTrigger="<tab>"
65-
let g:UltiSnipsJumpForwardTrigger="<c-b>"
66-
let g:UltiSnipsJumpBackwardTrigger="<c-z>"
82+
let g:UltiSnipsExpandTrigger="<leader><tab>"
83+
let g:UltiSnipsJumpForwardTrigger="<c-j>"
84+
let g:UltiSnipsJumpBackwardTrigger="<c-k>"
85+
86+
" theming
87+
colorscheme ron
88+
6789

6890
" BINDS/HOOKS (autocmd, map)
6991

@@ -86,9 +108,11 @@ endfunction()
86108

87109
augroup LSP
88110
autocmd!
89-
autocmd FileType c,cc,cpp,go,h,hh,hpp,py call SetLSPShortcuts()
90-
autocmd BufWritePre *.c,*.cc,*.cpp,*.go,*.h,*.hh,*.hpp,*.py :call LanguageClient#textDocument_formatting()
111+
autocmd FileType c,cc,cpp,go,h,hh,hpp,html,js,php,py,tex call SetLSPShortcuts()
112+
autocmd BufWritePre *.c,*.cc,*.cpp,*.go,*.h,*.hh,*.hpp,*.js,*.py,*.tex :call LanguageClient#textDocument_formatting()
91113
augroup END
92114

93-
autocmd vimenter * NERDTree
115+
au BufRead,BufNewFile *.tex set filetype=tex
116+
117+
" autocmd vimenter * NERDTree
94118

0 commit comments

Comments
 (0)