Commit: fe7c61cd73b2eb55dca14946e35636a77339fd7f - vim (git)

Commit MetaInfo

• Révision: fe7c61cd73b2eb55dca14946e35636a77339fd7f (tree)
• l'heure: 2022-05-25 03:15:31
• Auteur: badcoff33 <none@none>
• Commiter: badcoff33

Message de Log

visual tunning

Change Summary

• modified: colors/twotone.vim
• modified: gvimrc

Modification

--- a/colors/twotone.vim
+++ b/colors/twotone.vim
@@ -32,21 +32,21 @@ let s:GuiBg = {str -> empty(str) ? "":"guibg=".str}
 let s:GuiAttr = {str -> empty(str) ? "":"gui=".str}
 
 " Basics
-execute 'hi Normal' s:GuiFg(s:silver2) s:GuiBg(s:white) s:GuiAttr('NONE')
-execute 'hi Bold' s:GuiAttr('bold')
-execute 'hi Italic' s:GuiAttr('italic')
-execute 'hi NonText' s:GuiFg(s:silver6) s:GuiBg(s:silver9)
-execute 'hi Visual' s:GuiFg(s:white) s:GuiBg(s:blue)
-execute 'hi StatusLine' s:GuiFg(s:white) s:GuiBg(s:silver1) s:GuiAttr('bold')
-execute 'hi StatusLineNC' s:GuiFg(s:silver2) s:GuiBg(s:silver7) s:GuiAttr('NONE')
-execute 'hi StatusLineTerm' s:GuiFg(s:white) s:GuiBg(s:red) s:GuiAttr('bold')
-execute 'hi VertSplit' s:GuiFg(s:silver9) s:GuiBg(s:silver9) s:GuiAttr('NONE')
-execute 'hi IncSearch' s:GuiFg(s:white) s:GuiBg(s:black) s:GuiAttr('none')
-execute 'hi Search' s:GuiFg(s:black) s:GuiBg(s:silver8) s:GuiAttr('NONE')
-execute 'hi MatchParen' s:GuiFg(s:blue) s:GuiBg('bg') s:GuiAttr('bold')
-execute 'hi CursorLine' s:GuiBg(s:silver9)
-execute 'hi CursorLineNr' s:GuiFg(s:silver4) s:GuiAttr('bold')
-execute 'hi LineNr' s:GuiFg(s:silver8) s:GuiAttr('bold')
+execute "hi Normal" s:GuiFg(s:silver2) s:GuiBg(s:white) s:GuiAttr("NONE")
+execute "hi Bold" s:GuiAttr("bold")
+execute "hi Italic" s:GuiAttr("italic")
+execute "hi NonText" s:GuiFg(s:silver6) s:GuiBg("bg")
+execute "hi Visual" s:GuiFg(s:white) s:GuiBg(s:blue)
+execute "hi StatusLine" s:GuiFg(s:white) s:GuiBg(s:silver1) s:GuiAttr("bold")
+execute "hi StatusLineNC" s:GuiFg(s:silver2) s:GuiBg(s:silver7) s:GuiAttr("NONE")
+execute "hi StatusLineTerm" s:GuiFg(s:white) s:GuiBg(s:red) s:GuiAttr("bold")
+execute "hi VertSplit" s:GuiFg(s:silver9) s:GuiBg(s:silver9) s:GuiAttr("NONE")
+execute "hi IncSearch" s:GuiFg(s:white) s:GuiBg(s:black) s:GuiAttr("none")
+execute "hi Search" s:GuiFg(s:black) s:GuiBg(s:silver8) s:GuiAttr("NONE")
+execute "hi MatchParen" s:GuiFg(s:blue) s:GuiBg("bg") s:GuiAttr("bold")
+execute "hi CursorLine" s:GuiBg(s:silver9)
+execute "hi CursorLineNr" s:GuiFg(s:silver4) s:GuiAttr("bold")
+execute "hi LineNr" s:GuiFg(s:silver8) s:GuiAttr("bold")
 
 highlight! link CursorColumn CursorLine
 highlight! link SignColumn LineNr
@@ -63,58 +63,58 @@ highlight! link TabLineSel Normal
 highlight! link TabLineFill Normal
 highlight! link TabLine Normal
 
-execute 'hi TabLineSel' s:GuiAttr('underline,bold')
+execute "hi TabLineSel" s:GuiAttr("underline,bold")
 
 " Code
