gregory
/
.vim
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

lazygit

dev
Gregory Leeman 8 months ago
parent
ce4c4572f0
commit
bb6e1bab2e
20 changed files with 81 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      after/ftplugin/csv.vim
  2. 2
      after/ftplugin/tsv.vim
  3. 8
      after/queries/css/highlights.scm
  4. 5
      after/queries/javascript/highlights.scm
  5. 3
      after/queries/lua/highlights.scm
  6. 2
      after/queries/scss/highlights.scm
  7. 5
      after/queries/tsx/highlights.scm
  8. 17
      after/syntax/csv.vim
  9. 24
      after/syntax/sep.vim
  10. 32
      colors/solarized.vim
  11. 0
      ftplugin/cpp.vim
  12. 2
      ftplugin/csv.vim
  13. 10
      ftplugin/dirvish.vim
  14. 0
      ftplugin/python.vim
  15. 14
      ftplugin/sep.vim
  16. 0
      ftplugin/text.vim
  17. 2
      ftplugin/tsv.vim
  18. 30
      syntax/csv.vim
  19. 19
      syntax/sep.vim
  20. 2
      syntax/tsv.vim

2
after/ftplugin/csv.vim
View File

@ -1,2 +0,0 @@
let b:div = ","
runtime! after/ftplugin/sep.vim

2
after/ftplugin/tsv.vim
View File

@ -1,2 +0,0 @@
let b:div = "\t"
runtime! after/ftplugin/sep.vim

8
after/queries/css/highlights.scm
View File

