From 88a47af52dbcb6e6e8cf711982788b2c1e6c6c56 Mon Sep 17 00:00:00 2001 From: ray Date: Tue, 28 Jul 2020 22:59:06 +0100 Subject: [PATCH] update color scheme/remove unused statusline --- colors/paper-custom.erb | 645 ++++++++++++++++++++++++++++++++++++++++ colors/paper-custom.vim | 643 +++++++++++++++++++++++++++++++++++++++ init.statusline.vim | 303 ------------------- init.vim | 4 +- spell/en.utf-8.add | 1 + spell/en.utf-8.add.spl | Bin 1516 -> 1546 bytes 6 files changed, 1291 insertions(+), 305 deletions(-) create mode 100644 colors/paper-custom.erb create mode 100644 colors/paper-custom.vim delete mode 100644 init.statusline.vim diff --git a/colors/paper-custom.erb b/colors/paper-custom.erb new file mode 100644 index 0000000..3f4cb95 --- /dev/null +++ b/colors/paper-custom.erb @@ -0,0 +1,645 @@ +<% + information = { + author: "Ray Elliott", + email: "vim@rayelliott.dev", + name: "paper-custom", + description: "", + background: "light", + webpage: "https://rayelliott.dev" + } + + bg_cursorline = ["#eeeeee", 250, "white"] + bg_colorcolumn = ["#f7f2f2", 250, "white"] + bg_cursorcolumn = ["#eeeeee", 250, "white"] + bg = ["#ffffff", 234, "black"] + bg_cursorline_input = ["#dddddd", 17, "darkblue"] + + fg_weak = ["#afafaf", 238, "gray"] + fg = ["#999999", 243, "gray"] + fg_strong = ["#555555", 232, "gray"] + + color_primary_weak = ["#cab0af", 124, "red"] + color_primary = ["#a78685", 88, "darkred"] + color_primary_strong = ["#967978", 52, "darkred"] + + color_2_weak = ["#85a786", 28, "darkgreen"] + color_2 = ["#7a9678", 22, "darkgreen"] + color_2_strong = ["#6b866c", 22, "darkgreen"] + + color_3_weak = ["#898fcb", 20, "blue"] + color_3 = ["#7e84c6", 19, "blue"] + color_3_strong = ["#5c6191", 17, "darkblue"] + + color_4_weak = ["#a6a5c4", 20, "blue"] + color_4 = ["#8685a7", 19, "darkblue"] + color_4_strong = ["#6c6b86", 17, "darkblue"] + + color_5_weak = ["#b99dc1", 164, "magenta"] + color_5 = ["#a287aa", 164, "magenta"] + color_5_strong = ["#725f77", 164, "magenta"] + + fg_error = ["#c74444", 196, "red"] + fg_spellcap = ["#a67038", 166, "yellow"] + fg_spellrare = ["#797532", 247, "darkyellow"] + fg_spelllocal = fg_spellrare + bg_whitespace_error = ["#ccbbbb", 196, "red"] + fg_todo = ["#aa0000", 196, "red"] + + ui_bg = ["#dddddd", 238, "gray"] + + ui_fg_weak = ["#aaaaaa", 240, "gray"] + ui_fg = ["#828282", 243, "gray"] + ui_fg_strong = ["#444444", 255, "white"] + + ui_cursor_bg = ["#eee4e4", 255, "white"] + ui_cursor_fg = ["#131313", 0, "black"] + + ui_search = ["#b7c3cd", 17, "darkblue"] + ui_incsearch = ["#5a727c", 17, "darkblue"] + + ui_visual_bg = ["#ced8e0", 17, "darkblue"] + ui_visualnos_bg = ["#e0d4ce", 52, "darkred"] + + ui_sign_add = ["#496349", 34, "green"] + ui_sign_change = ["#596171", 19, "blue"] + ui_sign_delete = ["#725454", 124, "red"] + ui_sign_changedelete = ["#5c4a5a", 126, "magenta"] + + ui_statusbar_mod = ["#655757", 124, "red"] + ui_statusbar_mod_active = ["#916c6c", 124, "red"] + ui_statusbar_input = ["#ced8e0", 17, "darkblue"] + + ui_fg_error = ["#c74444", 196, "red"] + ui_fg_warning = ["#a67038", 166, "yellow"] + ui_fg_question = ["#797532", 247, "darkgray"] + + diff_delete_bg = ["#ece0e0", 52, "darkred"] + diff_add_bg = ["#e0ece0", 22, "darkgreen"] + diff_change_bg = ["#e0e0ec", 17, "darkblue"] + diff_change_fg = ["#656a7c", 21, "white"] + + # Step 3: highlights + highlights = [ + [ "Normal", bg, fg, "NONE" ], + + [ "Special", "NONE", color_primary_strong, "bold" ], + [ "NonText", "NONE", color_primary_strong, "NONE" ], + [ "Tag", color_primary_weak, "NONE", "NONE" ], + + [ "Identifier", "NONE", color_primary, "bold" ], + [ "Function", "NONE", color_primary, "NONE" ], + + [ "Type", "NONE", color_primary_weak, "bold" ], + [ "StorageClass", "NONE", color_primary_weak, "NONE" ], + [ "Structure", "StorageClass"], + [ "TypeDef", "StorageClass"], + + [ "Constant", "NONE", fg_strong, "italic" ], + [ "String", "NONE", fg_strong, "italic" ], + [ "Character", "String" ], + [ "Number", "String" ], + [ "Boolean", "String" ], + [ "Float", "String" ], + + [ "Folded", "NONE", fg_strong, "bold" ], + + [ "Statement", "NONE", fg, "NONE" ], + [ "Conditional", "NONE", fg_strong, "NONE" ], + [ "Repeat", "NONE", fg_strong, "NONE" ], + [ "Label", "NONE", fg_strong, "bold" ], + [ "Operator", "NONE", fg_weak, "NONE" ], + [ "Keyword", "NONE", fg_strong, "NONE" ], + [ "Exception", "NONE", color_primary_weak, "bold" ], + + [ "PreProc", "NONE", fg_weak, "bold" ], + [ "Include", "NONE", fg_weak, "NONE" ], + + [ "Comment", "NONE", fg_weak, "bold,italic" ], + [ "SpecialComment", "NONE", fg_strong, "italic"], + [ "Todo", "NONE", fg_todo, "bold,italic" ], + + [ "Ignore", "NONE", bg, "NONE" ], + [ "Conceal", "NONE", "NONE", "NONE" ], + + [ "Error", "NONE", fg_error, "bold" ], + + [ "Underlined", "NONE", "NONE", "underline" ], + + [ "StatusLine", ui_bg, ui_fg_strong, "italic" ], + [ "StatusLineNC", ui_bg, ui_fg, "italic" ], + [ "TabLine", "StatusLineNc" ], + [ "TabLineSel", "StatusLine" ], + [ "TabLineFill", ui_bg, ui_bg, "italic" ], + + [ "VertSplit", bg, ui_bg, "NONE" ], + [ "FoldColumn", bg, fg_weak, "NONE" ], + [ "ColorColumn", bg_colorcolumn, "NONE", "NONE" ], + [ "SignColumn", bg, ui_fg_strong, "NONE" ], + [ "CursorLine", bg_cursorline, "NONE", "NONE" ], + + [ "Title", "NONE", fg_strong, "bold,italic" ], + + [ "LineNr", bg, fg_weak, "NONE" ], + [ "CursorLineNr", bg, fg_weak, "bold" ], + + # [ "helpLeadBlank", "NONE", grayfg, "NONE" ], + # [ "helpNormal", "NONE", grayfg, "NONE" ], + + [ "Pmenu", ui_fg, ui_fg, "NONE" ], + [ "PmenuSbar", ui_fg, ui_fg, "NONE" ], + [ "PmenuSel", ui_fg, ui_fg_strong, "bold" ], + [ "PmenuThumb", ui_fg, ui_fg, "NONE" ], + + [ "SpecialKey", "NONE", color_primary_strong, "NONE" ], + + [ "DiffAdd", diff_add_bg, "NONE", "NONE" ], + [ "DiffChange", diff_change_bg, "NONE", "NONE" ], + [ "DiffDelete", diff_delete_bg, "NONE", "NONE" ], + [ "DiffText", diff_change_bg, diff_change_fg, "NONE" ], + + [ "IncSearch", ui_incsearch, bg, "NONE" ], + [ "Search", ui_search, ui_fg_strong, "NONE" ], + + [ "Visual", ui_visual_bg, "NONE", "NONE" ], + [ "VisualNOS", ui_visualnos_bg, "NONE", "NONE" ], + + [ "Directory", "NONE", ui_fg_strong, "NONE" ], + + [ "MatchParen", "NONE", ui_search, "bold" ], + + [ "SpellBad", "NONE", fg_error, "NONE", fg_error ], + [ "SpellCap", "NONE", fg_spellcap, "NONE", fg_spellcap ], + [ "SpellLocal", "NONE", fg_spelllocal, "NONE", fg_spellcap ], + [ "SpellRare", "NONE", fg_spellrare, "NONE", fg_spellcap ], + + [ "WildMenu", ui_bg, ui_fg_strong, "bold" ], + [ "ErrorMsg", "NONE", ui_fg_error, "italic" ], + [ "ModeMsg", "NONE", ui_fg_strong, "italic" ], + [ "MoreMsg", "NONE", ui_fg_strong, "italic" ], + [ "Question", "NONE", ui_fg_question, "italic" ], + [ "WarningMsg", "NONE", ui_fg_warning, "italic" ], + + [ "Cursor", ui_cursor_bg, ui_cursor_fg, "bold" ], + [ "CursorColumn", bg_cursorcolumn, "NONE", "NONE" ], + + [ "EndOfBuffer", bg, bg, "NONE" ], + + [ "Noise", "NONE", ui_fg_weak, "NONE"], + + + [ "TabLineNum", "StatusLineNc"], + [ "TabLineNumSel", "StatusLine"], + + [ "GitGutterDelete", "NONE", ui_sign_delete, "bold"], + [ "GitGutterChange", "NONE", ui_sign_change, "bold"], + [ "GitGutterAdd", "NONE", ui_sign_add, "bold"], + [ "GitGutterChangeDelete", "NONE", ui_sign_changedelete, "bold"], + + [ "QuickScopePrimary", "IncSearch" ], + [ "QuickScopeSecondary", "Pmenu" ], + + # css, scss + + [ "cssIdentifier", "NONE", color_2, "bold" ], + [ "cssClass", "NONE", color_2_weak, "NONE" ], + [ "cssFunction", "Keyword" ], + [ "cssProp", "NONE", fg_weak, "NONE" ], + [ "scssVariable", "NONE", color_2_strong, "bold" ], + + [ "cssAttr", "String"], + [ "cssIdentifierAttr", "Noise" ], + [ "cssClassAttr", "cssIdentifierAttr" ], + [ "cssAttrNoise", "Noise" ], + [ "atKeyword", "PreProc" ], + [ "cssIdentifier", "cssIdentifier" ], + [ "cssClassName", "cssClass" ], + [ "cssClassNameDot", "cssClass" ], + [ "cssTagName", "htmlTagName" ], + [ "cssPseudoClassId", "cssClassName" ], + [ "cssKeyFrameSelector", "Label" ], + [ "cssFunctionName", "cssFunction" ], + [ "cssBraces", "Noise" ], + [ "cssUnitDecorators", "NONE", fg_strong, "NONE" ], + [ "scssSelector", "cssClass" ], + [ "scssSelectorName", "scssSelector" ], + [ "scssSelectorChar", "cssIdentifier" ], + [ "scssFunctionName", "cssFunctionName" ], + [ "scssMixin", "keyword" ], + [ "scssMixinName", "cssFunction" ], + [ "scssampersand", "scssSelectorName" ], + [ "scssAtRoot", "atKeyword" ], + [ "vue_scss", "cssIdentifier" ], + + #html + + ["htmlTagName", "NONE", color_3_weak, "NONE"], + ["htmlSpecialTagName", "NONE", color_3, "bold"], + ["htmlLink", "NONE", fg_strong, "italic,underline"], + + [ "htmlNormal", "Normal" ], + + [ "htmlTitle", "Title" ], + [ "htmlH1", "htmlTitle" ], + [ "htmlTag", "Noise" ], + [ "htmlEndTag", "htmlTag" ], + [ "htmlArg", "PreProc" ], + [ "htmlValue", "String" ], + [ "htmlSpecialChar", "Special" ], + [ "htmlPreStmt", "PreProc" ], + [ "htmlPreError", "Error" ], + [ "htmlPreProc", "PreProc" ], + [ "htmlPreAttr", "String" ], + [ "htmlPreProcAttrName", "PreProc" ], + [ "htmlPreProcAttrError", "Error" ], + [ "htmlSpecial", "Special" ], + [ "htmlSpecialChar", "Special" ], + [ "htmlString", "String" ], + [ "htmlStatement", "Statement" ], + [ "htmlComment", "Comment" ], + [ "htmlCommentPart", "Comment" ], + [ "htmlValue", "String" ], + [ "htmlCommentError", "htmlError" ], + [ "htmlTagError", "htmlError" ], + [ "htmlEvent", "javaScript" ], + [ "htmlError", "Error" ], + + [ "javaScript", "Special" ], + [ "javaScriptExpression", "javaScript" ], + [ "htmlCssStyleComment", "Comment" ], + [ "htmlCssDefinition", "Special" ], + + [ "htmlImgArg", "htmlArg" ], + [ "htmlSrcValue", "String" ], + [ "htmlSrcsetValue", "htmlSrcValue" ], + [ "htmlAltValue", "String" ], + [ "htmlDataArg", "htmlTagName" ], + [ "htmlDataValue", "Constant" ], + [ "htmlHrefArg", "htmlArg" ], + [ "htmlHrefValue", "htmlSrcValue" ], + + # vue + + [ "vueSpecial", "NONE", color_4_strong, "bold" ], + [ "vueTagSpecial", "NONE", color_4, "bold" ], + [ "vueTagComponentName", "NONE", color_4_weak, "NONE" ], + [ "vueDynamicComponent", "NONE", color_4_weak, "bold" ], + [ "vueSlotName", "Constant" ], + + [ "vueComponentName", "vueTagComponentName" ], + [ "vueTransitionComponent", "vueDynamicComponent" ], + [ "vueTransitionName", "vueSlotName" ], + [ "vueTransitionMode", "String" ], + [ "vueDirective", "Identifier" ], + [ "vueEvent", "Function" ], + [ "vueConditional", "vueSpecial" ], + [ "vueFor", "vueConditional" ], + [ "vueRef", "vueSpecial" ], + [ "vueSlot", "Noise" ], + + [ "vueDirectiveValue", "Type" ], + [ "vueEventValue", "vueDirectiveValue" ], + [ "vueConditionalValue", "vueDirectiveValue" ], + [ "vueForValue", "vueConditionalValue" ], + [ "vueRefValue", "Constant" ], + [ "vueSlotValue", "vueSlotName" ], + [ "vueObjectKey", "cssClass" ], + [ "vueObjectValue", "vueDirectiveValue" ], + [ "vueDirectiveClass", "Noise" ], + [ "vueMustache", "Type" ], + + # javascript + [ "jsFunctionKey", "Function" ], + [ "jsFuncCall", "Function" ], + [ "jsFuncCall", "Identifier" ], + [ "jsOperator", "Operator" ], + [ "jsVariableDef", "Identifier" ], + [ "jsGlobalObjects", "Keyqord" ], + [ "jsGlobalNodeObjects", "jsGlobalObjects" ], + [ "jsExceptions", "Exception" ], + [ "jsBuiltins", "jsGlobalObjects" ], + [ "jsStorageClass", "Include" ], + [ "jsObjectKey", "Identifier" ], + [ "jsObjectProp", "Type" ], + [ "jsObjectValue", "StorageClass" ], + [ "jsModuleKeyword", "Type" ], + [ "jsOperatorKeyword", "Label" ], + [ "jsThis", "jsGlobalObjects" ], + [ "jsArrowFunction", "Function" ], + + # python + + [ "pythonBuiltin", "Type" ], + [ "pythonBuiltinObj", "Special" ], + [ "pythonDottedName", "Identifier" ], + [ "pythonBrackets", "Noise" ], + [ "pythonQuotes", "Noise" ], + [ "pythonDot", "Noise" ], + [ "pythonNoise", "Noise" ], + [ "pythonExtraOperator", "Operator" ], + [ "pythonDocString", "SpecialComment" ], + [ "pythonSelf", "NONE", fg_weak, "bold" ], + + [ "JinjaVarBlock", "Noise" ], + [ "JinjaTagBlock", "JinjaVarBlock" ], + [ "jinjaSpecial", "NONE", color_5_strong, "bold"], + [ "jinjaRaw", "NONE", color_5_strong, "NONE"], + [ "jinjaStatement", "NONE", color_5, "NONE"], + [ "jinjaFilter", "NONE", color_5_weak, "NONE"], + [ "jinjaBlockName", "NONE", color_5_weak, "NONE"], + [ "jinjaVariable", "NONE", color_5, "NONE"], + [ "jinjaString", "String"], + [ "jinjaNumber", "Number"], + [ "jinjaOperator", "Noise"], + [ "jinjaComment", "Comment"], + + # sql + + [ "sqlOperator", "Operator" ], + + # vim + + [ "vimFoldMarker", "NONE", fg_weak, "NONE"], + [ "vimMap", "Noise" ], + [ "vimAbb", "vimMap" ], + [ "VimCommand", "Statement" ], + [ "VimOption", "String" ], + [ "vimFunction", "Function" ], + [ "vimFuncKey", "Special" ], + [ "vimHighlight", "Noise" ], + [ "vimAuGroupKey", "Noise" ], + [ "vimGroupName", "Special" ], + [ "vimAutoCmd", "Noise" ], + [ "vimSynMtchGrp", "Type" ], + [ "vimSynContains", "Type" ], + [ "vimSynRegOpt", "Type" ], + [ "vimHiTerm", "Include" ], + [ "vimHiAttrib", "Number" ], + [ "VimIsCommand", "Type" ], + [ "vimNotation", "StorageClass" ], + [ "vimMapLhs", "Special" ], + [ "vimMapRhs", "Label" ], + [ "vimNotFunc", "Conditional" ], + [ "vimSep", "Noise" ], + [ "vimParenSep", "vimSep" ], + [ "vimContinue", "vimSep" ], + [ "vimBracket", "vimSep" ], + [ "vimOperParen", "Normal" ], + [ "vimUserFunc", "Identifier" ], + [ "vimFoldMarker", "Noise" ], + + # yaml + + ["yamlKeyValueDelimiter", "Noise" ], + ["yamlFowIndicator", "Noise" ], + + # config highlighting + + [ "confComment", "Comment" ], + + # markdown + ["markdownDelimiter", "NONE", fg_weak, "bold"], + ["markdownHeadingDelimiter", "markdownDelimiter"], + ["markdownListMarker", "NONE", fg_strong, "bold"], + ["markdownCodeDelimiter", "markdownDelimiter"], + ["markdownCode", "Type"], + ["markdownItalic", "NONE", fg, "italic"], + ["markdownItalicDelimiter", "markdownDelimiter"], + ["markdownBold", "NONE", fg, "bold"], + ["markdownBoldDelimiter", "markdownDelimiter"], + ["markdownIdDeclaration", "Conditional"], + ["markdownId", "markdownIdDeclaration"], + ["markdownLinkText", "NONE", fg_strong, "underline"], + + # extra whitespace + + [ "ExtraWhitespace", bg_whitespace_error ,"NONE", "NONE" ], + + # php + + [ "phpRegion", "Normal" ], + [ "phpComparison", "Operator" ], + [ "phpMethod", "Function" ], + [ "phpParent", "Normal" ], + [ "phpMemberSelector", "StorageClass" ], + [ "phpVarSelector", "StorageClass" ], + + # quickfix + + [ "QuickfixLine", "NONE", ui_fg_strong, "bold" ], + [ "qfLineNr", "NONE", ui_fg_weak, "italic"], + [ "qfFilename", "NONE", ui_fg, "bold" ], + [ "qfSeparator", "Ignore" ], + [ "qfError", "ErrorMsg" ], + + # json + + [ "jsonKeyword", "Identifier" ], + [ "jsonValue", "String" ], + [ "jsonQuote", "Noise" ], + + # octobercms + [ "octobercmsSectionDelimiter", "Noise" ], + + # plugins + + [ "CocErrorSign", "ErrorMsg" ], + [ "CocWarningSign", "WarningMsg" ], + [ "CocInfoSign", "Question" ], + [ "CocHintSign", "Question" ], + [ "CocHighlightText", "IncSearch" ], + [ "CocUnderline", diff_delete_bg, fg_error, "NONE" ], + [ "LspErrorText", "ErrorMsg" ], + [ "LspWarningText", "WarningMsg" ], + [ "LspInformationText", "Question" ], + [ "LspHintText", "Question" ], + [ "ALEError", "CocUnderline" ], + [ "ALEErrorSign", "ErrorMsg" ], + [ "ALEErrorSign", "ErrorMsg" ], + + [ "mkdCodeStart", "Comment" ], + [ "mkdListItem", "Conditional" ], + + # netrw + [ "netrwTreeBar", "Noise" ], + [ "netrwClassify", "Noise" ], + [ "netrwExe", "Identifier" ], + [ "netrwDir", "String" ], + [ "netrwPlain", "Statement" ], + [ "netrwHelpCmd", "Type" ], + [ "netrwCmdNote", "function" ], + [ "netrwQuickHelp", "netrwCmdNote" ], + [ "netrwCmdSep", "Noise" ], + [ "netrwVersion", "StorageClass" ], + [ "netrwList", "String" ], + [ "netrwHidePat", "Identifier" ], + + # i3config + [ "Variable", "Function" ], + + # shell + [ "shDerefSimple", "StorageClass" ], + [ "shHereDoc01", "Special" ], + [ "shHereDoc02", "shHereDoc01" ], + [ "shHereDoc05", "shHereDoc01" ], + [ "shHereDoc", "Label" ], + + # to be implemented + + # "" vim-fugitive + # ""{{{ + # "hi! def link gitCommitBranch mValueDarkItalic + # "hi! def link gitCommitDiscarded mNoiseDark + # "hi! def link gitCommitComment mNoiseDark + # "hi! def link gitCommitOnBranch mNoise + # "hi! def link gitCommitWarning mInterfaceError + # "hi! def link gitCommitDiscardedType mNoise + # "hi! def link gitCommitSelectedType mNoise + # "hi! def link gitCommitSelectedFile mValueDarkerItalic + # "hi! def link gitCommitDiscardedFile mInterfaceWarning + # "hi! def link gitCommitUntrackedFile mStatementBright + # "hi! def link gitCommitNumber mInterfaceError + # "hi! def link gitCommitAhead gitCommitNumber + # "hi! def link gitCommitBehind gitCommitNumber + # ""}}} + + # "" #tagbar highlighting + # "" TagbarHighlight defined in vimrc as it gets overridden + # "" by plugin when defined in here + # "" hi! def link TagbarFoldIcon InterfaceNormal + # + # "" hi! def link TagbarHelp InterfaceHelp + # "" hi! def link TagbarHelpKey InterfaceHelpDark + # "" hi! def link TagbarHelpTitle InterfaceHelpBright + # + # "" hi! def link TagbarKind InterfaceH1 + # "" hi! def link TagbarNestedKind InterfaceH1 + # + # "" hi! def link TagbarScope InterfaceH1 + # "" hi! def link TagbarType InterfaceH1 + # "" hi! def link TagbarSignature InterfaceNormal + # "" hi! def link TagbarPseudoID InterfaceNormal + # "" hi! def link TagbarHighlight InterfaceCurrent + # + # "" hi! def link TagbarAccessPublic InterfaceH2 + # "" hi! def link TagbarAccessProtected InterfaceH2 + # "" hi! def link TagbarAccessPrivate InterfaceH2 + # + # "" hi! TagbarHighlight ctermfg=255 guifg=#eeeeee ctermbg=240 guibg=#585858 + + + ] + + # Step 4: generation + # + # From a separate shell: + # + # $ erb -T - bar.erb > bar.vim + # + # From Vim: + # + # :!erb -T - % > %:r.vim + + # These online resources can help you design your colorscheme: + # + # * http://upload.wikimedia.org/wikipedia/en/1/15/Xterm_256color_chart.svg + # the xterm palette + # * http://whatcolor.herokuapp.com/ + # play with hexadecimal colors right in the address bar (currently down) + # * http://color.hailpixel.com/ + # similar concept, fuzzier implementation + # * http://colourco.de/ + # similar concept, fancier implementation + # * http://www.colr.org/ + # extract a palette from an image + # * http://colores.manugarri.com/ + # search for 'word', get images and color palettes + # * http://www.colourlovers.com/palettes + # user-created palettes + # * http://www.perbang.dk/color+scheme/ + # a no-nonsense colorscheme generator + # * https://color.adobe.com/ + # Adobe's fancy colorscheme generator + # * http://paletton.com/ + # The classic 'Color Scheme Designer', rebranded + # * http://vrl.cs.brown.edu/color + # A very smart palette generator + # * https://cmcenroe.me/2018/04/03/colour-scheme.html + # "I Made My Own Colour Scheme and You Can Too!" + + # A few general advices: + # + # * The Windows console is limited to the 16 so-called "ANSI" colors but it has + # a few of them interverted which makes numbers impractical. Use color names + # instead of numbers: :help cterm-colors + # * The Windows console (yeah…) doesn't do italics, underlines or bolded text; + # it is limited to normal and reverse. Keep that in mind if you want + # your colorscheme to be usable in as many environments as possible by as many + # people as possible. + # * All of the terminal emulators in use these days allow their users to + # change the 16 so-called "ANSI" colors. It is also possible on some platforms + # to change some or all of the 256 colors in the xterm palette. Don't take + # anything for granted. + # * When used against a light background, strong colors work better than muted + # ones. Light or dark doesn't really matters. Also, it is harder to discriminate + # between two similar colors on a light background. + # * Both strong and muted colors work well against a dark background. It is also + # easier to work with similar colors, but dark colors don't work at all. + # * Use as many text samples as possible. String-heavy languages may look completely + # different than keyword-heavy ones. This can have an impact on the usability + # of your colorscheme. + # * Most terminal emulators and terminal multiplexers currently in use on unix-like + # systems support 256 colors but they almost always default to a '$TERM' that tells + # Vim otherwise. Your users will need to make sure their terminal emulator/multiplexer + # is correctly set up if they want to enjoy the best possible experience. + + # Many thanks to Barry Arthur (https://github.com/dahu) for the original idea. + + # You don't need to edit anything beyond this line. +-%> +" <%= information[:name] %>.vim -- Vim color scheme. +" Author: <%= information[:author] %> (<%= information[:email] %>) +" Webpage: <%= information[:webpage] %> +" Description: <%= information[:description] %> + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "<%= information[:name] %>" + +if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") +<% for highlight in highlights -%> +<% if highlight.length == 2 -%> + hi link <%= highlight[0] %> <%= highlight[1] %> +<% elsif highlight.length == 4 -%> + hi <%= highlight[0] %> ctermbg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][1] %> ctermfg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][1] %> cterm=<%= highlight[3] %> guibg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][0] %> guifg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][0] %> gui=<%= highlight[3] %> +<% if highlight[0] == "Normal" -%> + set background=<%= information[:background] %> +<% end -%> +<% else -%> + hi <%= highlight[0] %> ctermbg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][1] %> ctermfg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][1] %> cterm=<%= highlight[3] %> guibg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][0] %> guifg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][0] %> gui=<%= highlight[3] %> guisp=<%= highlight[4].kind_of?(String) ? highlight[4] : highlight[4][0] %> +<% end -%> +<% end -%> +elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 + set t_Co=16 +<% for highlight in highlights -%> +<% if highlight.length == 2 -%> + hi link <%= highlight[0] %> <%= highlight[1] %> +<% else -%> + hi <%= highlight[0] %> ctermbg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][2] %> ctermfg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][2] %> cterm=<%= highlight[3] %> +<% if highlight[0] == "Normal" -%> + set background=<%= information[:background] %> +<% end -%> +<% end -%> +<% end -%> +endif + +augroup cursorlinebg + au! + au InsertEnter * hi CursorLine ctermbg=<%= bg_cursorline_input[1] %> ctermfg=NONE cterm=NONE guibg=<%= bg_cursorline_input[0] %> guifg=NONE + au InsertLeave * hi CursorLine ctermbg=<%= bg_cursorline[1] %> ctermfg=NONE cterm=NONE guibg=<%= bg_cursorline[0] %> guifg=NONE +augroup END + + diff --git a/colors/paper-custom.vim b/colors/paper-custom.vim new file mode 100644 index 0000000..9deeda1 --- /dev/null +++ b/colors/paper-custom.vim @@ -0,0 +1,643 @@ +" paper-custom.vim -- Vim color scheme. +" Author: Ray Elliott (vim@rayelliott.dev) +" Webpage: https://rayelliott.dev +" Description: + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "paper-custom" + +if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") + hi Normal ctermbg=234 ctermfg=243 cterm=NONE guibg=#ffffff guifg=#999999 gui=NONE + set background=light + hi Special ctermbg=NONE ctermfg=52 cterm=bold guibg=NONE guifg=#967978 gui=bold + hi NonText ctermbg=NONE ctermfg=52 cterm=NONE guibg=NONE guifg=#967978 gui=NONE + hi Tag ctermbg=124 ctermfg=NONE cterm=NONE guibg=#cab0af guifg=NONE gui=NONE + hi Identifier ctermbg=NONE ctermfg=88 cterm=bold guibg=NONE guifg=#a78685 gui=bold + hi Function ctermbg=NONE ctermfg=88 cterm=NONE guibg=NONE guifg=#a78685 gui=NONE + hi Type ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#cab0af gui=bold + hi StorageClass ctermbg=NONE ctermfg=124 cterm=NONE guibg=NONE guifg=#cab0af gui=NONE + hi link Structure StorageClass + hi link TypeDef StorageClass + hi Constant ctermbg=NONE ctermfg=232 cterm=italic guibg=NONE guifg=#555555 gui=italic + hi String ctermbg=NONE ctermfg=232 cterm=italic guibg=NONE guifg=#555555 gui=italic + hi link Character String + hi link Number String + hi link Boolean String + hi link Float String + hi Folded ctermbg=NONE ctermfg=232 cterm=bold guibg=NONE guifg=#555555 gui=bold + hi Statement ctermbg=NONE ctermfg=243 cterm=NONE guibg=NONE guifg=#999999 gui=NONE + hi Conditional ctermbg=NONE ctermfg=232 cterm=NONE guibg=NONE guifg=#555555 gui=NONE + hi Repeat ctermbg=NONE ctermfg=232 cterm=NONE guibg=NONE guifg=#555555 gui=NONE + hi Label ctermbg=NONE ctermfg=232 cterm=bold guibg=NONE guifg=#555555 gui=bold + hi Operator ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#afafaf gui=NONE + hi Keyword ctermbg=NONE ctermfg=232 cterm=NONE guibg=NONE guifg=#555555 gui=NONE + hi Exception ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#cab0af gui=bold + hi PreProc ctermbg=NONE ctermfg=238 cterm=bold guibg=NONE guifg=#afafaf gui=bold + hi Include ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#afafaf gui=NONE + hi Comment ctermbg=NONE ctermfg=238 cterm=bold,italic guibg=NONE guifg=#afafaf gui=bold,italic + hi SpecialComment ctermbg=NONE ctermfg=232 cterm=italic guibg=NONE guifg=#555555 gui=italic + hi Todo ctermbg=NONE ctermfg=196 cterm=bold,italic guibg=NONE guifg=#aa0000 gui=bold,italic + hi Ignore ctermbg=NONE ctermfg=234 cterm=NONE guibg=NONE guifg=#ffffff gui=NONE + hi Conceal ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Error ctermbg=NONE ctermfg=196 cterm=bold guibg=NONE guifg=#c74444 gui=bold + hi Underlined ctermbg=NONE ctermfg=NONE cterm=underline guibg=NONE guifg=NONE gui=underline + hi StatusLine ctermbg=238 ctermfg=255 cterm=italic guibg=#dddddd guifg=#444444 gui=italic + hi StatusLineNC ctermbg=238 ctermfg=243 cterm=italic guibg=#dddddd guifg=#828282 gui=italic + hi link TabLine StatusLineNc + hi link TabLineSel StatusLine + hi TabLineFill ctermbg=238 ctermfg=238 cterm=italic guibg=#dddddd guifg=#dddddd gui=italic + hi VertSplit ctermbg=234 ctermfg=238 cterm=NONE guibg=#ffffff guifg=#dddddd gui=NONE + hi FoldColumn ctermbg=234 ctermfg=238 cterm=NONE guibg=#ffffff guifg=#afafaf gui=NONE + hi ColorColumn ctermbg=250 ctermfg=NONE cterm=NONE guibg=#f7f2f2 guifg=NONE gui=NONE + hi SignColumn ctermbg=234 ctermfg=255 cterm=NONE guibg=#ffffff guifg=#444444 gui=NONE + hi CursorLine ctermbg=250 ctermfg=NONE cterm=NONE guibg=#eeeeee guifg=NONE gui=NONE + hi Title ctermbg=NONE ctermfg=232 cterm=bold,italic guibg=NONE guifg=#555555 gui=bold,italic + hi LineNr ctermbg=234 ctermfg=238 cterm=NONE guibg=#ffffff guifg=#afafaf gui=NONE + hi CursorLineNr ctermbg=234 ctermfg=238 cterm=bold guibg=#ffffff guifg=#afafaf gui=bold + hi Pmenu ctermbg=243 ctermfg=243 cterm=NONE guibg=#828282 guifg=#828282 gui=NONE + hi PmenuSbar ctermbg=243 ctermfg=243 cterm=NONE guibg=#828282 guifg=#828282 gui=NONE + hi PmenuSel ctermbg=243 ctermfg=255 cterm=bold guibg=#828282 guifg=#444444 gui=bold + hi PmenuThumb ctermbg=243 ctermfg=243 cterm=NONE guibg=#828282 guifg=#828282 gui=NONE + hi SpecialKey ctermbg=NONE ctermfg=52 cterm=NONE guibg=NONE guifg=#967978 gui=NONE + hi DiffAdd ctermbg=22 ctermfg=NONE cterm=NONE guibg=#e0ece0 guifg=NONE gui=NONE + hi DiffChange ctermbg=17 ctermfg=NONE cterm=NONE guibg=#e0e0ec guifg=NONE gui=NONE + hi DiffDelete ctermbg=52 ctermfg=NONE cterm=NONE guibg=#ece0e0 guifg=NONE gui=NONE + hi DiffText ctermbg=17 ctermfg=21 cterm=NONE guibg=#e0e0ec guifg=#656a7c gui=NONE + hi IncSearch ctermbg=17 ctermfg=234 cterm=NONE guibg=#5a727c guifg=#ffffff gui=NONE + hi Search ctermbg=17 ctermfg=255 cterm=NONE guibg=#b7c3cd guifg=#444444 gui=NONE + hi Visual ctermbg=17 ctermfg=NONE cterm=NONE guibg=#ced8e0 guifg=NONE gui=NONE + hi VisualNOS ctermbg=52 ctermfg=NONE cterm=NONE guibg=#e0d4ce guifg=NONE gui=NONE + hi Directory ctermbg=NONE ctermfg=255 cterm=NONE guibg=NONE guifg=#444444 gui=NONE + hi MatchParen ctermbg=NONE ctermfg=17 cterm=bold guibg=NONE guifg=#b7c3cd gui=bold + hi SpellBad ctermbg=NONE ctermfg=196 cterm=NONE guibg=NONE guifg=#c74444 gui=NONE guisp=#c74444 + hi SpellCap ctermbg=NONE ctermfg=166 cterm=NONE guibg=NONE guifg=#a67038 gui=NONE guisp=#a67038 + hi SpellLocal ctermbg=NONE ctermfg=247 cterm=NONE guibg=NONE guifg=#797532 gui=NONE guisp=#a67038 + hi SpellRare ctermbg=NONE ctermfg=247 cterm=NONE guibg=NONE guifg=#797532 gui=NONE guisp=#a67038 + hi WildMenu ctermbg=238 ctermfg=255 cterm=bold guibg=#dddddd guifg=#444444 gui=bold + hi ErrorMsg ctermbg=NONE ctermfg=196 cterm=italic guibg=NONE guifg=#c74444 gui=italic + hi ModeMsg ctermbg=NONE ctermfg=255 cterm=italic guibg=NONE guifg=#444444 gui=italic + hi MoreMsg ctermbg=NONE ctermfg=255 cterm=italic guibg=NONE guifg=#444444 gui=italic + hi Question ctermbg=NONE ctermfg=247 cterm=italic guibg=NONE guifg=#797532 gui=italic + hi WarningMsg ctermbg=NONE ctermfg=166 cterm=italic guibg=NONE guifg=#a67038 gui=italic + hi Cursor ctermbg=255 ctermfg=0 cterm=bold guibg=#eee4e4 guifg=#131313 gui=bold + hi CursorColumn ctermbg=250 ctermfg=NONE cterm=NONE guibg=#eeeeee guifg=NONE gui=NONE + hi EndOfBuffer ctermbg=234 ctermfg=234 cterm=NONE guibg=#ffffff guifg=#ffffff gui=NONE + hi Noise ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#aaaaaa gui=NONE + hi link TabLineNum StatusLineNc + hi link TabLineNumSel StatusLine + hi GitGutterDelete ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#725454 gui=bold + hi GitGutterChange ctermbg=NONE ctermfg=19 cterm=bold guibg=NONE guifg=#596171 gui=bold + hi GitGutterAdd ctermbg=NONE ctermfg=34 cterm=bold guibg=NONE guifg=#496349 gui=bold + hi GitGutterChangeDelete ctermbg=NONE ctermfg=126 cterm=bold guibg=NONE guifg=#5c4a5a gui=bold + hi link QuickScopePrimary IncSearch + hi link QuickScopeSecondary Pmenu + hi cssIdentifier ctermbg=NONE ctermfg=22 cterm=bold guibg=NONE guifg=#7a9678 gui=bold + hi cssClass ctermbg=NONE ctermfg=28 cterm=NONE guibg=NONE guifg=#85a786 gui=NONE + hi link cssFunction Keyword + hi cssProp ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#afafaf gui=NONE + hi scssVariable ctermbg=NONE ctermfg=22 cterm=bold guibg=NONE guifg=#6b866c gui=bold + hi link cssAttr String + hi link cssIdentifierAttr Noise + hi link cssClassAttr cssIdentifierAttr + hi link cssAttrNoise Noise + hi link atKeyword PreProc + hi link cssIdentifier cssIdentifier + hi link cssClassName cssClass + hi link cssClassNameDot cssClass + hi link cssTagName htmlTagName + hi link cssPseudoClassId cssClassName + hi link cssKeyFrameSelector Label + hi link cssFunctionName cssFunction + hi link cssBraces Noise + hi cssUnitDecorators ctermbg=NONE ctermfg=232 cterm=NONE guibg=NONE guifg=#555555 gui=NONE + hi link scssSelector cssClass + hi link scssSelectorName scssSelector + hi link scssSelectorChar cssIdentifier + hi link scssFunctionName cssFunctionName + hi link scssMixin keyword + hi link scssMixinName cssFunction + hi link scssampersand scssSelectorName + hi link scssAtRoot atKeyword + hi link vue_scss cssIdentifier + hi htmlTagName ctermbg=NONE ctermfg=20 cterm=NONE guibg=NONE guifg=#898fcb gui=NONE + hi htmlSpecialTagName ctermbg=NONE ctermfg=19 cterm=bold guibg=NONE guifg=#7e84c6 gui=bold + hi htmlLink ctermbg=NONE ctermfg=232 cterm=italic,underline guibg=NONE guifg=#555555 gui=italic,underline + hi link htmlNormal Normal + hi link htmlTitle Title + hi link htmlH1 htmlTitle + hi link htmlTag Noise + hi link htmlEndTag htmlTag + hi link htmlArg PreProc + hi link htmlValue String + hi link htmlSpecialChar Special + hi link htmlPreStmt PreProc + hi link htmlPreError Error + hi link htmlPreProc PreProc + hi link htmlPreAttr String + hi link htmlPreProcAttrName PreProc + hi link htmlPreProcAttrError Error + hi link htmlSpecial Special + hi link htmlSpecialChar Special + hi link htmlString String + hi link htmlStatement Statement + hi link htmlComment Comment + hi link htmlCommentPart Comment + hi link htmlValue String + hi link htmlCommentError htmlError + hi link htmlTagError htmlError + hi link htmlEvent javaScript + hi link htmlError Error + hi link javaScript Special + hi link javaScriptExpression javaScript + hi link htmlCssStyleComment Comment + hi link htmlCssDefinition Special + hi link htmlImgArg htmlArg + hi link htmlSrcValue String + hi link htmlSrcsetValue htmlSrcValue + hi link htmlAltValue String + hi link htmlDataArg htmlTagName + hi link htmlDataValue Constant + hi link htmlHrefArg htmlArg + hi link htmlHrefValue htmlSrcValue + hi vueSpecial ctermbg=NONE ctermfg=17 cterm=bold guibg=NONE guifg=#6c6b86 gui=bold + hi vueTagSpecial ctermbg=NONE ctermfg=19 cterm=bold guibg=NONE guifg=#8685a7 gui=bold + hi vueTagComponentName ctermbg=NONE ctermfg=20 cterm=NONE guibg=NONE guifg=#a6a5c4 gui=NONE + hi vueDynamicComponent ctermbg=NONE ctermfg=20 cterm=bold guibg=NONE guifg=#a6a5c4 gui=bold + hi link vueSlotName Constant + hi link vueComponentName vueTagComponentName + hi link vueTransitionComponent vueDynamicComponent + hi link vueTransitionName vueSlotName + hi link vueTransitionMode String + hi link vueDirective Identifier + hi link vueEvent Function + hi link vueConditional vueSpecial + hi link vueFor vueConditional + hi link vueRef vueSpecial + hi link vueSlot Noise + hi link vueDirectiveValue Type + hi link vueEventValue vueDirectiveValue + hi link vueConditionalValue vueDirectiveValue + hi link vueForValue vueConditionalValue + hi link vueRefValue Constant + hi link vueSlotValue vueSlotName + hi link vueObjectKey cssClass + hi link vueObjectValue vueDirectiveValue + hi link vueDirectiveClass Noise + hi link vueMustache Type + hi link jsFunctionKey Function + hi link jsFuncCall Function + hi link jsFuncCall Identifier + hi link jsOperator Operator + hi link jsVariableDef Identifier + hi link jsGlobalObjects Keyqord + hi link jsGlobalNodeObjects jsGlobalObjects + hi link jsExceptions Exception + hi link jsBuiltins jsGlobalObjects + hi link jsStorageClass Include + hi link jsObjectKey Identifier + hi link jsObjectProp Type + hi link jsObjectValue StorageClass + hi link jsModuleKeyword Type + hi link jsOperatorKeyword Label + hi link jsThis jsGlobalObjects + hi link jsArrowFunction Function + hi link pythonBuiltin Type + hi link pythonBuiltinObj Special + hi link pythonDottedName Identifier + hi link pythonBrackets Noise + hi link pythonQuotes Noise + hi link pythonDot Noise + hi link pythonNoise Noise + hi link pythonExtraOperator Operator + hi link pythonDocString SpecialComment + hi pythonSelf ctermbg=NONE ctermfg=238 cterm=bold guibg=NONE guifg=#afafaf gui=bold + hi link JinjaVarBlock Noise + hi link JinjaTagBlock JinjaVarBlock + hi jinjaSpecial ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#725f77 gui=bold + hi jinjaRaw ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#725f77 gui=NONE + hi jinjaStatement ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#a287aa gui=NONE + hi jinjaFilter ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#b99dc1 gui=NONE + hi jinjaBlockName ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#b99dc1 gui=NONE + hi jinjaVariable ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#a287aa gui=NONE + hi link jinjaString String + hi link jinjaNumber Number + hi link jinjaOperator Noise + hi link jinjaComment Comment + hi link sqlOperator Operator + hi vimFoldMarker ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#afafaf gui=NONE + hi link vimMap Noise + hi link vimAbb vimMap + hi link VimCommand Statement + hi link VimOption String + hi link vimFunction Function + hi link vimFuncKey Special + hi link vimHighlight Noise + hi link vimAuGroupKey Noise + hi link vimGroupName Special + hi link vimAutoCmd Noise + hi link vimSynMtchGrp Type + hi link vimSynContains Type + hi link vimSynRegOpt Type + hi link vimHiTerm Include + hi link vimHiAttrib Number + hi link VimIsCommand Type + hi link vimNotation StorageClass + hi link vimMapLhs Special + hi link vimMapRhs Label + hi link vimNotFunc Conditional + hi link vimSep Noise + hi link vimParenSep vimSep + hi link vimContinue vimSep + hi link vimBracket vimSep + hi link vimOperParen Normal + hi link vimUserFunc Identifier + hi link vimFoldMarker Noise + hi link yamlKeyValueDelimiter Noise + hi link yamlFowIndicator Noise + hi link confComment Comment + hi markdownDelimiter ctermbg=NONE ctermfg=238 cterm=bold guibg=NONE guifg=#afafaf gui=bold + hi link markdownHeadingDelimiter markdownDelimiter + hi markdownListMarker ctermbg=NONE ctermfg=232 cterm=bold guibg=NONE guifg=#555555 gui=bold + hi link markdownCodeDelimiter markdownDelimiter + hi link markdownCode Type + hi markdownItalic ctermbg=NONE ctermfg=243 cterm=italic guibg=NONE guifg=#999999 gui=italic + hi link markdownItalicDelimiter markdownDelimiter + hi markdownBold ctermbg=NONE ctermfg=243 cterm=bold guibg=NONE guifg=#999999 gui=bold + hi link markdownBoldDelimiter markdownDelimiter + hi link markdownIdDeclaration Conditional + hi link markdownId markdownIdDeclaration + hi markdownLinkText ctermbg=NONE ctermfg=232 cterm=underline guibg=NONE guifg=#555555 gui=underline + hi ExtraWhitespace ctermbg=196 ctermfg=NONE cterm=NONE guibg=#ccbbbb guifg=NONE gui=NONE + hi link phpRegion Normal + hi link phpComparison Operator + hi link phpMethod Function + hi link phpParent Normal + hi link phpMemberSelector StorageClass + hi link phpVarSelector StorageClass + hi QuickfixLine ctermbg=NONE ctermfg=255 cterm=bold guibg=NONE guifg=#444444 gui=bold + hi qfLineNr ctermbg=NONE ctermfg=240 cterm=italic guibg=NONE guifg=#aaaaaa gui=italic + hi qfFilename ctermbg=NONE ctermfg=243 cterm=bold guibg=NONE guifg=#828282 gui=bold + hi link qfSeparator Ignore + hi link qfError ErrorMsg + hi link jsonKeyword Identifier + hi link jsonValue String + hi link jsonQuote Noise + hi link octobercmsSectionDelimiter Noise + hi link CocErrorSign ErrorMsg + hi link CocWarningSign WarningMsg + hi link CocInfoSign Question + hi link CocHintSign Question + hi link CocHighlightText IncSearch + hi CocUnderline ctermbg=52 ctermfg=196 cterm=NONE guibg=#ece0e0 guifg=#c74444 gui=NONE + hi link LspErrorText ErrorMsg + hi link LspWarningText WarningMsg + hi link LspInformationText Question + hi link LspHintText Question + hi link ALEError CocUnderline + hi link ALEErrorSign ErrorMsg + hi link ALEErrorSign ErrorMsg + hi link mkdCodeStart Comment + hi link mkdListItem Conditional + hi link netrwTreeBar Noise + hi link netrwClassify Noise + hi link netrwExe Identifier + hi link netrwDir String + hi link netrwPlain Statement + hi link netrwHelpCmd Type + hi link netrwCmdNote function + hi link netrwQuickHelp netrwCmdNote + hi link netrwCmdSep Noise + hi link netrwVersion StorageClass + hi link netrwList String + hi link netrwHidePat Identifier + hi link Variable Function + hi link shDerefSimple StorageClass + hi link shHereDoc01 Special + hi link shHereDoc02 shHereDoc01 + hi link shHereDoc05 shHereDoc01 + hi link shHereDoc Label +elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 + set t_Co=16 + hi Normal ctermbg=black ctermfg=gray cterm=NONE + set background=light + hi Special ctermbg=NONE ctermfg=darkred cterm=bold + hi NonText ctermbg=NONE ctermfg=darkred cterm=NONE + hi Tag ctermbg=red ctermfg=NONE cterm=NONE + hi Identifier ctermbg=NONE ctermfg=darkred cterm=bold + hi Function ctermbg=NONE ctermfg=darkred cterm=NONE + hi Type ctermbg=NONE ctermfg=red cterm=bold + hi StorageClass ctermbg=NONE ctermfg=red cterm=NONE + hi link Structure StorageClass + hi link TypeDef StorageClass + hi Constant ctermbg=NONE ctermfg=gray cterm=italic + hi String ctermbg=NONE ctermfg=gray cterm=italic + hi link Character String + hi link Number String + hi link Boolean String + hi link Float String + hi Folded ctermbg=NONE ctermfg=gray cterm=bold + hi Statement ctermbg=NONE ctermfg=gray cterm=NONE + hi Conditional ctermbg=NONE ctermfg=gray cterm=NONE + hi Repeat ctermbg=NONE ctermfg=gray cterm=NONE + hi Label ctermbg=NONE ctermfg=gray cterm=bold + hi Operator ctermbg=NONE ctermfg=gray cterm=NONE + hi Keyword ctermbg=NONE ctermfg=gray cterm=NONE + hi Exception ctermbg=NONE ctermfg=red cterm=bold + hi PreProc ctermbg=NONE ctermfg=gray cterm=bold + hi Include ctermbg=NONE ctermfg=gray cterm=NONE + hi Comment ctermbg=NONE ctermfg=gray cterm=bold,italic + hi SpecialComment ctermbg=NONE ctermfg=gray cterm=italic + hi Todo ctermbg=NONE ctermfg=red cterm=bold,italic + hi Ignore ctermbg=NONE ctermfg=black cterm=NONE + hi Conceal ctermbg=NONE ctermfg=NONE cterm=NONE + hi Error ctermbg=NONE ctermfg=red cterm=bold + hi Underlined ctermbg=NONE ctermfg=NONE cterm=underline + hi StatusLine ctermbg=gray ctermfg=white cterm=italic + hi StatusLineNC ctermbg=gray ctermfg=gray cterm=italic + hi link TabLine StatusLineNc + hi link TabLineSel StatusLine + hi TabLineFill ctermbg=gray ctermfg=gray cterm=italic + hi VertSplit ctermbg=black ctermfg=gray cterm=NONE + hi FoldColumn ctermbg=black ctermfg=gray cterm=NONE + hi ColorColumn ctermbg=white ctermfg=NONE cterm=NONE + hi SignColumn ctermbg=black ctermfg=white cterm=NONE + hi CursorLine ctermbg=white ctermfg=NONE cterm=NONE + hi Title ctermbg=NONE ctermfg=gray cterm=bold,italic + hi LineNr ctermbg=black ctermfg=gray cterm=NONE + hi CursorLineNr ctermbg=black ctermfg=gray cterm=bold + hi Pmenu ctermbg=gray ctermfg=gray cterm=NONE + hi PmenuSbar ctermbg=gray ctermfg=gray cterm=NONE + hi PmenuSel ctermbg=gray ctermfg=white cterm=bold + hi PmenuThumb ctermbg=gray ctermfg=gray cterm=NONE + hi SpecialKey ctermbg=NONE ctermfg=darkred cterm=NONE + hi DiffAdd ctermbg=darkgreen ctermfg=NONE cterm=NONE + hi DiffChange ctermbg=darkblue ctermfg=NONE cterm=NONE + hi DiffDelete ctermbg=darkred ctermfg=NONE cterm=NONE + hi DiffText ctermbg=darkblue ctermfg=white cterm=NONE + hi IncSearch ctermbg=darkblue ctermfg=black cterm=NONE + hi Search ctermbg=darkblue ctermfg=white cterm=NONE + hi Visual ctermbg=darkblue ctermfg=NONE cterm=NONE + hi VisualNOS ctermbg=darkred ctermfg=NONE cterm=NONE + hi Directory ctermbg=NONE ctermfg=white cterm=NONE + hi MatchParen ctermbg=NONE ctermfg=darkblue cterm=bold + hi SpellBad ctermbg=NONE ctermfg=red cterm=NONE + hi SpellCap ctermbg=NONE ctermfg=yellow cterm=NONE + hi SpellLocal ctermbg=NONE ctermfg=darkyellow cterm=NONE + hi SpellRare ctermbg=NONE ctermfg=darkyellow cterm=NONE + hi WildMenu ctermbg=gray ctermfg=white cterm=bold + hi ErrorMsg ctermbg=NONE ctermfg=red cterm=italic + hi ModeMsg ctermbg=NONE ctermfg=white cterm=italic + hi MoreMsg ctermbg=NONE ctermfg=white cterm=italic + hi Question ctermbg=NONE ctermfg=darkgray cterm=italic + hi WarningMsg ctermbg=NONE ctermfg=yellow cterm=italic + hi Cursor ctermbg=white ctermfg=black cterm=bold + hi CursorColumn ctermbg=white ctermfg=NONE cterm=NONE + hi EndOfBuffer ctermbg=black ctermfg=black cterm=NONE + hi Noise ctermbg=NONE ctermfg=gray cterm=NONE + hi link TabLineNum StatusLineNc + hi link TabLineNumSel StatusLine + hi GitGutterDelete ctermbg=NONE ctermfg=red cterm=bold + hi GitGutterChange ctermbg=NONE ctermfg=blue cterm=bold + hi GitGutterAdd ctermbg=NONE ctermfg=green cterm=bold + hi GitGutterChangeDelete ctermbg=NONE ctermfg=magenta cterm=bold + hi link QuickScopePrimary IncSearch + hi link QuickScopeSecondary Pmenu + hi cssIdentifier ctermbg=NONE ctermfg=darkgreen cterm=bold + hi cssClass ctermbg=NONE ctermfg=darkgreen cterm=NONE + hi link cssFunction Keyword + hi cssProp ctermbg=NONE ctermfg=gray cterm=NONE + hi scssVariable ctermbg=NONE ctermfg=darkgreen cterm=bold + hi link cssAttr String + hi link cssIdentifierAttr Noise + hi link cssClassAttr cssIdentifierAttr + hi link cssAttrNoise Noise + hi link atKeyword PreProc + hi link cssIdentifier cssIdentifier + hi link cssClassName cssClass + hi link cssClassNameDot cssClass + hi link cssTagName htmlTagName + hi link cssPseudoClassId cssClassName + hi link cssKeyFrameSelector Label + hi link cssFunctionName cssFunction + hi link cssBraces Noise + hi cssUnitDecorators ctermbg=NONE ctermfg=gray cterm=NONE + hi link scssSelector cssClass + hi link scssSelectorName scssSelector + hi link scssSelectorChar cssIdentifier + hi link scssFunctionName cssFunctionName + hi link scssMixin keyword + hi link scssMixinName cssFunction + hi link scssampersand scssSelectorName + hi link scssAtRoot atKeyword + hi link vue_scss cssIdentifier + hi htmlTagName ctermbg=NONE ctermfg=blue cterm=NONE + hi htmlSpecialTagName ctermbg=NONE ctermfg=blue cterm=bold + hi htmlLink ctermbg=NONE ctermfg=gray cterm=italic,underline + hi link htmlNormal Normal + hi link htmlTitle Title + hi link htmlH1 htmlTitle + hi link htmlTag Noise + hi link htmlEndTag htmlTag + hi link htmlArg PreProc + hi link htmlValue String + hi link htmlSpecialChar Special + hi link htmlPreStmt PreProc + hi link htmlPreError Error + hi link htmlPreProc PreProc + hi link htmlPreAttr String + hi link htmlPreProcAttrName PreProc + hi link htmlPreProcAttrError Error + hi link htmlSpecial Special + hi link htmlSpecialChar Special + hi link htmlString String + hi link htmlStatement Statement + hi link htmlComment Comment + hi link htmlCommentPart Comment + hi link htmlValue String + hi link htmlCommentError htmlError + hi link htmlTagError htmlError + hi link htmlEvent javaScript + hi link htmlError Error + hi link javaScript Special + hi link javaScriptExpression javaScript + hi link htmlCssStyleComment Comment + hi link htmlCssDefinition Special + hi link htmlImgArg htmlArg + hi link htmlSrcValue String + hi link htmlSrcsetValue htmlSrcValue + hi link htmlAltValue String + hi link htmlDataArg htmlTagName + hi link htmlDataValue Constant + hi link htmlHrefArg htmlArg + hi link htmlHrefValue htmlSrcValue + hi vueSpecial ctermbg=NONE ctermfg=darkblue cterm=bold + hi vueTagSpecial ctermbg=NONE ctermfg=darkblue cterm=bold + hi vueTagComponentName ctermbg=NONE ctermfg=blue cterm=NONE + hi vueDynamicComponent ctermbg=NONE ctermfg=blue cterm=bold + hi link vueSlotName Constant + hi link vueComponentName vueTagComponentName + hi link vueTransitionComponent vueDynamicComponent + hi link vueTransitionName vueSlotName + hi link vueTransitionMode String + hi link vueDirective Identifier + hi link vueEvent Function + hi link vueConditional vueSpecial + hi link vueFor vueConditional + hi link vueRef vueSpecial + hi link vueSlot Noise + hi link vueDirectiveValue Type + hi link vueEventValue vueDirectiveValue + hi link vueConditionalValue vueDirectiveValue + hi link vueForValue vueConditionalValue + hi link vueRefValue Constant + hi link vueSlotValue vueSlotName + hi link vueObjectKey cssClass + hi link vueObjectValue vueDirectiveValue + hi link vueDirectiveClass Noise + hi link vueMustache Type + hi link jsFunctionKey Function + hi link jsFuncCall Function + hi link jsFuncCall Identifier + hi link jsOperator Operator + hi link jsVariableDef Identifier + hi link jsGlobalObjects Keyqord + hi link jsGlobalNodeObjects jsGlobalObjects + hi link jsExceptions Exception + hi link jsBuiltins jsGlobalObjects + hi link jsStorageClass Include + hi link jsObjectKey Identifier + hi link jsObjectProp Type + hi link jsObjectValue StorageClass + hi link jsModuleKeyword Type + hi link jsOperatorKeyword Label + hi link jsThis jsGlobalObjects + hi link jsArrowFunction Function + hi link pythonBuiltin Type + hi link pythonBuiltinObj Special + hi link pythonDottedName Identifier + hi link pythonBrackets Noise + hi link pythonQuotes Noise + hi link pythonDot Noise + hi link pythonNoise Noise + hi link pythonExtraOperator Operator + hi link pythonDocString SpecialComment + hi pythonSelf ctermbg=NONE ctermfg=gray cterm=bold + hi link JinjaVarBlock Noise + hi link JinjaTagBlock JinjaVarBlock + hi jinjaSpecial ctermbg=NONE ctermfg=magenta cterm=bold + hi jinjaRaw ctermbg=NONE ctermfg=magenta cterm=NONE + hi jinjaStatement ctermbg=NONE ctermfg=magenta cterm=NONE + hi jinjaFilter ctermbg=NONE ctermfg=magenta cterm=NONE + hi jinjaBlockName ctermbg=NONE ctermfg=magenta cterm=NONE + hi jinjaVariable ctermbg=NONE ctermfg=magenta cterm=NONE + hi link jinjaString String + hi link jinjaNumber Number + hi link jinjaOperator Noise + hi link jinjaComment Comment + hi link sqlOperator Operator + hi vimFoldMarker ctermbg=NONE ctermfg=gray cterm=NONE + hi link vimMap Noise + hi link vimAbb vimMap + hi link VimCommand Statement + hi link VimOption String + hi link vimFunction Function + hi link vimFuncKey Special + hi link vimHighlight Noise + hi link vimAuGroupKey Noise + hi link vimGroupName Special + hi link vimAutoCmd Noise + hi link vimSynMtchGrp Type + hi link vimSynContains Type + hi link vimSynRegOpt Type + hi link vimHiTerm Include + hi link vimHiAttrib Number + hi link VimIsCommand Type + hi link vimNotation StorageClass + hi link vimMapLhs Special + hi link vimMapRhs Label + hi link vimNotFunc Conditional + hi link vimSep Noise + hi link vimParenSep vimSep + hi link vimContinue vimSep + hi link vimBracket vimSep + hi link vimOperParen Normal + hi link vimUserFunc Identifier + hi link vimFoldMarker Noise + hi link yamlKeyValueDelimiter Noise + hi link yamlFowIndicator Noise + hi link confComment Comment + hi markdownDelimiter ctermbg=NONE ctermfg=gray cterm=bold + hi link markdownHeadingDelimiter markdownDelimiter + hi markdownListMarker ctermbg=NONE ctermfg=gray cterm=bold + hi link markdownCodeDelimiter markdownDelimiter + hi link markdownCode Type + hi markdownItalic ctermbg=NONE ctermfg=gray cterm=italic + hi link markdownItalicDelimiter markdownDelimiter + hi markdownBold ctermbg=NONE ctermfg=gray cterm=bold + hi link markdownBoldDelimiter markdownDelimiter + hi link markdownIdDeclaration Conditional + hi link markdownId markdownIdDeclaration + hi markdownLinkText ctermbg=NONE ctermfg=gray cterm=underline + hi ExtraWhitespace ctermbg=red ctermfg=NONE cterm=NONE + hi link phpRegion Normal + hi link phpComparison Operator + hi link phpMethod Function + hi link phpParent Normal + hi link phpMemberSelector StorageClass + hi link phpVarSelector StorageClass + hi QuickfixLine ctermbg=NONE ctermfg=white cterm=bold + hi qfLineNr ctermbg=NONE ctermfg=gray cterm=italic + hi qfFilename ctermbg=NONE ctermfg=gray cterm=bold + hi link qfSeparator Ignore + hi link qfError ErrorMsg + hi link jsonKeyword Identifier + hi link jsonValue String + hi link jsonQuote Noise + hi link octobercmsSectionDelimiter Noise + hi link CocErrorSign ErrorMsg + hi link CocWarningSign WarningMsg + hi link CocInfoSign Question + hi link CocHintSign Question + hi link CocHighlightText IncSearch + hi CocUnderline ctermbg=darkred ctermfg=red cterm=NONE + hi link LspErrorText ErrorMsg + hi link LspWarningText WarningMsg + hi link LspInformationText Question + hi link LspHintText Question + hi link ALEError CocUnderline + hi link ALEErrorSign ErrorMsg + hi link ALEErrorSign ErrorMsg + hi link mkdCodeStart Comment + hi link mkdListItem Conditional + hi link netrwTreeBar Noise + hi link netrwClassify Noise + hi link netrwExe Identifier + hi link netrwDir String + hi link netrwPlain Statement + hi link netrwHelpCmd Type + hi link netrwCmdNote function + hi link netrwQuickHelp netrwCmdNote + hi link netrwCmdSep Noise + hi link netrwVersion StorageClass + hi link netrwList String + hi link netrwHidePat Identifier + hi link Variable Function + hi link shDerefSimple StorageClass + hi link shHereDoc01 Special + hi link shHereDoc02 shHereDoc01 + hi link shHereDoc05 shHereDoc01 + hi link shHereDoc Label +endif + +augroup cursorlinebg + au! + au InsertEnter * hi CursorLine ctermbg=17 ctermfg=NONE cterm=NONE guibg=#dddddd guifg=NONE + au InsertLeave * hi CursorLine ctermbg=250 ctermfg=NONE cterm=NONE guibg=#eeeeee guifg=NONE +augroup END + + diff --git a/init.statusline.vim b/init.statusline.vim deleted file mode 100644 index d2c59e0..0000000 --- a/init.statusline.vim +++ /dev/null @@ -1,303 +0,0 @@ -function! GetLinterStatus(key) abort "{{{ - - let l:statuscount = 0 - - if exists('b:ale_linted') - let l:linter = ale#statusline#Count(bufnr('')) - else - let l:linter = GetDiagnosticCountsFromSigns(bufnr('')) - endif - - if has_key(l:linter, a:key) - let l:statuscount = l:linter[a:key] - endif - return l:statuscount -endfunction -"}}} - -function! GetStatusFrag(condition, colorname, conditionprefix, text) abort "{{{ -" TODO better name - let l:frag='%#' . a:colorname . '#' - let l:frag.=a:conditionprefix - let l:frag.='%{(' . a:condition . ")?'" . a:text . "':''}" - return l:frag -endfunction -"}}} - -function! GetDiagnosticCountsFromSigns(buffer) abort "{{{ - let l:error = 0 - let l:warn = 0 - let l:info = 0 - let l:hint = 0 - - redir => l:result - silent exec 'sign place buffer=' . a:buffer - redir end - - let l:lines = split(l:result, '\n') - - for l:line in l:lines - if l:line =~? 'Error' - let l:error += 1 - endif - if l:line =~? 'Warning' - let l:warn += 1 - endif - if l:line =~? 'Info' - let l:info += 1 - endif - if l:line =~? 'Hint' - let l:hint += 1 - endif - endfor - - return {'error': l:error, 'warning': l:warn, 'info': l:info, 'hint': l:hint} - -endfunction - -"}}} - -augroup statusline "{{{ - autocmd! - autocmd WinNew,WinEnter * setlocal statusline=%!GetStatus(1) - autocmd WinLeave * setlocal statusline=%!GetStatus(0) - autocmd Filetype qf setlocal statusline=%!GetStatus(1) - autocmd Filetype help setlocal statusline=%!GetStatus(1) -augroup END -"}}} - -function! GetStatus(isactive) abort "{{{ - " let l:linter = ale#statusline#Count(bufnr('')) - let l:divider = '- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >' - let l:separator = '%#StatusLineSeparator# ' - let l:normal = '%#StatusLineNormal#' - let l:active = '%#StatusLineActive#' - let l:linterdash = '%#LinterDash#·' - let l:linterdashactive = '%#LinterDashActive#·' - let l:statusline = l:separator - - "buffer number {{{ - if a:isactive - let l:statusline .= '%#StatusLineBufferNrActive#' - else - let l:statusline .= '%#StatusLineBufferNr#' - endif - let l:statusline .= ' %n ' . l:separator -"}}} - - " file percentage {{{ - if a:isactive - let l:statusline .= '%#StatusLinePercentActive#' - let l:statusline .= ' %P %#StatusLineNoiseActive#of %#StatusLineLinecountActive#%L ' - else - let l:statusline .= '%#StatusLinePercent#' - let l:statusline .= ' %P %#StatusLineNoise#of %#StatusLineLinecount#%L ' - endif"}}} - - " non-empty buftype (help, quickfix, etc) {{{ - if a:isactive - let l:statusline .= l:active . "%{&buftype == '' ? '' : ' '}%q%h%w%#StatusLineActiveNoText#" - else - let l:statusline .= l:normal . "%{&buftype == '' ? '' : ' '}%q%h%w%#StatusLineNormalNoText#" - endif - let l:statusline .= "%{&buftype == '' ? '' : ' '}%s" -"}}} - - " right/left divider {{{ - let l:statusline.=l:separator - " modified version - let l:color = 'StatusLineDivMod' . (a:isactive?'Active':'') - let l:statusline .= GetStatusFrag("&modified && mode() != 'i'", l:color, '%<', l:divider) - - " unmodified version - let l:color = 'StatusLineDiv' . (a:isactive?'Active':'') - let l:statusline .= GetStatusFrag("!&modified && mode() != 'i'", l:color, '%<', l:divider) - - " input mode version - if a:isactive - let l:statusline .= GetStatusFrag("mode() == 'i'", 'StatusLineDivInput', '%<', l:divider) - endif - - let l:statusline.= l:separator . '%*%=' -"}}} - - " file info{{{ - if a:isactive == 1 - " let l:statusline.=l:active - let l:statusline.='%#StatusLineFileInfo#' - " let l:statusline.=" %{strlen(&ft)?&ft:'none'} " - " let l:statusline.=l:separator . l:active - let l:statusline.='%{strlen(&fenc)?&fenc:&enc}' - " let l:statusline.=l:separator . l:active - let l:statusline.=' %{&fileformat}' - let l:statusline.="%{strlen(expand('%:e')) > 1?' ' . expand('%:e'):''}" - " let l:statusline.=l:separator . l:active - " let l:statusline.=' %{&spelllang} ' - let l:statusline .= l:separator - endif -"}}} - - " path/filename.extension {{{ - if a:isactive - if &readonly - let l:statusline .= '%#StatusLineWarningActive# %r ' - let l:statusline .= '%#StatusLineFileReadOnlyActive#' - " let l:statusline.='%#StatusLineDirActive# ' - let l:statusline.="%{expand('%:p:h:t')}/" - " let l:statusline.='%#StatusLineFileActive#' - - let l:statusline.="%{expand('%:t:r')}" - - " let l:statusline.='%#StatusLineDotActive#' - let l:statusline.="%{strlen(expand('%:e'))?'.':''}" - " let l:statusline.='%#StatusLineExtActive#' - let l:statusline.="%{expand('%:e')} " - else - let l:statusline.='%#StatusLineDirActive# ' - let l:statusline.="%{expand('%:p:h:t')}/" - let l:statusline.='%#StatusLineFileActive#' - - let l:statusline.="%{expand('%:t:r')}" - - let l:statusline.='%#StatusLineDotActive#' - let l:statusline.="%{strlen(expand('%:e'))?'.':''}" - let l:statusline.='%#StatusLineExtActive#' - let l:statusline.="%{expand('%:e')} " - endif - else - let l:statusline .= ' %#StatusLineWarning#%r' - let l:statusline.='%#StatusLineDir# ' - let l:statusline.="%{fnamemodify(expand('%:p:h'),':~')}/" - let l:statusline.='%#StatusLineFile#' - - let l:statusline.="%{expand('%:t:r')}" - - let l:statusline.='%#StatusLineDot#' - let l:statusline.="%{strlen(expand('%:e'))?'.':''}" - let l:statusline.='%#StatusLineExt#' - let l:statusline.="%{strlen(expand('%:e'))?expand('%:e'):expand('%:e')} " - endif - "}}} - - let l:statusline.='%*' . l:separator - - " linter status {{{ - if a:isactive - " errors - let l:statusline .= "%#LinterDashActive#%{(GetLinterStatus('error') == 0?'-':'')}" - let l:statusline .= "%#LinterErrorActive#%{(GetLinterStatus('error') == 0?'':GetLinterStatus('error'))}" - " style errors - let l:statusline .= l:linterdashactive - let l:statusline .= "%#LinterDashActive#%{(GetLinterStatus('style_error') == 0?'-':'')}" - let l:statusline .= "%#LinterErrorStyleActive#%{(GetLinterStatus('style_error') == 0?'':GetLinterStatus('style_error'))} " - - " warnings - let l:statusline .= "%#LinterDashActive#%{(GetLinterStatus('warning') == 0?'-':'')}" - let l:statusline .= "%#LinterWarningActive#%{(GetLinterStatus('warning') == 0?'':GetLinterStatus('warning'))}" - " style warnings - let l:statusline .= l:linterdashactive - let l:statusline .= "%#LinterDashActive#%{(GetLinterStatus('style_warning') == 0?'-':'')}" - let l:statusline .= "%#LinterWarningStyleActive#%{(GetLinterStatus('style_warning') == 0?'':GetLinterStatus('style_warning'))} " - - " info - let l:statusline .= "%#LinterDashActive#%{(GetLinterStatus('info') == 0?'-':'')}" - let l:statusline .= "%#LinterInfoActive#%{(GetLinterStatus('info') == 0?'':GetLinterStatus('info'))}" - else - " errors - let l:statusline .= "%#LinterDash#%{(GetLinterStatus('error') == 0?'-':'')}" - let l:statusline .= "%#LinterError#%{(GetLinterStatus('error') == 0?'':GetLinterStatus('error'))}" - " style errors - let l:statusline .= l:linterdash - let l:statusline .= "%{(GetLinterStatus('style_error') == 0?'-':'')}" - let l:statusline .= "%#LinterErrorStyle#%{(GetLinterStatus('style_error') == 0?'':GetLinterStatus('style_error'))} " - - " warnings - let l:statusline .= "%#LinterDash#%{(GetLinterStatus('warning') == 0?'-':'')}" - let l:statusline .= "%#LinterWarning#%{(GetLinterStatus('warning') == 0?'':GetLinterStatus('warning'))}" - " style warnings - let l:statusline .= l:linterdash - let l:statusline .= "%{(GetLinterStatus('style_warning') == 0?'-':'')}" - let l:statusline .= "%#LinterWarningStyle#%{(GetLinterStatus('style_warning') == 0?'':GetLinterStatus('style_warning'))} " - - " info - let l:statusline .= "%#LinterInfo#%{GetLinterStatus('info') == 0 ? '-' : GetLinterStatus('info')}" - endif -"}}} - - let l:statusline .= ' ' . l:separator - - if exists('gutentags#statusline') - let l:statusline .= '%#StatusLineWarning#%{gutentags#statusline("", "", "☢")}' - endif - - return l:statusline - -endfunction -"}}} - -" highlight groups {{{ -hi def link StatusLineSeparator Ignore -hi def link StatusLineNormal StatusLineNC -hi def link StatusLineActive StatusLine -hi def link StatusLineNormalNoText TabLineFill -hi def link StatusLineActiveNoText TabLineFill - -hi def link StatusLineNoise StatusLineNormal -hi def link StatusLineNoiseActive StatusLineNormal - -hi def link StatusLineBufferNr StatusLineNormal -hi def link StatusLineBufferNrActive StatusLineActive - -hi def link StatusLinePercent StatusLineNormal -hi def link StatusLinePercentActive StatusLineActive -hi def link StatusLineLinecount StatusLinePercent -hi def link StatusLineLinecountActive StatusLinePercentActive - -hi DivActive ctermbg=darkgray ctermfg=darkgray guibg=#666666 guifg=#666666 -hi DivMod ctermbg=darkred ctermfg=darkred guibg=#660000 guifg=#660000 -hi DivModActive ctermbg=red ctermfg=red guibg=#aa0000 guifg=#aa0000 -hi DivInput ctermbg=darkblue ctermfg=darkblue guibg=#000022 guifg=#000022 -hi def link StatusLineDiv TabLineFill -hi def link StatusLineDivActive DivActive -hi def link StatusLineDivMod DivMod -hi def link StatusLineDivModActive DivModActive -hi def link StatusLineDivInput DivInput - -hi def link StatusLineFileInfo StatusLineActive - -hi def link StatusLineFile StatusLineNormal -hi def link StatusLineFileActive StatusLineActive -hi def link StatusLineDir StatusLineFile -hi def link StatusLineDirActive StatusLineFileActive -hi def link StatusLineDot StatusLineDir -hi def link StatusLineDotActive StatusLineDirActive -hi def link StatusLineExt StatusLineDir -hi def link StatusLineExtActive StatusLineDirActive - -hi def link StatusLineFileReadOnlyActive WarningMsg -hi def link StatusLineWarning StatusLineNormal -hi def link StatusLineWarningActive WarningMsg - -hi def link LinterDash Normal -hi def link LinterDashActive Normal - -hi def link LinterError Normal -hi def link LinterErrorActive ErrorMsg - -hi def link LinterErrorStyle Normal -hi def link LinterErrorStyleActive SpellBad - -hi def link LinterWarning Normal -hi def link LinterWarningActive SpellCap - -hi def link LinterWarningStyle Normal -hi def link LinterWarningStyleActive LinterWarningActive - -hi def link LinterInfo Normal -hi def link LinterInfoActive SpellRare -"}}} - -set statusline=%!GetStatus(1) - - -" vim: set foldmethod=marker: diff --git a/init.vim b/init.vim index 1a5e1a6..8d14c5f 100644 --- a/init.vim +++ b/init.vim @@ -197,7 +197,7 @@ if exists('+termguicolors') set termguicolors endif -colorscheme monotonous-light +colorscheme paper-custom set updatetime=100 set timeoutlen=500 @@ -312,7 +312,7 @@ nnoremap rr :%s/\<=expand('')\>//g nnoremap s :syntax on nnoremap S :syntax off " miscallaneous {{{ -nnoremap l :colorscheme monotonous-light +nnoremap l :colorscheme paper-custom nnoremap d :colorscheme monotonous-dark nnoremap 0 ^ nnoremap cs :let @/="" diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 684ef17..a9c8a64 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -108,3 +108,4 @@ selfie Instagram HD setup +YouTube diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 84b5f2712adac02db4ad38647a8f96c792737685..0e1a3091c28491a5be75d5522fcbec7b5034e4f8 100644 GIT binary patch literal 1546 zcmZ8hJ#XAb5ZzgxVi#!?z|aqfK>-F*L`e`_8DHQ)fCUP$lS9fSxp%iZet}EsbVZP~ ziRu&rQoHdFQ00H%HowPtZ+L=$fB<(n`{vD?*%|(Fei1ugRcD`!Np{a%UX*^d-h`{F zZrUym;V)X0%K>w^) zR1X^~Tu}?{%k9kZI1jBY7&AwNDd8EOzV9OTdNUA+*;sS+S-yE`MR@CW8EwB zy=Qt^>8)pJw8&p+PM=!a3`*iatM&Zd$>t!Mq9R?#^az0e8?GYgk5PuCE4$=zZ zoQi0OP90y=xq(JzLGK&BvrhL_;);+Ip_3IHsmRM7uJY~_Alx7sH%O``JnbGx(i{0! zcC;|uB~Sxu+P|BIXrq0 zQb`SRwkDYF*htf^Q3Ul;H>)dOhR>YG`tPP{0lsBD3pBuh2j3_}4=N5yqL-SeIT@v88jJs@am+L>5lUz1WJ=@h obc4U;Xj1-49)1$9agRF6$6I7F%_l;h@W=8aPZR5(=%G>Vsf-~ z_CesYFFEF*KjCYBPn`E^RtUntbWioGSFdWSdinA!bw0+^uf}BYp<5NDUvH}LHr7qs zrD43-9lA0$oiyU)tt9bctu1%biWrkOSbHgTpJWgNRFo_1f)tXh0XP6S>%<;pr!LA$ z?4LN=f~cX}tOUiznhiWA!{&jDb&J?G)*u^|yp|5Z1BktPaZeTp!l)LtFH%-EBQPtR zfc++cbduUbDCPIcr>Bb~&e{XumI?M=H4S^dtBmSazP0O4kC;onG_GT(Zp zw*m6GCL+dWY_1hNdJs}c z4RW?7m~Ple)2>kj^-?#hD?fy9oX7f46SV zDXY5#0LMpv!OTsga?L?WB>5P=b-wC)OtBUVrY|XrSQhP|RlxRzpWHB^6i10G$lgo; zLN)SPi!m!Q*Iq%s+CEi^UTbjsq16aUy8x`euo3q~ywMh1Y^-PRcK|9~&_u6KIDU(O z8wSfI(&?w;