-execute 'hi Statement' s:GuiFg(s:red)  s:GuiAttr('bold')
-execute 'hi Conditional' s:GuiFg(s:red)  s:GuiAttr('bold')
-execute 'hi Type' s:GuiFg(s:blue)  s:GuiAttr('italic')
-execute 'hi Structure' s:GuiFg(s:red) s:GuiAttr('NONE')
-execute 'hi StorageClass' s:GuiFg(s:red)
-execute 'hi PreProc' s:GuiFg(s:blue) s:GuiAttr('bold')
-execute 'hi PreCondit' s:GuiFg(s:blue)  s:GuiAttr('bold')
-execute 'hi Comment' s:GuiFg(s:silver5)
-execute 'hi Function' s:GuiFg(s:blue)
-execute 'hi Identifier' s:GuiFg(s:blue)
-execute 'hi Special' s:GuiFg(s:silver1)
-execute 'hi Constant' s:GuiFg(s:blue)
-execute 'hi Number' s:GuiFg(s:blue)
-execute 'hi String' s:GuiFg(s:silver4)
-execute 'hi Title' s:GuiFg(s:black)  s:GuiAttr('bold')
-execute 'hi Todo' s:GuiFg(s:silver2) s:GuiBg(s:silver7)
-execute 'hi Error' s:GuiFg(s:red) s:GuiBg('bg') s:GuiAttr('underline')
-execute 'hi Directory' s:GuiFg(s:silver2)
-execute 'hi ErrorMsg' s:GuiFg(s:red) s:GuiBg('bg')
-execute 'hi WarningMsg' s:GuiFg(s:silver0) s:GuiBg('bg')
-execute 'hi ModeMsg' s:GuiFg(s:blue) s:GuiBg('bg') s:GuiAttr('bold')
-execute 'hi Question' s:GuiFg(s:silver1) s:GuiBg('bg')
-execute 'hi QuickFixLine' s:GuiFg(s:red) s:GuiBg('bg') s:GuiAttr('bold')
-execute 'hi qfFileName' s:GuiFg(s:blue)
-execute 'hi qfLineNr' s:GuiFg(s:red)
+execute "hi Statement" s:GuiFg(s:red)  s:GuiAttr("bold")
+execute "hi Conditional" s:GuiFg(s:red)  s:GuiAttr("bold")
+execute "hi Type" s:GuiFg(s:blue)  s:GuiAttr("italic")
+execute "hi Structure" s:GuiFg(s:red) s:GuiAttr("NONE")
+execute "hi StorageClass" s:GuiFg(s:red)
+execute "hi PreProc" s:GuiFg(s:blue) s:GuiAttr("bold")
+execute "hi PreCondit" s:GuiFg(s:blue)  s:GuiAttr("bold")
+execute "hi Comment" s:GuiFg(s:silver5) s:GuiAttr("italic")
+execute "hi Function" s:GuiFg(s:blue)
+execute "hi Identifier" s:GuiFg(s:blue)
+execute "hi Special" s:GuiFg(s:silver1)
+execute "hi Constant" s:GuiFg(s:blue)
+execute "hi Number" s:GuiFg(s:blue)
+execute "hi String" s:GuiFg(s:silver4)
+execute "hi Title" s:GuiFg(s:black)  s:GuiAttr("bold")
+execute "hi Todo" s:GuiFg(s:silver2) s:GuiBg(s:silver7)
+execute "hi Error" s:GuiFg(s:red) s:GuiBg("bg") s:GuiAttr("underline")
+execute "hi Directory" s:GuiFg(s:silver2)
+execute "hi ErrorMsg" s:GuiFg(s:red) s:GuiBg("bg")
+execute "hi WarningMsg" s:GuiFg(s:silver0) s:GuiBg("bg")
+execute "hi ModeMsg" s:GuiFg(s:blue) s:GuiBg("bg") s:GuiAttr("bold")
+execute "hi Question" s:GuiFg(s:silver1) s:GuiBg("bg")
+execute "hi QuickFixLine" s:GuiFg(s:red) s:GuiBg("bg") s:GuiAttr("bold")
+execute "hi qfFileName" s:GuiFg(s:blue)
+execute "hi qfLineNr" s:GuiFg(s:red)
 highlight! link qfSeparator Normal
 
 " Filetype VIM
-execute 'hi vimCommentTitle' s:GuiFg(s:blue)  s:GuiAttr('bold')
+execute "hi vimCommentTitle" s:GuiFg(s:blue)  s:GuiAttr("bold")
 
 " Filetype C