@ -1,8 +0,0 @@
; extends
((pseudo_class_selector) @type (#set! "priority" 125))
((class_selector) @type (#set! "priority" 125))
((plain_value) @constant (#set! "priority" 125))
((id_selector) @constructor (#set! "priority" 125))
(tag_name) @tag
(unit) @keyword
(property_name) @field

5
after/queries/javascript/highlights.scm
View File

@ -1,5 +0,0 @@
; extends
(jsx_self_closing_element (identifier) @tag (#set! "priority" 127))
(jsx_opening_element (identifier) @tag (#set! "priority" 127))
(jsx_closing_element (identifier) @tag (#set! "priority" 127))

3
after/queries/lua/highlights.scm
View File

@ -1,3 +0,0 @@
; extends
(function_call (identifier) @function (#set! "priority" 130))

2
after/queries/scss/highlights.scm
View File

@ -1,2 +0,0 @@
; extends
((nesting_selector) @keyword (#set! "priority" 125))

5
after/queries/tsx/highlights.scm
View File

@ -1,5 +0,0 @@
; extends
(jsx_self_closing_element (identifier) @tag (#set! "priority" 127))
(jsx_opening_element (identifier) @tag (#set! "priority" 127))
(jsx_closing_element (identifier) @tag (#set! "priority" 127))

17
after/syntax/csv.vim
View File

@ -1,17 +0,0 @@
runtime! after/syntax/sep.vim
syn match Tcolumn6 /.\{-}\(,\|$\)/ nextgroup=Tcolumn0
syn match Tcolumn5 /.\{-}\(,\|$\)/ nextgroup=Tcolumn6
syn match Tcolumn4 /.\{-}\(,\|$\)/ nextgroup=Tcolumn5
syn match Tcolumn3 /.\{-}\(,\|$\)/ nextgroup=Tcolumn4
syn match Tcolumn2 /.\{-}\(,\|$\)/ nextgroup=Tcolumn3
syn match Tcolumn1 /.\{-}\(,\|$\)/ nextgroup=Tcolumn2
syn match Tcolumn0 /.\{-}\(,\|$\)/ nextgroup=Tcolumn1
syn match Tcolumn6title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn0title
syn match Tcolumn5title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn6title
syn match Tcolumn4title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn5title
syn match Tcolumn3title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn4title
syn match Tcolumn2title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn3title
syn match Tcolumn1title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn2title
syn match Tcolumn0title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn1title
syn match Tdiv /,/ containedin=ALL conceal cchar=|
setlocal conceallevel=2

24
after/syntax/sep.vim
View File

@ -1,24 +0,0 @@
syn match bluebg /\<blue\>\s*/ containedin=ALL
syn match magentabg /\<magenta\>\s*/ containedin=ALL
syn match yellowbg /\<yellow\>\s*/ containedin=ALL
syn match violetbg /\<violet\>\s*/ containedin=ALL
syn match greenbg /\<green\>\s*/ containedin=ALL
syn match cyanbg /\<cyan\>\s*/ containedin=ALL
syn match orangebg /\<orange\>\s*/ containedin=ALL
hi def link Tdiv Refbase01
hi def link Tcolumn0 Refblue
hi def link Tcolumn0title Refblueu
hi def link Tcolumn1 Refmagenta
hi def link Tcolumn1title Refmagentau
hi def link Tcolumn2 Refyellow
hi def link Tcolumn2title Refyellowu
hi def link Tcolumn3 Refviolet
hi def link Tcolumn3title Refvioletu
hi def link Tcolumn4 Refgreen
hi def link Tcolumn4title Refgreenu
hi def link Tcolumn5 Refcyan
hi def link Tcolumn5title Refcyanu
hi def link Tcolumn6 Reforange
hi def link Tcolumn6title Reforangeu
setl nowrap

32
colors/solarized.vim
View File

@ -61,22 +61,22 @@ exe "hi! yellowu cterm=underline ctermfg=".g:yellow." ctermbg=NONE"
exe "hi! redu cterm=underline ctermfg=".g:red." ctermbg=NONE"
exe "hi! cyanu cterm=underline ctermfg=".g:cyan." ctermbg=NONE"
exe "hi! base01bg cterm=underline ctermfg=".g:base03." ctermbg=".g:base01
exe "hi! base02bg cterm=underline ctermfg=".g:base03." ctermbg=".g:base02
exe "hi! base03bg cterm=underline ctermfg=".g:base03." ctermbg=".g:base03
exe "hi! base0bg cterm=underline ctermfg=".g:base03." ctermbg=".g:base0
exe "hi! base1bg cterm=underline ctermfg=".g:base03." ctermbg=".g:base1
exe "hi! base2bg cterm=underline ctermfg=".g:base03." ctermbg=".g:base2
exe "hi! base3bg cterm=underline ctermfg=".g:base03." ctermbg=".g:base3
exe "hi! bluebg cterm=underline ctermfg=".g:base03." ctermbg=".g:blue
exe "hi! greenbg cterm=underline ctermfg=".g:base03." ctermbg=".g:green
exe "hi! violetbg cterm=underline ctermfg=".g:base03." ctermbg=".g:violet
exe "hi! magentabg cterm=underline ctermfg=".g:base03." ctermbg=".g:magenta
exe "hi! greenbg cterm=underline ctermfg=".g:base03." ctermbg=".g:green
exe "hi! orangebg cterm=underline ctermfg=".g:base03." ctermbg=".g:orange
exe "hi! yellowbg cterm=underline ctermfg=".g:base03." ctermbg=".g:yellow
exe "hi! redbg cterm=underline ctermfg=".g:base03." ctermbg=".g:red
exe "hi! cyanbg cterm=underline ctermfg=".g:base03." ctermbg=".g:cyan
exe "hi! base01bg cterm=NONE ctermfg=".g:base03." ctermbg=".g:base01
exe "hi! base02bg cterm=NONE ctermfg=".g:base03." ctermbg=".g:base02
exe "hi! base03bg cterm=NONE ctermfg=".g:base03." ctermbg=".g:base03
exe "hi! base0bg cterm=NONE ctermfg=".g:base03." ctermbg=".g:base0
exe "hi! base1bg cterm=NONE ctermfg=".g:base03." ctermbg=".g:base1
exe "hi! base2bg cterm=NONE ctermfg=".g:base03." ctermbg=".g:base2
exe "hi! base3bg cterm=NONE ctermfg=".g:base03." ctermbg=".g:base3
exe "hi! bluebg cterm=NONE ctermfg=".g:base03." ctermbg=".g:blue
exe "hi! greenbg cterm=NONE ctermfg=".g:base03." ctermbg=".g:green
exe "hi! violetbg cterm=NONE ctermfg=".g:base03." ctermbg=".g:violet
exe "hi! magentabg cterm=NONE ctermfg=".g:base03." ctermbg=".g:magenta
exe "hi! greenbg cterm=NONE ctermfg=".g:base03." ctermbg=".g:green
exe "hi! orangebg cterm=NONE ctermfg=".g:base03." ctermbg=".g:orange
exe "hi! yellowbg cterm=NONE ctermfg=".g:base03." ctermbg=".g:yellow
exe "hi! redbg cterm=NONE ctermfg=".g:base03." ctermbg=".g:red
exe "hi! cyanbg cterm=NONE ctermfg=".g:base03." ctermbg=".g:cyan
" }}}
" highlighting {{{

0
after/ftplugin/cpp.vim → ftplugin/cpp.vim
View File

2
ftplugin/csv.vim
View File

@ -0,0 +1,2 @@
let b:div = ","
runtime! ftplugin/sep.vim

10
after/ftplugin/dirvish.vim → ftplugin/dirvish.vim
View File

@ -4,20 +4,12 @@ let g:dirvish_dovish_map_keys = 0
" unmap dirvish default
unmap <buffer> p
" Your preferred mappings
nmap <silent><buffer> o <Plug>(dovish_create_file)
nmap <silent><buffer> O <Plug>(dovish_create_file)
" nmap <silent><buffer> I <Plug>(dovish_create_directory)
nmap <silent><buffer> I <Plug>(dovish_create_directory)
nmap <silent><buffer> dd <Plug>(dovish_delete)
nmap <silent><buffer> c <Plug>(dovish_rename)
nmap <silent><buffer> yy <Plug>(dovish_yank)
xmap <silent><buffer> yy <Plug>(dovish_yank)
nmap <silent><buffer> p <Plug>(dovish_copy)
" nmap <silent><buffer> P <Plug>(dovish_move)
silent exe 'hi! link DirvishGitModified orange;
silent exe 'hi! link DirvishGitStaged yellow;
silent exe 'hi! link DirvishGitRenamed magenta;
silent exe 'hi! link DirvishGitUnmerged violet;
silent exe 'hi! link DirvishGitIgnored base2;
silent exe 'hi! link DirvishGitUntracked base2;
silent exe 'hi! link DirvishGitUntrackedDir DirvishPathTail;

0
after/ftplugin/python.vim → ftplugin/python.vim
View File

14
after/ftplugin/sep.vim → ftplugin/sep.vim
View File

@ -21,15 +21,20 @@ endfunction
command! -nargs=0 -bang Sort :call SortByColumn("<bang>")
function! Align()
execute "normal! :Tabularize /" . b:div . "/l0\<CR>"
execute "normal! :Tabularize /" . b:div . "\<CR>"
" execute "normal! :Tabularize /" . b:div . "/l0\<CR>"
endfunction
command! Align :call Align()
function! UnAlign()
" execute "normal!
" \:%s/ \\zs \\+\\ze//g\<CR>
" \:%s/\\zs \\ze".b:div."//g\<CR>
" \:noh\<CR>"
execute "normal!
\:%s/ \\zs \\+\\ze//g\<CR>
\:%s/\\zs \\ze".b:div."//g\<CR>
\:%s/ *" . b:div . " */".b:div."/g\<CR>
\:noh\<CR>"
endfunction
command! UnAlign :call UnAlign()
@ -55,7 +60,8 @@ command! -nargs=1 MoveColumn :call MoveColumn(<f-args>)
execute "normal! :nnoremap <buffer> <tab> /" . b:div . "<CR>l:noh<CR>\<CR>"
execute "normal! :nnoremap <buffer> <s-tab> /" . b:div . "<CR>NNl:noh<CR>\<CR>"
" imap <buffer> <Esc> <Esc>mm:Align<CR>`m
imap <buffer> <Esc> <Esc>mm:Align<CR>`m
nnoremap <buffer> <leader>s :Sort<CR>
nnoremap <buffer> <leader>S :Sort!<CR>
nnoremap <buffer> <leader>m1 :MoveColumn 1<CR>

0
after/ftplugin/text.vim → ftplugin/text.vim
View File

2
ftplugin/tsv.vim
View File

@ -0,0 +1,2 @@
let b:div = "\t"
runtime! ftplugin/sep.vim

30
syntax/csv.vim
View File

@ -0,0 +1,30 @@
runtime! syntax/sep.vim
syn match Ttrue / \zsTRUE\s*\ze\( \|$\)/
hi def link Ttrue greenbg
syn match Tfalse / \zsFALSE\s*\ze\( \|$\)/
hi def link Tfalse redbg
syn match Tna / \zsNA\s*\ze\( \|$\)/
hi def link Tna bluebg
syn match Tcolumn6 /.\{-}\(,\|$\)/ nextgroup=Tcolumn0 contains=Ttrue,Tfalse,Tna
syn match Tcolumn5 /.\{-}\(,\|$\)/ nextgroup=Tcolumn6 contains=Ttrue,Tfalse,Tna
syn match Tcolumn4 /.\{-}\(,\|$\)/ nextgroup=Tcolumn5 contains=Ttrue,Tfalse,Tna
syn match Tcolumn3 /.\{-}\(,\|$\)/ nextgroup=Tcolumn4 contains=Ttrue,Tfalse,Tna
syn match Tcolumn2 /.\{-}\(,\|$\)/ nextgroup=Tcolumn3 contains=Ttrue,Tfalse,Tna
syn match Tcolumn1 /.\{-}\(,\|$\)/ nextgroup=Tcolumn2 contains=Ttrue,Tfalse,Tna
syn match Tcolumn0 /.\{-}\(,\|$\)/ nextgroup=Tcolumn1 contains=Ttrue,Tfalse,Tna
syn match Tcolumn6title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn0title contains=Ttrue,Tfalse,Tna
syn match Tcolumn5title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn6title contains=Ttrue,Tfalse,Tna
syn match Tcolumn4title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn5title contains=Ttrue,Tfalse,Tna
syn match Tcolumn3title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn4title contains=Ttrue,Tfalse,Tna
syn match Tcolumn2title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn3title contains=Ttrue,Tfalse,Tna
syn match Tcolumn1title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn2title contains=Ttrue,Tfalse,Tna
syn match Tcolumn0title /\%1l.\{-}\(,\|$\)/ nextgroup=Tcolumn1title contains=Ttrue,Tfalse,Tna
syn match Tdiv /,/ containedin=ALL conceal cchar=|
setlocal conceallevel=2

19
syntax/sep.vim
View File

@ -0,0 +1,19 @@
hi def link Tdiv base01
hi def link Tcolumn0 blue
hi def link Tcolumn0title blueu
hi def link Tcolumn1 magenta
hi def link Tcolumn1title magentau
hi def link Tcolumn2 yellow
hi def link Tcolumn2title yellowu
hi def link Tcolumn3 violet
hi def link Tcolumn3title violetu
hi def link Tcolumn4 green
hi def link Tcolumn4title greenu
hi def link Tcolumn5 cyan
hi def link Tcolumn5title cyanu
hi def link Tcolumn6 orange
hi def link Tcolumn6title orangeu
setl nowrap

2
after/syntax/tsv.vim → syntax/tsv.vim
View File

@ -1,4 +1,4 @@
runtime! after/syntax/sep.vim
runtime! syntax/sep.vim
syn match Tcolumn6 /.\{-}\(\t\|$\)/ nextgroup=Tcolumn0
syn match Tcolumn5 /.\{-}\(\t\|$\)/ nextgroup=Tcolumn6
syn match Tcolumn4 /.\{-}\(\t\|$\)/ nextgroup=Tcolumn5
Write Preview
Loading…
Cancel
Save