Browse Source

move versions around, update config.

jackyalcine 1 year ago
parent
commit
8618c1ede9
Signed by: Jacky Alciné <yo@jacky.wtf> GPG Key ID: 36CD7728BDFD66FF

+ 0
- 1
.node-version View File

@@ -1 +0,0 @@
1
-8.11.3

+ 0
- 1
.python-version View File

@@ -1 +0,0 @@
1
-neovim-py3:neovim-py2

+ 0
- 1
.ruby-version View File

@@ -1 +0,0 @@
1
-2.5.0

.exenv-version → home/.config/nvim/.exenv-version View File


+ 1
- 0
home/.config/nvim/.python-version View File

@@ -0,0 +1 @@
1
+neovim

+ 3
- 1
home/.config/nvim/Pipfile View File

@@ -13,8 +13,10 @@ mypy = "*"
13 13
 pyls-mypy = "*"
14 14
 pyls-isort = "*"
15 15
 python-language-server = "*"
16
-neovim = "*"
17 16
 cmakelint = "*"
17
+cpplint = "*"
18 18
 vim-vint = "*"
19
+neovim = "*"
20
+psutil = "*"
19 21
 
20 22
 [dev-packages]

+ 66
- 38
home/.config/nvim/init.vim View File

@@ -32,7 +32,7 @@ set noshowmode noshowmatch
32 32
 set lazyredraw
33 33
 set spelllang=en_us
34 34
 set noshowcmd
35
-set maxfuncdepth=300
35
+set maxfuncdepth=4096
36 36
 
37 37
 if has("termguicolors") " set true colors
