Browse Source

More ch-ch-ch-anges.

jackyalcine 10 months ago
parent
commit
72645fe88c
Signed by: Jacky Alciné <yo@jacky.wtf> GPG Key ID: 537A4F904B15268D
3 changed files with 72 additions and 352 deletions
  1. 0
    1
      home/.config/nvim/ginit.vim
  2. 70
    349
      home/.config/nvim/init.vim
  3. 2
    2
      home/.vimrc_background

+ 0
- 1
home/.config/nvim/ginit.vim View File

@@ -4,4 +4,3 @@
4 4
 " Last Modified: 2018-01-03
5 5
 
6 6
 set guifont=Fira\ Code:h9
7
-set guifont=mononoki\ Nerd\ Font\ Mono:h9

+ 70
- 349
home/.config/nvim/init.vim View File

@@ -15,31 +15,43 @@ let vimrc_root = fnamemodify($MYVIMRC, ':p:h')
15 15
 exec "let $PATH=\"" . vimrc_root . "/node_modules/.bin:\" . $PATH"
16 16
 
17 17
 " {{{ settings
18
+" These are core options for Neovim. A lot of these help me use Neovim in a
19
+" semi-intuitive fashion for me.
20
+"
21
+if has('termguicolors') " {{{2 Improve terminal colors
22
+  set t_8f=\[[38;2;%lu;%lu;%lum
23
+  set t_8b=\[[48;2;%lu;%lu;%lum
24
+  set termguicolors
25
+endif " 2}}}
18 26
 
27
+" Always show a statusline.
19 28
 set laststatus=2
20
-set ruler number numberwidth=6 relativenumber
21
-set nocursorline nocursorcolumn
29
+"
30
+" Allow myself to count what line I'm on; optimized for scanning and jumping
31
+" over multiple lines quickly.
32
+set number numberwidth=6 relativenumber
22 33
 set sidescrolloff=1 sidescroll=1
23 34
 set conceallevel=3 concealcursor=nivc
24
-set foldenable foldminlines=5 foldmethod=syntax foldlevel=2
25
-set nowrap
26
-set signcolumn=yes
35
+
36
+" Fold options {{{2
37
+set foldenable
38
+set foldminlines=10
39
+set foldmethod=syntax
40
+set foldlevel=3
41
+" 2}}}
42
+set wrap wrapmargin=2
43
+set linebreak
27 44
 set shortmess+=c
28 45
 set hidden
29 46
 set pumheight=5
30 47
 set noshowmode noshowmatch
31 48
 set lazyredraw
32 49
 set spelllang=en_us
33
-set noshowcmd
34
-set maxfuncdepth=4096
35 50
 set inccommand=nosplit
36 51
 set redrawtime=10
52
+set maxmempattern=8196
37 53
 
38
-if has('termguicolors') " set true colors
39
-  set t_8f=\[[38;2;%lu;%lu;%lum
40
-  set t_8b=\[[48;2;%lu;%lu;%lum
41
-  set termguicolors
42
-endif
54
+set completeopt=menu,menuone,preview,noselect,noinsert
43 55
 
44 56
 set fillchars+=diff:⣿
45 57
 set fillchars+=vert:│
@@ -55,12 +67,9 @@ set listchars+=tab:\|\
55 67
 set regexpengine=1
56 68
 
57 69
 set undofile
58
-set undodir=$HOME/.config/nvim/undo
59
-set undolevels=5000
60
-
61 70
 set backup writebackup
71
+set undodir=$HOME/.config/nvim/undo
62 72
 set backupdir=$HOME/.config/nvim/backup
63
-
64 73
 set noswapfile
65 74
 
66 75
 set tabstop=2 softtabstop=2
@@ -76,7 +85,7 @@ set tags+=./tags,./.tags,./.vimtags
76 85
 set tags+=tags,.tags,.vimtags
77 86
 set tags+=$HOME/.config/nvim/tags/*
78 87
 set nocscopetag
79
-
88
+set showfulltag showmatch
80 89
 " }}}
81 90
 
82 91
 iabbrev myemail yo@jacky.wtf
@@ -86,56 +95,9 @@ iabbrev me_lname Alciné
86 95
 iabbrev me_site https://jacky.wtf
87 96
 
88 97
 " {{{ local funcs
89
-func! s:enhance_prose() abort
90
-  let l:is_in_text = (&filetype ==# 'text')
91
-  setlocal foldlevel=6
92
-  setlocal conceallevel=2
93
-
94
-  call textobj#quote#init({
95
-        \ 'educate': l:is_in_text
96
-        \ })
97
-  call textobj#sentence#init()
98
-  call litecorrect#init()
99
-  call pencil#init({
100
-        \ 'wrap': 'soft',
101
-        \ 'autoformat': 1
102
-        \ })
103
-  call lexical#init()
104
-
105
-  nmap <buffer> <silent> Q gqap
106
-  xmap <buffer> <silent> Q gq
107
-  nmap <buffer> <silent> <leader>Q vapJgqap
108
-  nmap <buffer> <c-s> [s1z=<c-o>
109
-  imap <buffer> <c-s> <c-g>u<Esc>[s1z=`]A<c-g>u
110
-  iabbrev <buffer> -- –
111
-  iabbrev <buffer> --- —
112
-  iabbrev <buffer> << «
113
-  iabbrev <buffer> >> »
114
-endfunc
115
-
116
-func! s:adapt_terminal() abort
117
-  setl noruler nocursorcolumn nocursorline norelativenumber nonumber
118
-  setl signcolumn=no foldcolumn=0
119
-  silent! IndentLinesDisable
120
-endfunc
121
-
122 98
 func! s:terminal_kill_extra_buffers() abort
123
-  silent! TagbarClose
124 99
   silent! cclose
125 100
   silent! lclose
126
-  silent! MerginalClose
127
-  silent! bd Merginal:branchList
128
-endfunc
129
-
130
-func! s:php_invoke(cmd) abort
131
-  if     a:cmd ==# 'sortuse' | call PhpInsertUse()
132
-  elseif a:cmd ==# 'expandclass' | call PhpExpandClass()
133
-  elseif a:cmd ==# 'insertuse' | call PhpInsertUse()
134
-  endif
135
-endfunc
136
-
137
-func! s:LaunchNoteOfTheDay() abort
138
-  execute ':Note Morning Entries/' . strftime('%Y-%m-%d')
139 101
 endfunc
140 102
 
141 103
 func! s:VagrantTransform(cmd) abort
@@ -151,25 +113,6 @@ func! s:DockerComposeTransform(cmd) abort
151 113
   return 'docker-compose run ' . b:test_docker_compose_service . ' '.shellescape(a:cmd)
152 114
 endfunction
153 115
 
154
-func! s:goyo_enter() abort
155
-  Limelight
156
-  silent !tmux set status off
157
-  silent !tmux list-panes -F '\#F' | grep -q Z || tmux resize-pane -Z
158
-  set noshowmode
159
-  set noshowcmd
160
-  set scrolloff=999
161
-  TagbarClose
162
-endfunction
163
-
164
-func! s:goyo_leave() abort
165
-  set scrolloff=5
166
-  set showcmd
167
-  set showmode
168
-  silent !tmux list-panes -F '\#F' | grep -q Z && tmux resize-pane -Z
169
-  silent !tmux set status on
170
-  Limelight!
171
-endfunction
172
-
173 116
 func! s:apply_bulk_mappings(mappings_list, opts) abort " {{{
174 117
   for l:a_mapping in a:mappings_list
175 118
     let l:command = l:a_mapping[0]
@@ -207,14 +150,12 @@ filetype off
207 150
 call plug#begin(expand('$HOME/.config/nvim/plugins'))
208 151
 
209 152
 Plug 'tpope/vim-sensible'
210
-Plug 'tpope/vim-repeat'
211
-Plug 'tpope/vim-endwise'
212 153
 Plug 'tpope/vim-surround'
154
+Plug 'tpope/vim-endwise'
155
+Plug 'tpope/vim-repeat'
213 156
 Plug 'tpope/vim-eunuch'
214
-Plug 'tpope/vim-speeddating'
215
-Plug 'tpope/vim-projectionist'
216
-Plug 'tpope/vim-scriptease'
217 157
 Plug 'tpope/vim-vinegar'
158
+Plug 'tpope/vim-scriptease'
218 159
 Plug 'janko-m/vim-test'
219 160
 Plug 'tpope/vim-dotenv'
220 161
       \ | Plug 'direnv/direnv.vim'
@@ -223,116 +164,56 @@ Plug 'w0rp/ale'
223 164
 Plug 'Shougo/vimproc.vim', {'do' : 'make'}
224 165
 Plug 'tpope/vim-commentary'
225 166
       \ | Plug 'cbaumhardt/vim-commentary-boxed'
226
-Plug 'xolox/vim-misc'
227
-Plug 'xolox/vim-shell'
228
-      \ | Plug 'xolox/vim-notes'
229
-      \ | Plug 'vim-scripts/utl.vim'
230
-      \ | Plug 'bpstahlman/txtfmt'
231
-      \ | Plug 'powerman/vim-plugin-AnsiEsc'
232
-      \ | Plug 'zhm/TagHighlight'
233 167
 Plug 'tpope/vim-fugitive'
234 168
       \ | Plug 'tpope/vim-rhubarb'
235 169
       \ | Plug 'int3/vim-extradite'
236 170
       \ | Plug 'tommcdo/vim-fubitive'
237 171
       \ | Plug 'tommcdo/vim-fugitive-blame-ext'
238
-Plug 'idanarye/vim-merginal'
239
-Plug 'mattn/webapi-vim'
240
-      \ | Plug 'mattn/gist-vim', { 'on': 'Gist' }
241
-Plug 'bfrg/vim-cpp-modern'
172
+Plug 'bfrg/vim-cpp-modern', { 'for': 'c++,c' }
242 173
 Plug 'junkblocker/patchreview-vim'
243 174
 Plug 'codegram/vim-codereview'
244 175
 Plug 'chiel92/vim-autoformat'
245 176
 Plug 'editorconfig/editorconfig-vim'
246 177
 Plug 'embear/vim-localvimrc'
247
-Plug 'gabrielelana/vim-markdown'
248
-Plug 'jceb/vim-orgmode'
249
-Plug 'mattn/calendar-vim'
250 178
 Plug 'vim-scripts/SyntaxRange'
251
-Plug 'arakashic/chromatica.nvim',
252
-      \ {'for': ['cpp', 'c'] }
179
+Plug 'arakashic/chromatica.nvim', {'for': ['cpp', 'c'] }
253 180
 Plug 'mhinz/vim-signify'
254
-Plug 'lilydjwg/colorizer', {'for': ['css', 'scss']}
255 181
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
256 182
       \ | Plug 'junegunn/fzf.vim'
257 183
       \ | Plug 'fszymanski/fzf-gitignore', { 'do' : ':UpdateRemotePlugins' }
258
-      \ | Plug 'tweekmonster/fzf-filemru'
259
-Plug 'moll/vim-node'
260 184
 Plug 'KabbAmine/zeavim.vim'
261 185
 Plug 'vim-airline/vim-airline' |
262 186
       \ Plug 'vim-airline/vim-airline-themes'
263
-Plug 'tpope/vim-dispatch' |
264
-      \ Plug 'radenling/vim-dispatch-neovim'
265
-Plug 'tmux-plugins/vim-tmux'
266
-      \ | Plug 'tmux-plugins/vim-tmux-focus-events'
267
-      \ | Plug 'MikeDacre/tmux-zsh-vim-titles'
268
-Plug 'Shougo/echodoc.vim'
269 187
 Plug 'ludovicchabant/vim-gutentags'
270
-Plug 'majutsushi/tagbar'
271 188
 Plug 'airblade/vim-rooter'
272
-Plug 'raimondi/delimitmate'
273
-Plug 'godlygeek/tabular'
274
-Plug 'tweekmonster/startuptime.vim', { 'on': 'StartupTime' }
275 189
 Plug 'sheerun/vim-polyglot'
276
-Plug 'lambdalisue/vim-pyenv', { 'for': 'python' }
277
-Plug 'ekalinin/Dockerfile.vim'
278
-Plug 'othree/jspc.vim'
279 190
 Plug 'sirver/ultisnips'
280 191
       \ |  Plug 'honza/vim-snippets'
281
-Plug 'kana/vim-textobj-user'
282
-      \ | Plug 'reedes/vim-textobj-sentence'
283
-      \ | Plug 'reedes/vim-textobj-quote'
284
-      \ | Plug 'reedes/vim-pencil'
285
-      \ | Plug 'reedes/vim-lexical'
286
-      \ | Plug 'reedes/vim-litecorrect'
287 192
 Plug 'vim-scripts/dbext.vim'
288
-Plug 'ncm2/ncm2'
289
-      \ | Plug 'ncm2/ncm2-match-highlight'
290
-      \ | Plug 'ncm2/ncm2-bufword'
291
-      \ | Plug 'ncm2/ncm2-tagprefix'
292
-      \ | Plug 'ncm2/ncm2-path'
293
-      \ | Plug 'ncm2/ncm2-ultisnips'
294
-      \ | Plug 'ncm2/ncm2-tern', {
295
-      \ 'for': 'javascript'
296
-      \ }
297
-      \ | Plug 'ncm2/ncm2-cssomni', {
298
-      \ 'for': 'css'
299
-      \ }
300
-      \ | Plug 'ncm2/nvim-typescript', {
301
-      \ 'do': 'bash ./install.sh'
302
-      \ }
303 193
 Plug 'terryma/vim-multiple-cursors'
304
-Plug 'davidhalter/jedi-vim', {'for': 'python'}
305
-Plug 'fisadev/vim-isort', {'for': 'python'}
306
-Plug 'roxma/vim-tmux-clipboard'
307 194
 Plug 'mhinz/vim-startify'
308
-Plug 'junegunn/goyo.vim'
309
-Plug 'junegunn/limelight.vim'
310
-Plug 'thinca/vim-ref'
311 195
 Plug 'ryanoasis/vim-devicons'
312 196
 Plug 'chriskempson/base16-vim'
313 197
 Plug 'mattesgroeger/vim-bookmarks'
198
+Plug 'sodapopcan/vim-twiggy'
199
+Plug 'junegunn/gv.vim'
200
+Plug 'vrybas/vim-flayouts'
314 201
 
315 202
 call plug#end()
316 203
 " }}}
317 204
 
318 205
 " {{{ Options
319
-" {{{2 python
320
-let g:pyenv#auto_activate = 1
321
-let g:pyenv#auto_create_ctags = 1
322
-let g:pyenv#auto_assign_ctags = 1
323
-let g:python_highlight_all = 1
324
-let g:python_slow_sync = 0
325
-" }}}
326
-"
327 206
 " {{{2 vim-bookmarks
328 207
 let g:bookmark_sign = '♥'
329 208
 let g:bookmark_highlight_lines = 1
330 209
 " }}}
331 210
 "
332 211
 " {{{2 signify
333
-let g:signify_vcs_list = [ 'git', 'bzr' ]
212
+let g:signify_vcs_list = [ 'git', 'hg', 'bzr' ]
334 213
 let g:signify_realtime = 1
335 214
 let g:signify_sign_show_count = 0
215
+let g:signify_line_highlight = 0
216
+
336 217
 " 2}}}
337 218
 
338 219
 if executable('ag')
@@ -340,76 +221,24 @@ if executable('ag')
340 221
   set grepprg=ag\ --nogroup\ --column\ --smart-case\ --nocolor\ --follow
341 222
   set grepformat=%f:%l:%c:%m
342 223
 endif
343
-
344
-let g:nvim_typescript#type_info_on_hold = 0
345
-let g:nvim_typescript#vue_support = 0
346 224
 " }}}
347 225
 "
348 226
 " {{{2 ale
349 227
 let g:ale_command_wrapper = 'nice -n4'
350
-let g:ale_completion_enabled = 0
351
-let g:ale_c_gcc_options = '-std=c++17 -Wall -Werror'
352
-let g:ale_c_clang_options = '-std=c++17 -Wall -Werror'
353
-let g:ale_c_parse_compile_commands = 1
354
-let g:ale_c_parse_makefile = 0
355
-let g:ale_c_build_dir = 'build'
356
-let g:ale_cpp_gcc_options = '-std=c++17 -Wall -Werror'
357
-let g:ale_cpp_clang_options = '-std=c++17 -Wall -Werror'
358
-let g:ale_cpp_parse_compile_commands = 1
359
-let g:ale_cpp_parse_makefile = 0
360
-let g:ale_cpp_build_dir = 'build'
361
-let g:ale_echo_delay = 1
362
-let g:ale_echo_msg_error_str = nr2char(0xf421) . ' '
363
-let g:ale_echo_msg_format = '%severity%  %linter% - %s'
364
-let g:ale_echo_msg_info_str = nr2char(0xf05a) . ' '
365
-let g:ale_echo_msg_warning_str = nr2char(0xf420) . ' '
366
-let g:ale_history_enabled = 1
367
-let g:ale_history_log_output = 1
368
-let g:ale_php_langserver_executable = 'phpenv exec ' . vimrc_root . '/plugins/LanguageServer-php-neovim/vendor/bin/php-language-server.php'
369
-let g:ale_php_phpcbf_executable = 'phpenv exec composer exec phpcbf'
370
-let g:ale_php_phpcs_executable = 'phpenv exec composer exec phpcs'
371 228
 let g:ale_set_ballons = 1
372
-let g:ale_sign_column_always = 1
373
-let g:ale_sign_error = g:ale_echo_msg_error_str
374
-let g:ale_sign_warning = g:ale_echo_msg_warning_str
375
-let g:ale_statusline_format = [
376
-      \ g:ale_echo_msg_error_str . ' %d',
377
-      \ g:ale_echo_msg_warning_str . ' %d',
378
-      \ nr2char(0xf4a1) . '  ']
379
-let g:ale_typescript_tslint_ignore_empty_files = 1
380
-let g:ale_typescript_tslint_use_global = 0
381
-
382
-let s:ale_linters = {
383
-      \ 'vue': ['vls'],
384
-      \ 'typescript': ['tslint', 'tsserver'],
385
-      \ 'javascript': ['importj'],
386
-      \ 'elixir': ['mix', 'dogma', 'dialyxir', 'credo'],
387
-      \ 'cpp': ['ccls', 'clang', 'clangcheck', 'clangd', 'clangtidy', 'clazy', 'cppcheck', 'cpplint', 'cquery', 'flawfinder', 'gcc', 'ccls', 'clang', 'clangcheck', 'clangd', 'clangtidy', 'clazy', 'cppcheck', 'cpplint', 'cquery', 'flawfinder', 'gcc'],
388
-      \ 'json': ['jq']
229
+let g:ale_completion_enabled = 1
230
+let g:ale_fix_on_save = 1
231
+let g:ale_completion_delay = 1
232
+let g:ale_completion_max_suggestions = 10
233
+let g:ale_fixers = {
234
+      \ '*' : ['remove_trailing_lines', 'trim_whitespace'],
235
+      \ 'javascript': ['eslint'],
236
+      \ 'typescript': ['eslint'],
237
+      \ 'vue': ['prettier'],
238
+      \ 'scss': ['stylelint'],
239
+      \ 'html': ['stylelint', 'tidy'],
240
+      \ 'rust': ['rustfmt'],
389 241
       \ }
390
-
391
-let s:ale_fixers = {
392
-      \ 'cpp': ['clang-format', 'uncrustify', 'remove_trailing_lines', 'trim_whitespace'],
393
-      \ 'vue': ['vls', 'trim_whitespace', 'remove_trailing_lines'],
394
-      \ 'json': ['jq', 'trim_whitespace', 'remove_trailing_lines'],
395
-      \ 'elixir': [ 'mix_format', 'trim_whitespace', 'remove_trailing_lines'],
396
-      \ 'typescript': ['tslint', 'trim_whitespace', 'remove_trailing_lines'],
397
-      \ 'ruby': ['rubocop', 'trim_whitespace', 'remove_trailing_lines' ],
398
-      \ 'python': ['autopep8', 'add_blank_lines_for_python_control_statements', 'isort', 'yapf', 'trim_whitespace', 'remove_trailing_lines']
399
-      \}
400
-
401
-if !exists('g:ale_linters')
402
-  let g:ale_linters = s:ale_linters
403
-else
404
-  call extend(g:ale_linters, s:ale_linters)
405
-endif
406
-
407
-if !exists('g:ale_fixers')
408
-  let g:ale_fixers = s:ale_fixers
409
-else
410
-  call extend(g:ale_fixers, s:ale_fixers)
411
-endif
412
-
413 242
 " 2}}}
414 243
 "
415 244
 " {{{2 vim-test
@@ -419,93 +248,13 @@ let g:test#custom_transformations = {
419 248
       \ 'docker-compose': function('<SID>DockerComposeTransform')
420 249
       \}
421 250
 let g:test#preserve_screen = 1
422
-let g:test#strategy = 'dispatch'
423 251
 " 2}}}
424 252
 "
425
-" {{{2 tagbar
426
-let g:tagbar_type_elixir = {
427
-      \ 'ctagstype' : 'elixir',
428
-      \ 'kinds' : [
429
-      \ 'f:functions',
430
-      \ 'functions:functions',
431
-      \ 'c:callbacks',
432
-      \ 'd:delegates',
433
-      \ 'e:exceptions',
434
-      \ 'i:implementations',
435
-      \ 'a:macros',
436
-      \ 'o:operators',
437
-      \ 'm:modules',
438
-      \ 'p:protocols',
439
-      \ 'r:records',
440
-      \ 't:tests'
441
-      \ ]
442
-      \ }
443
-let g:tagbar_type_css = {
444
-      \ 'ctagstype' : 'Css',
445
-      \ 'kinds'     : [
446
-      \ 'c:classes',
447
-      \ 's:selectors',
448
-      \ 'i:identities'
449
-      \ ]
450
-      \ }
451
-let g:tagbar_type_ruby = {
452
-      \ 'kinds'      : ['m:modules',
453
-      \ 'c:classes',
454
-      \ 'C:constants',
455
-      \ 'F:singleton methods',
456
-      \ 'f:methods',
457
-      \ 'a:aliases'],
458
-      \ 'kind2scope' : { 'c' : 'class',
459
-      \ 'm' : 'class' },
460
-      \ 'scope2kind' : { 'class' : 'c' },
461
-      \ 'ctagsbin'   : vimrc_root . '/bin/ripper-tags',
462
-      \ 'ctagsargs'  : ['-f', '-']
463
-      \ }
464
-let g:tagbar_type_javascript = {
465
-      \ 'ctagsbin'   : vimrc_root . '/node_modules/.bin/jsctags',
466
-      \ 'ctagsargs'  : ['-f', '-']
467
-      \ }
468
-let g:tagbar_type_ansible = {
469
-      \ 'ctagstype' : 'ansible',
470
-      \ 'kinds' : [
471
-      \ 't:tasks'
472
-      \ ],
473
-      \ 'sort' : 0
474
-      \ }
475
-let g:tagbar_type_markdown = {
476
-      \ 'ctagstype' : 'markdown',
477
-      \ 'kinds' : [
478
-      \ 'h:Heading_L1',
479
-      \ 'i:Heading_L2',
480
-      \ 'k:Heading_L3'
481
-      \ ]
482
-      \ }
483
-let g:tagbar_type_typescript = {
484
-      \ 'ctagsbin' : vimrc_root . '/node_modules/.bin/tstags',
485
-      \ 'ctagsargs' : '-f-',
486
-      \ 'kinds': [
487
-      \ 'e:enums:0:1',
488
-      \ 'f:function:0:1',
489
-      \ 't:typealias:0:1',
490
-      \ 'M:Module:0:1',
491
-      \ 'I:import:0:1',
492
-      \ 'i:interface:0:1',
493
-      \ 'C:class:0:1',
494
-      \ 'm:method:0:1',
495
-      \ 'p:property:0:1',
496
-      \ 'v:variable:0:1',
497
-      \ 'c:const:0:1',
498
-      \ ],
499
-      \ 'sort' : 0
500
-      \ }
501
-" 2}}}
502 253
 "
503 254
 " {{{2 gutentags
504 255
 let g:gutentags_generate_on_empty_buffer = 0
505 256
 let g:gutentags_ctags_tagfile = '.tags'
506 257
 let g:gutentags_cache_dir = vimrc_root . '/tags'
507
-let g:gutentags_ctags_executable_ruby = g:tagbar_type_ruby['ctagsbin']
508
-let g:gutentags_ctags_executable_javascript = g:tagbar_type_javascript['ctagsbin']
509 258
 let g:gutentags_file_list_command = {
510 259
       \ 'markers': {
511 260
       \ '.git': 'git ls-files',
@@ -518,7 +267,6 @@ let g:gutentags_file_list_command = {
518 267
 let g:fzf_buffers_jump = 1
519 268
 let g:fzf_history_dir = expand('$HOME/.config/nvim/fzf-history')
520 269
 let g:fzf_gitignore_map = '<Leader>sgi'
521
-let g:fzf_layout = { 'down': '~40%' }
522 270
 let g:fzf_colors = {
523 271
       \ 'fg':      ['fg', 'Normal'],
524 272
       \ 'bg':      ['bg', 'Normal'],
@@ -535,45 +283,10 @@ let g:fzf_colors = {
535 283
       \ }
536 284
 " 2}}}
537 285
 "
538
-" {{{2 ncm2
539
-let g:ncm2#matcher = 'substrfuzzy'
540
-let g:ncm2#sorter = 'abbrfuzzy'
541
-let g:ncm2#popup_delay = 10
542
-" }}}
543
-"
544
-" {{{ Terminus
545
-let g:TerminusInsertCursorShape = 2
546
-let g:TerminusNormalCursorShape = 1
547
-let g:TerminusReplaceCursorShape = 0 
548
-" }}}
549
-"
550
-" {{{2 ultisnips
551
-let g:UltiSnipsExpandTrigger = '<Plug>(ultisnips_expand)'
552
-let g:UltiSnipsRemoveSelectModeMappings = 0
553
-let g:UltiSnipsJumpForwardTrigger = '<c-j>'
554
-let g:UltiSnipsJumpBackwardTrigger  = '<c-k>'
555
-" 2}}}
556
-"
557
-" {{{2 jedi
558
-let g:jedi#goto_assignments_command = '<leader>jg'
559
-let g:jedi#goto_definitions_command = '<leader>jd'
560
-let g:jedi#usages_command = '<leader>jn'
561
-let g:jedi#rename_command = '<leader>jr'
562
-let g:jedi#smart_auto_mappings = 0
563
-let g:jedi#force_py_version = 'auto'
564
-" 2}}}
565 286
 let g:rooter_use_lcd = 1
566
-" {{{2 orgmode
567
-let g:org_aggressive_conceal = 1
568
-let g:org_todo_keyword_faces = ['bold', 'inverse']
569
-let g:org_indent = 1
570
-let g:org_todo_keywords = [['TODO(t)', 'ACTIVE(a)', '|', 'DONE(d)'],
571
-      \ ['REPORT(r)', 'BUG(b)', 'KNOWNCAUSE(k)', '|', 'FIXED(f)'],
572
-      \ ['CANCELED(c)']]
573
-" 2}}}
574 287
 " {{{2 startify
575 288
 let g:startify_list_order = ['commands', 'sessions', 'bookmarks', 'files', 'dir']
576
-let g:startify_files_number = 5
289
+let g:startify_files_number = 15
577 290
 let g:startify_change_to_dir = 0
578 291
 let g:startify_fortune_use_unicode = 1
579 292
 let g:startify_session_delete_buffers = 1
@@ -591,13 +304,20 @@ let g:startify_lists = [
591 304
       \ { 'header': ['   Sessions'],       'type': 'sessions' },
592 305
       \ { 'header': ['   MRU'],            'type': 'files' },
593 306
       \ { 'header': ['   MRU '. getcwd()], 'type': 'dir' },
594
-      \ { 'header': ['   Commits'],        'type': function('s:list_commits') },
307
+      \ { 'header': ['   Vim Config Edits'],        'type': function('s:list_commits') },
308
+      \ { 'header': ['   Bookmarks'],      'type': 'bookmarks' },
309
+      \ { 'header': ['   Commands'],       'type': 'commands' },
595 310
       \ ]
596 311
 let g:startify_session_before_save = [
597 312
       \ 'silent! s:terminal_kill_extra_buffers()'
598 313
       \ ]
599 314
 " 2}}}
600 315
 "
316
+" {{{2
317
+let g:test#strategy = 'neovim'
318
+let g:test#neovim#term_position = "topleft"
319
+" }}}
320
+"
601 321
 " {{{2 localvimrc
602 322
 let g:localvimrc_sandbox = 0
603 323
 let g:localvimrc_persistent = 1
@@ -608,7 +328,7 @@ let g:localvimrc_whitelist = [expand('$HOME/.lvimrc')]
608 328
 " {{{2 airline
609 329
 let g:airline_powerline_fonts = 1
610 330
 let g:airline_skip_empty_sections = 1
611
-let g:airline_extensions = ['branch', 'tabline', 'ale', 'branch', 'tagbar', 'hunks', 'cursormode']
331
+let g:airline_extensions = ['branch', 'tabline', 'ale', 'branch', 'hunks', 'cursormode']
612 332
 let g:airline_highlighting_cache = 1
613 333
 let g:airline#extensions#ale#enabled = 1
614 334
 let g:airline#extensions#branch#displyed_head_limit = 30
@@ -648,10 +368,6 @@ let g:airline_mode_map = {
648 368
       \ '' : 'S',
649 369
       \ }
650 370
 " 2}}}
651
-let g:python_highlight_all = 1
652
-let g:notes_suffix = '.md'
653
-let g:goyo_width = '100'
654
-let g:goyo_height = '75%'
655 371
 " }}}
656 372
 
657 373
 " {{{ Mappings
@@ -710,7 +426,6 @@ call <SID>apply_bulk_mappings([
710 426
       \ ['f', ':Git fetch<space>'],
711 427
       \ ['fa', ':Git fetch --all<CR>'],
712 428
       \ ['l', ':Gpull<CR>'],
713
-      \ ['m', ':MerginalToggle<CR>'],
714 429
       \ ['p', ':Gpush<space>'],
715 430
       \ ['rm', ':Gremove %<CR>'],
716 431
       \ ['rmc', ':Gremove --cached %<CR>'],
@@ -768,9 +483,6 @@ nnoremap <A-l> <C-w>l
768 483
 
769 484
 cnoremap vhe vert help
770 485
 
771
-nnoremap <F8> :TagbarToggle<CR>
772
-nnoremap <silent> <leader><space> :Goyo<CR>
773
-
774 486
 inoremap <silent> <leader>pt <C-R>=strftime("%Y-%m-%d")<CR>
775 487
 inoremap <silent> <leader>py <C-R>=strftime("%H:%M:%S %Z")<CR>
776 488
 cnoremap <silent> <leader>py <C-R>=strftime("%H.%M.%S_%Z")<CR>
@@ -782,9 +494,18 @@ cnoremap <silent> <leader>pd <C-R>=strftime("%Y-%m-%d")<CR>
782 494
 
783 495
 " }}}
784 496
 
785
-command! Today call <SID>LaunchNoteOfTheDay()
786
-
787 497
 source ~/.vimrc_background
788 498
 
789 499
 filetype plugin indent on
790 500
 syntax on
501
+
502
+autocmd FileType gitcommit set bufhidden=delete
503
+autocmd FileType fugitive setl winheight=40
504
+autocmd TermOpen * setl nonumber signcolumn=no foldcolumn=0
505
+
506
+command! DisconnectClients
507
+      \  if exists('b:nvr')
508
+      \|   for client in b:nvr
509
+        \|     silent! call rpcnotify(client, 'Exit', 1)
510
+        \|   endfor
511
+        \| endif

+ 2
- 2
home/.vimrc_background View File

@@ -1,3 +1,3 @@
1
-if !exists('g:colors_name') || g:colors_name != 'base16-tomorrow-night'
2
-  colorscheme base16-tomorrow-night
1
+if !exists('g:colors_name') || g:colors_name != 'base16-chalk'
2
+  colorscheme base16-chalk
3 3
 endif

Loading…
Cancel
Save