-execute 'hi cCppOut' s:GuiBg(s:silver9) s:GuiAttr('italic')
-execute 'hi cCppOutIf2' s:GuiBg(s:silver9) s:GuiAttr('italic')
-execute 'hi cParen' s:GuiFg(s:silver3)
-execute 'hi cBlock' s:GuiFg(s:silver3)
+execute "hi cCppOut" s:GuiBg(s:silver9) s:GuiAttr("italic")
+execute "hi cCppOutIf2" s:GuiBg(s:silver9) s:GuiAttr("italic")
+execute "hi cParen" s:GuiFg(s:silver3)
+execute "hi cBlock" s:GuiFg(s:silver3)
 
 " filetype HTML
-execute 'hi htmlH1' s:GuiFg(s:blue)  s:GuiAttr('bold')
-execute 'hi htmlH2' s:GuiFg(s:blue)  s:GuiAttr('bold')
-execute 'hi htmlH3' s:GuiFg(s:blue)  s:GuiAttr('bold')
+execute "hi htmlH1" s:GuiFg(s:blue)  s:GuiAttr("bold")
+execute "hi htmlH2" s:GuiFg(s:blue)  s:GuiAttr("bold")
+execute "hi htmlH3" s:GuiFg(s:blue)  s:GuiAttr("bold")
 
 " markdown
-execute 'hi markdownCode' s:GuiFg(s:silver3) s:GuiBg(s:silver9)
-execute 'hi markdownCodeBlock' s:GuiFg(s:silver2)
-execute 'hi rstEmphasis' s:GuiFg(s:silver2)
-execute 'hi rstStrongEmphasis' s:GuiFg(s:silver2)  s:GuiAttr('bold')
+execute "hi markdownCode" s:GuiFg(s:silver3) s:GuiBg(s:silver9)
+execute "hi markdownCodeBlock" s:GuiFg(s:silver2)
+execute "hi rstEmphasis" s:GuiFg(s:silver2)
+execute "hi rstStrongEmphasis" s:GuiFg(s:silver2)  s:GuiAttr("bold")
 
 " Diffs
-execute 'hi DiffChange' s:GuiFg(s:white) s:GuiBg(s:blue)
-execute 'hi DiffText' s:GuiFg(s:white) s:GuiBg(s:blue)
-execute 'hi DiffDelete' s:GuiFg(s:red) s:GuiBg(s:red)
-execute 'hi DiffAdd' s:GuiFg(s:silver3) s:GuiBg(s:silver8)
+execute "hi DiffChange" s:GuiFg(s:white) s:GuiBg(s:blue)
+execute "hi DiffText" s:GuiFg(s:white) s:GuiBg(s:blue)
+execute "hi DiffDelete" s:GuiFg(s:red) s:GuiBg(s:red)
+execute "hi DiffAdd" s:GuiFg(s:silver3) s:GuiBg(s:silver8)

--- a/gvimrc
+++ b/gvimrc
@@ -1,12 +1,6 @@
-let FontFamily = {-> split(&gfn, ":")[0]}
-let IncFontHeight = {-> string(str2nr(split(&gfn, ":h")[1]) + 1)}
-let DecFontHeight = {-> string(str2nr(split(&gfn, ":h")[1]) - 1)}
-
-nnoremap <expr> <leader>+ ":set guifont="..FontFamily()..":h"..IncFontHeight().."<CR>"
-nnoremap <expr> <leader>- ":set guifont="..FontFamily()..":h"..DecFontHeight().."<CR>"
-
-"set guifont=JetBrains\ Mono:h9
-set guifont=Courier_Prime:h14
+"set guifont=JetBrains\ Mono:h10
+"set guifont=Courier\ Prime:h14
+set guifont=Victor\ Mono:h14 linespace=5
 set guiligatures=!\"#$%&()*+-./:<=>?@[]^_{\|~
 set guioptions=!a
 set guicursor+=a:blinkon0
@@ -15,6 +9,13 @@ set mousemodel=popup
 set nomousefocus
 set signcolumn=yes
 
+let FontFamily = {-> escape(split(&gfn, ":")[0], ' ')}
+let IncFontHeight = {-> string(str2nr(split(&gfn, ":h")[1]) + 1)}
+let DecFontHeight = {-> string(str2nr(split(&gfn, ":h")[1]) - 1)}
+
+nnoremap <expr> <leader>+ ":set guifont="..FontFamily()..":h"..IncFontHeight().."<CR>"
+nnoremap <expr> <leader>- ":set guifont="..FontFamily()..":h"..DecFontHeight().."<CR>"
+
 tnoremap <LeftMouse> <C-w>N
 tmap <RightMouse> <C-w>N<RightMouse>