38 38
   set t_8f=\[[38;2;%lu;%lu;%lum
@@ -290,6 +290,7 @@ Plug 'gabrielelana/vim-markdown'
290 290
 Plug 'jceb/vim-orgmode'
291 291
 Plug 'mattn/calendar-vim'
292 292
 Plug 'vim-scripts/SyntaxRange'
293
+Plug 'arakashic/chromatica.nvim'
293 294
 Plug 'mattn/webapi-vim'
294 295
 Plug 'mhinz/vim-signify'
295 296
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
@@ -341,7 +342,7 @@ Plug 'ncm2/ncm2'
341 342
       \ | Plug 'ncm2/ncm2-tagprefix'
342 343
       \ | Plug 'ncm2/ncm2-github'
343 344
       \ | Plug 'ncm2/ncm2-path'
344
-      \ | Plug 'ncm2/nvim-typescript', { 
345
+      \ | Plug 'ncm2/nvim-typescript', {
345 346
       \ 'do': 'bash ./install.sh'
346 347
       \ }
347 348
 
@@ -360,25 +361,29 @@ Plug 'junegunn/goyo.vim'
360 361
 Plug 'junegunn/limelight.vim'
361 362
 Plug 'ryanoasis/vim-devicons'
362 363
 Plug 'thinca/vim-ref'
363
-Plug 'fcpg/vim-orbital'
364 364
 
365 365
 call plug#end()
366 366
 " }}}
367 367
 
368 368
 " {{{ Options
369
-" {{{2 Language Client
370
-" }}}
371
-"
372 369
 " {{{2 python
373 370
 let g:pyenv#auto_activate = 1
374 371
 let g:pyenv#auto_create_ctags = 1
375 372
 let g:pyenv#auto_assign_ctags = 1
376 373
 let g:python_highlight_all = 1
377 374
 let g:python_slow_sync = 0
378
-let g:python3_host_prog = systemlist('PYENV_VERSION=neovim-py3 pyenv which python3')[0]
379
-let g:python_host_prog = systemlist('PYENV_VERSION=neovim-py2 pyenv which python2')[0]
375
+let g:python_host_prog = systemlist('pyenv which python')[0]
376
+let g:python3_host_prog = systemlist('pyenv which python')[0]
380 377
 " }}}
381 378
 "
379
+" {{{2 LanguageClient
380
+let g:LanguageClient_settingsPath = '~/.config/nvim/language_client.json'
381
+let g:LanguageClient_serverCommands = {
382
+      \ 'cpp': ['cquery', '--log-file=~/.config/nvim/log/cq.log'],
383
+      \ 'c': ['cquery', '--log-file=~/.config/nvim/log/cq.log'],
384
+      \ }
385
+" 2}}}
386
+"
382 387
 " {{{2 identline
383 388
 let g:indentLine_char = '┊'
384 389
 let g:indentLine_showFirstIndentLevel = 0
@@ -404,24 +409,29 @@ let g:nvim_typescript#vue_support = 0
404 409
 " }}}
405 410
 "
406 411
 " {{{2 ale
407
-let g:ale_history_enabled = 1
408
-let g:ale_history_log_output = 1
409
-let g:ale_php_phpcs_executable = 'phpenv exec composer global exec phpcs'
410
-let g:ale_php_phpcbf_executable = 'phpenv exec composer global exec phpcbf'
411
-let g:ale_set_ballons = 1
412
-let g:ale_cursor_detail = 1
413
-let g:ale_close_preview_on_insert = 1
414
-let g:ale_command_wrapper = 'nice -n5'
415
-let g:ale_echo_delay = 3
412
+let g:ale_command_wrapper = 'nice -n6'
416 413
 let g:ale_completion_enabled = 1
417
-let g:ale_typescript_tslint_use_global = 0
418
-let g:ale_typescript_tslint_ignore_empty_files = 1
419
-let g:ale_elixir_elixir_ls_release = vimrc_root . '/plugins/eli'
420
-let g:ale_php_langserver_executable = 'phpenv exec ' . vimrc_root . '/plugins/LanguageServer-php-neovim/vendor/bin/php-language-server.php'
414
+let g:ale_c_gcc_options = '-std=c++17 -Wall -Werror'
415
+let g:ale_c_clang_options = '-std=c++17 -Wall -Werror'
416
+let g:ale_c_parse_compile_commands = 1
417
+let g:ale_c_parse_makefile = 0
418
+let g:ale_c_build_dir = 'build'
419
+let g:ale_cpp_gcc_options = '-std=c++17 -Wall -Werror'
420
+let g:ale_cpp_clang_options = '-std=c++17 -Wall -Werror'
421
+let g:ale_cpp_parse_compile_commands = 1
422
+let g:ale_cpp_parse_makefile = 0
423
+let g:ale_cpp_build_dir = 'build'
424
+let g:ale_echo_delay = 1
421 425
 let g:ale_echo_msg_error_str = nr2char(0xf421) . ' '
422
-let g:ale_echo_msg_warning_str = nr2char(0xf420) . ' '
423
-let g:ale_echo_msg_info_str = nr2char(0xf05a) . ' '
424 426
 let g:ale_echo_msg_format = '%severity%  %linter% - %s'
427
+let g:ale_echo_msg_info_str = nr2char(0xf05a) . ' '
428
+let g:ale_echo_msg_warning_str = nr2char(0xf420) . ' '
429
+let g:ale_history_enabled = 1
430
+let g:ale_history_log_output = 1
431
+let g:ale_php_langserver_executable = 'phpenv exec ' . vimrc_root . '/plugins/LanguageServer-php-neovim/vendor/bin/php-language-server.php'
432
+let g:ale_php_phpcbf_executable = 'phpenv exec composer exec phpcbf'
433
+let g:ale_php_phpcs_executable = 'phpenv exec composer exec phpcs'
434
+let g:ale_set_ballons = 1
425 435
 let g:ale_sign_column_always = 1
426 436
 let g:ale_sign_error = g:ale_echo_msg_error_str
427 437
 let g:ale_sign_warning = g:ale_echo_msg_warning_str
@@ -429,17 +439,21 @@ let g:ale_statusline_format = [
429 439
       \ g:ale_echo_msg_error_str . ' %d',
430 440
       \ g:ale_echo_msg_warning_str . ' %d',
431 441
       \ nr2char(0xf4a1) . '  ']
442
+let g:ale_typescript_tslint_ignore_empty_files = 1
443
+let g:ale_typescript_tslint_use_global = 0
432 444
 
433 445
 let s:ale_linters = {
434 446
       \ 'vue': ['vls'],
435 447
       \ 'typescript': ['tslint', 'tsserver'],
436 448
       \ 'javascript': ['importj'],
437
-      \ 'elixir': ['mix', 'dogma', 'dialyxir', 'credo']
449
+      \ 'elixir': ['mix', 'dogma', 'dialyxir', 'credo'],
450
+      \ 'cpp': ['ccls', 'clang', 'clangcheck', 'clangd', 'clangtidy', 'clazy', 'cppcheck', 'cpplint', 'cquery', 'flawfinder', 'gcc', 'ccls', 'clang', 'clangcheck', 'clangd', 'clangtidy', 'clazy', 'cppcheck', 'cpplint', 'cquery', 'flawfinder', 'gcc'],
451
+      \ 'json': ['jq']
438 452
       \ }
439 453
 
440 454
 let s:ale_fixers = {
441
-      \ 'cpp': ['clang-format', 'uncrustify'],
442
-      \ 'vue': ['vls', 'trim_whitespace', 'remove_trailing_lines'], 
455
+      \ 'cpp': ['clang-format', 'uncrustify', 'remove_trailing_lines', 'trim_whitespace'],
456
+      \ 'vue': ['vls', 'trim_whitespace', 'remove_trailing_lines'],
443 457
       \ 'json': ['jq', 'trim_whitespace', 'remove_trailing_lines'],
444 458
       \ 'elixir': [ 'mix_format', 'trim_whitespace', 'remove_trailing_lines'],
445 459
       \ 'typescript': ['tslint', 'trim_whitespace', 'remove_trailing_lines'],
@@ -463,10 +477,10 @@ endif
463 477
 "
464 478
 " {{{2 vim-test
465 479
 let g:test#custom_transformations = {
466
-    \ 'vagrant': function('<SID>VagrantTransform'),
467
-    \ 'docker': function('<SID>DockerTransform'),
468
-    \ 'docker-compose': function('<SID>DockerComposeTransform')
469
-    \}
480
+      \ 'vagrant': function('<SID>VagrantTransform'),
481
+      \ 'docker': function('<SID>DockerTransform'),
482
+      \ 'docker-compose': function('<SID>DockerComposeTransform')
483
+      \}
470 484
 let g:test#preserve_screen = 1
471 485
 let g:test#strategy = 'dispatch'
472 486
 " 2}}}
@@ -621,12 +635,12 @@ let g:startify_files_number = 5
621 635
 let g:startify_change_to_dir = 0
622 636
 let g:startify_fortune_use_unicode = 1
623 637
 let g:startify_session_delete_buffers = 1
624
-  function! s:list_commits()
625
-    let git = 'git -C ~/.homesick/repos/vimrc'
626
-    let commits = systemlist(git .' log --oneline | head -n10')
627
-    let git = 'G'. git[1:]
628
-    return map(commits, '{"line": matchstr(v:val, "\\s\\zs.*"), "cmd": "'. git .' show ". matchstr(v:val, "^\\x\\+") }')
629
-  endfunction
638
+function! s:list_commits()
639
+  let git = 'git -C ~/.homesick/repos/vimrc'
640
+  let commits = systemlist(git .' log --oneline | head -n10')
641
+  let git = 'G'. git[1:]
642
+  return map(commits, '{"line": matchstr(v:val, "\\s\\zs.*"), "cmd": "'. git .' show ". matchstr(v:val, "^\\x\\+") }')
643
+endfunction
630 644
 let g:startify_lists = [
631 645
       \ { 'header': ['   MRU'],            'type': 'files' },
632 646
       \ { 'header': ['   MRU '. getcwd()], 'type': 'dir' },
@@ -645,6 +659,12 @@ let g:localvimrc_persistent_file = expand('$HOME/.config/nvim/localvimrc_persist
645 659
 let g:localvimrc_whitelist = [expand('$HOME/.lvimrc')]
646 660
 " 2}}}
647 661
 "
662
+" {{{2
663
+let g:zv_file_types = {
664
+      \ '.jsx' : 'javascript,html',
665
+      \ }
666
+" 2}}}
667
+"
648 668
 " {{{2 airline
649 669
 let g:airline_powerline_fonts = 1
650 670
 let g:airline#extensions#quickfix#quickfix_text = 'qfx'
@@ -792,6 +812,15 @@ call <SID>apply_bulk_mappings([
792 812
       \ 'prefix': 'ph'
793 813
       \ })
794 814
 
815
+call <SID>apply_bulk_mappings([
816
+      \ ['h', ':call LanguageClient#textDocument_hover()<CR>'],
817
+      \ ['d', ':call LanguageClient#textDocument_definition()<CR>'],
818
+      \ ['f', ':call LanguageClient#textDocument_references()<CR>'],
819
+      \ ['s', ':call LanguageClient#textDocument_documentSymbol()<CR>'],
820
+      \ ['r', ':call LanguageClient#textDocument_rename()<CR>'],
821
+      \ ], {
822
+      \ 'prefix': 'x'
823
+      \ })
795 824
 
796 825
 inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
797 826
 inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
@@ -865,8 +894,7 @@ augroup END
865 894
 
866 895
 command! Today call <SID>LaunchNoteOfTheDay()
867 896
 
868
-" source ~/.vimrc_background
869
-colorscheme orbital
897
+source ~/.vimrc_background
870 898
 
871 899
 filetype plugin indent on
872 900
 syntax on

+ 1
- 0
home/.config/nvim/language_client.json View File

@@ -1,5 +1,6 @@
1 1
 {
2 2
   "initializationOptions": {
3
+    "cacheDirectory": "~/.config/nvim/tmp",
3 4
     "config": {
4 5
       "vetur": {
5 6
         "colorDecorators": {

+ 3
- 5
home/.local/bin/neovim-install-dependencies View File

@@ -31,24 +31,22 @@ install_python ()
31 31
 
32 32
 install_ruby ()
33 33
 {
34
+  anyenv install rbenv
34 35
   rbenv exec bundle install
35 36
 }
36 37
 
37 38
 install_javascript ()
38 39
 {
40
+  anyenv install ndenv
39 41
   ndenv exec npm install
40 42
 }
41 43
 
42 44
 install_perl ()
43 45
 {
46
+  anyenv install plenv
44 47
   plenv exec carton install
45 48
 }
46 49
 
47
-install_elixir ()
48
-{
49
-  # TODO: Install elixir language client server here.
50
-}
51
-
52 50
 __ScriptVersion="2017-12-24"
53 51
 
54 52
 #===  FUNCTION  ================================================================

+ 2
- 2
home/.vimrc_background View File

@@ -1,3 +1,3 @@
1
-if !exists('g:colors_name') || g:colors_name != 'base16-atelier-sulphurpool'
2
-  colorscheme base16-atelier-sulphurpool
1
+if !exists('g:colors_name') || g:colors_name != 'base16-oceanicnext'
2
+  colorscheme base16-oceanicnext
3 3
 endif

Loading…
Cancel
Save