From bb6e1bab2e7dba4ae09632526f506052d0c872f5 Mon Sep 17 00:00:00 2001 From: Gregory Leeman Date: Tue, 30 Jul 2024 15:39:05 +0100 Subject: [PATCH] lazygit --- after/ftplugin/csv.vim | 2 -- after/ftplugin/tsv.vim | 2 -- after/queries/css/highlights.scm | 8 ------ after/queries/javascript/highlights.scm | 5 ---- after/queries/lua/highlights.scm | 3 --- after/queries/scss/highlights.scm | 2 -- after/queries/tsx/highlights.scm | 5 ---- after/syntax/csv.vim | 17 ------------- after/syntax/sep.vim | 24 ------------------ colors/solarized.vim | 32 ++++++++++++------------ {after/ftplugin => ftplugin}/cpp.vim | 0 ftplugin/csv.vim | 2 ++ {after/ftplugin => ftplugin}/dirvish.vim | 10 +------- {after/ftplugin => ftplugin}/python.vim | 0 {after/ftplugin => ftplugin}/sep.vim | 14 ++++++++--- {after/ftplugin => ftplugin}/text.vim | 0 ftplugin/tsv.vim | 2 ++ syntax/csv.vim | 30 ++++++++++++++++++++++ syntax/sep.vim | 19 ++++++++++++++ {after/syntax => syntax}/tsv.vim | 2 +- 20 files changed, 81 insertions(+), 98 deletions(-) delete mode 100644 after/ftplugin/csv.vim delete mode 100644 after/ftplugin/tsv.vim delete mode 100644 after/queries/css/highlights.scm delete mode 100644 after/queries/javascript/highlights.scm delete mode 100644 after/queries/lua/highlights.scm delete mode 100644 after/queries/scss/highlights.scm delete mode 100644 after/queries/tsx/highlights.scm delete mode 100644 after/syntax/csv.vim delete mode 100644 after/syntax/sep.vim rename {after/ftplugin => ftplugin}/cpp.vim (100%) create mode 100644 ftplugin/csv.vim rename {after/ftplugin => ftplugin}/dirvish.vim (52%) rename {after/ftplugin => ftplugin}/python.vim (100%) rename {after/ftplugin => ftplugin}/sep.vim (85%) rename {after/ftplugin => ftplugin}/text.vim (100%) create mode 100644 ftplugin/tsv.vim create mode 100644 syntax/csv.vim create mode 100644 syntax/sep.vim rename {after/syntax => syntax}/tsv.vim (96%) diff --git a/after/ftplugin/csv.vim b/after/ftplugin/csv.vim deleted file mode 100644 index 20195c2..0000000 --- a/after/ftplugin/csv.vim +++ /dev/null @@ -1,2 +0,0 @@ -let b:div = "," -runtime! after/ftplugin/sep.vim diff --git a/after/ftplugin/tsv.vim b/after/ftplugin/tsv.vim deleted file mode 100644 index 8354f66..0000000 --- a/after/ftplugin/tsv.vim +++ /dev/null @@ -1,2 +0,0 @@ -let b:div = "\t" -runtime! after/ftplugin/sep.vim diff --git a/after/queries/css/highlights.scm b/after/queries/css/highlights.scm deleted file mode 100644 index 2fca0ca..0000000 --- a/after/queries/css/highlights.scm +++ /dev/null @@ -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 diff --git a/after/queries/javascript/highlights.scm b/after/queries/javascript/highlights.scm deleted file mode 100644 index 530b26f..0000000 --- a/after/queries/javascript/highlights.scm +++ /dev/null @@ -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)) diff --git a/after/queries/lua/highlights.scm b/after/queries/lua/highlights.scm deleted file mode 100644 index 51d101d..0000000 --- a/after/queries/lua/highlights.scm +++ /dev/null @@ -1,3 +0,0 @@ -; extends - -(function_call (identifier) @function (#set! "priority" 130)) diff --git a/after/queries/scss/highlights.scm b/after/queries/scss/highlights.scm deleted file mode 100644 index 57bff16..0000000 --- a/after/queries/scss/highlights.scm +++ /dev/null @@ -1,2 +0,0 @@ -; extends -((nesting_selector) @keyword (#set! "priority" 125)) diff --git a/after/queries/tsx/highlights.scm b/after/queries/tsx/highlights.scm deleted file mode 100644 index 530b26f..0000000 --- a/after/queries/tsx/highlights.scm +++ /dev/null @@ -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)) diff --git a/after/syntax/csv.vim b/after/syntax/csv.vim deleted file mode 100644 index 9fa0551..0000000 --- a/after/syntax/csv.vim +++ /dev/null @@ -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 diff --git a/after/syntax/sep.vim b/after/syntax/sep.vim deleted file mode 100644 index 0d4e5ae..0000000 --- a/after/syntax/sep.vim +++ /dev/null @@ -1,24 +0,0 @@ -syn match bluebg /\\s*/ containedin=ALL -syn match magentabg /\\s*/ containedin=ALL -syn match yellowbg /\\s*/ containedin=ALL -syn match violetbg /\\s*/ containedin=ALL -syn match greenbg /\\s*/ containedin=ALL -syn match cyanbg /\\s*/ containedin=ALL -syn match orangebg /\\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 diff --git a/colors/solarized.vim b/colors/solarized.vim index ee6d2c8..2d80bc4 100644 --- a/colors/solarized.vim +++ b/colors/solarized.vim @@ -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 {{{ diff --git a/after/ftplugin/cpp.vim b/ftplugin/cpp.vim similarity index 100% rename from after/ftplugin/cpp.vim rename to ftplugin/cpp.vim diff --git a/ftplugin/csv.vim b/ftplugin/csv.vim new file mode 100644 index 0000000..cfd687d --- /dev/null +++ b/ftplugin/csv.vim @@ -0,0 +1,2 @@ +let b:div = "," +runtime! ftplugin/sep.vim diff --git a/after/ftplugin/dirvish.vim b/ftplugin/dirvish.vim similarity index 52% rename from after/ftplugin/dirvish.vim rename to ftplugin/dirvish.vim index f718a23..6cefd3c 100644 --- a/after/ftplugin/dirvish.vim +++ b/ftplugin/dirvish.vim @@ -4,20 +4,12 @@ let g:dirvish_dovish_map_keys = 0 " unmap dirvish default unmap p -" Your preferred mappings nmap o (dovish_create_file) nmap O (dovish_create_file) -" nmap I (dovish_create_directory) +nmap I (dovish_create_directory) nmap dd (dovish_delete) nmap c (dovish_rename) nmap yy (dovish_yank) xmap yy (dovish_yank) nmap p (dovish_copy) " nmap P (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; diff --git a/after/ftplugin/python.vim b/ftplugin/python.vim similarity index 100% rename from after/ftplugin/python.vim rename to ftplugin/python.vim diff --git a/after/ftplugin/sep.vim b/ftplugin/sep.vim similarity index 85% rename from after/ftplugin/sep.vim rename to ftplugin/sep.vim index 0866948..e0cb47e 100644 --- a/after/ftplugin/sep.vim +++ b/ftplugin/sep.vim @@ -21,15 +21,20 @@ endfunction command! -nargs=0 -bang Sort :call SortByColumn("") function! Align() - execute "normal! :Tabularize /" . b:div . "/l0\" + execute "normal! :Tabularize /" . b:div . "\" + " execute "normal! :Tabularize /" . b:div . "/l0\" endfunction command! Align :call Align() function! UnAlign() + " execute "normal! + " \:%s/ \\zs \\+\\ze//g\ + " \:%s/\\zs \\ze".b:div."//g\ + " \:noh\" execute "normal! - \:%s/ \\zs \\+\\ze//g\ - \:%s/\\zs \\ze".b:div."//g\ + \:%s/ *" . b:div . " */".b:div."/g\ \:noh\" + endfunction command! UnAlign :call UnAlign() @@ -55,7 +60,8 @@ command! -nargs=1 MoveColumn :call MoveColumn() execute "normal! :nnoremap /" . b:div . "l:noh\" execute "normal! :nnoremap /" . b:div . "NNl:noh\" -" imap mm:Align`m + +imap mm:Align`m nnoremap s :Sort nnoremap S :Sort! nnoremap m1 :MoveColumn 1 diff --git a/after/ftplugin/text.vim b/ftplugin/text.vim similarity index 100% rename from after/ftplugin/text.vim rename to ftplugin/text.vim diff --git a/ftplugin/tsv.vim b/ftplugin/tsv.vim new file mode 100644 index 0000000..34f60cd --- /dev/null +++ b/ftplugin/tsv.vim @@ -0,0 +1,2 @@ +let b:div = "\t" +runtime! ftplugin/sep.vim diff --git a/syntax/csv.vim b/syntax/csv.vim new file mode 100644 index 0000000..0b27725 --- /dev/null +++ b/syntax/csv.vim @@ -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 diff --git a/syntax/sep.vim b/syntax/sep.vim new file mode 100644 index 0000000..c11a372 --- /dev/null +++ b/syntax/sep.vim @@ -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 diff --git a/after/syntax/tsv.vim b/syntax/tsv.vim similarity index 96% rename from after/syntax/tsv.vim rename to syntax/tsv.vim index 911d5e1..8a54222 100644 --- a/after/syntax/tsv.vim +++ b/syntax/tsv.vim @@ -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