From dc597ec344bedd693f0c3279290686bc38599efb Mon Sep 17 00:00:00 2001 From: surdeus Date: Sat, 26 Aug 2023 15:09:08 +0300 Subject: [PATCH] Added my colorscheme for the Nvim. --- nvim/colors/jien.vifm | 17 ++++ nvim/colors/jien.vim | 60 +++++++++++++ nvim/colors/vividchalk.vim | 175 +++++++++++++++++++++++++++++++++++++ nvim/init.lua | 9 +- nvim/lua/maps.lua | 7 +- 5 files changed, 264 insertions(+), 4 deletions(-) create mode 100644 nvim/colors/jien.vifm create mode 100644 nvim/colors/jien.vim create mode 100644 nvim/colors/vividchalk.vim diff --git a/nvim/colors/jien.vifm b/nvim/colors/jien.vifm new file mode 100644 index 0000000..2389a70 --- /dev/null +++ b/nvim/colors/jien.vifm @@ -0,0 +1,17 @@ +highlight Win cterm=none ctermfg=white ctermbg=black +highlight Directory cterm=bold ctermfg=blue ctermbg=black +highlight Link cterm=bold ctermfg=cyan ctermbg=black +highlight BrokenLink cterm=bold ctermfg=red ctermbg=black +highlight Socket cterm=bold ctermfg=magenta ctermbg=black +highlight Device cterm=bold ctermfg=red ctermbg=black +highlight Fifo cterm=bold ctermfg=cyan ctermbg=black +highlight Executable cterm=bold ctermfg=green ctermbg=black +highlight Selected cterm=bold ctermfg=black ctermbg=red +highlight CurrLine cterm=bold ctermfg=black ctermbg=yellow +highlight TopLine cterm=none ctermfg=black ctermbg=white +highlight TopLineSel cterm=bold ctermfg=black ctermbg=none +highlight StatusLine cterm=bold ctermfg=black ctermbg=red +highlight WildMenu cterm=underline,reverse ctermfg=white ctermbg=none +highlight CmdLine cterm=none ctermfg=white ctermbg=none +highlight ErrorMsg cterm=none ctermfg=red ctermbg=none +highlight Border cterm=none ctermfg=black ctermbg=white diff --git a/nvim/colors/jien.vim b/nvim/colors/jien.vim new file mode 100644 index 0000000..8399e96 --- /dev/null +++ b/nvim/colors/jien.vim @@ -0,0 +1,60 @@ +" J's VIM color file. +" surdeus: . +" (originally looked at slate.) +set background=dark +if exists("syntax_on") + syntax reset +endif +" highlight clear + +let colors_name = "jien" +hi Normal guibg=black guifg=lightgray +hi Cursor gui=reverse +hi TermCursor guibg=red +hi CursorLine gui=bold +hi VertSplit gui=bold guifg=yellow + +hi Folded gui=none guifg=black guibg=green +hi FoldColumn gui=none guifg=yellow guibg=white +hi IncSearch gui=none guifg=yellow ctermbg=green +hi LineNr guibg=white guifg=black + +hi ModeMsg cterm=none ctermfg=black ctermbg=yellow +hi MoreMsg cterm=none ctermfg=darkgreen ctermbg=none +hi NonText cterm=none ctermfg=darkgrey ctermbg=none +hi Question cterm=none ctermfg=green ctermbg=none +hi Search cterm=none ctermfg=black ctermbg=yellow +hi SpecialKey cterm=none ctermfg=darkgreen ctermbg=none +hi StatusLine gui=bold guifg=black guibg=red +hi StatusLineNC guifg=gray +hi Title guifg=yellow +hi Statement gui=none guifg=magenta +hi Visual gui=reverse +hi WarningMsg cterm=none ctermfg=1 ctermbg=none + +hi String guifg=red +hi Constant guifg=red + +hi Comment guifg=yellow +hi Special guifg=lightblue +hi Identifier gui=bold guifg=lightgreen +hi Include gui=bold guifg=red +hi PreProc cterm=none ctermfg=red ctermbg=none +hi Operator guifg=lightblue +hi Define cterm=none ctermfg=red ctermbg=none +hi Type guifg=lightgreen cterm=none ctermfg=green ctermbg=none +hi Function gui=none guifg=darkmagenta guibg=none +hi Structure gui=none guifg=green guibg=none + +hi Ignore cterm=none ctermfg=7 ctermbg=none +hi Directory cterm=none ctermfg=darkcyan ctermbg=none +hi ErrorMsg cterm=none ctermfg=7 ctermbg=1 +hi VisualNOS cterm=bold,underline ctermfg=none ctermbg=none +hi WildMenu cterm=none ctermfg=black ctermbg=yellow +hi DiffAdd ctermbg=4 ctermfg=none ctermbg=none +hi DiffChange ctermbg=5 ctermfg=none ctermbg=none +hi DiffDelete cterm=bold ctermfg=4 ctermbg=6 +hi DiffText cterm=bold ctermfg=none ctermbg=1 +hi Underlined cterm=underline ctermfg=5 ctermbg=none +hi Error cterm=none ctermfg=7 ctermbg=1 ctermbg=none +hi SpellErrors cterm=bold ctermfg=7 ctermbg=1 ctermbg=none diff --git a/nvim/colors/vividchalk.vim b/nvim/colors/vividchalk.vim new file mode 100644 index 0000000..8e00720 --- /dev/null +++ b/nvim/colors/vividchalk.vim @@ -0,0 +1,175 @@ +" Vim color scheme +" Name: vividchalk.vim +" Author: Tim Pope +" Version: 2.0 +" GetLatestVimScripts: 1891 1 :AutoInstall: vividchalk.vim + +" Based on the Vibrank Ink theme for TextMate +" Distributable under the same terms as Vim itself (see :help license) + +if has("gui_running") + set background=dark +endif +hi clear +if exists("syntax_on") + syntax reset +endif + +let colors_name = "vividchalk" + +" First two functions adapted from inkpot.vim + +" map a urxvt cube number to an xterm-256 cube number +fun! s:M(a) + return strpart("0245", a:a, 1) + 0 +endfun + +" map a urxvt colour to an xterm-256 colour +fun! s:X(a) + if &t_Co == 88 + return a:a + else + if a:a == 8 + return 237 + elseif a:a < 16 + return a:a + elseif a:a > 79 + return 232 + (3 * (a:a - 80)) + else + let l:b = a:a - 16 + let l:x = l:b % 4 + let l:y = (l:b / 4) % 4 + let l:z = (l:b / 16) + return 16 + s:M(l:x) + (6 * s:M(l:y)) + (36 * s:M(l:z)) + endif + endif +endfun + +function! s:choose(mediocre,good) + if &t_Co != 88 && &t_Co != 256 + return a:mediocre + else + return s:X(a:good) + endif +endfunction + +function! s:hifg(group,guifg,first,second,...) + if a:0 && &t_Co == 256 + let ctermfg = a:1 + else + let ctermfg = s:choose(a:first,a:second) + endif + exe "highlight ".a:group." guifg=".a:guifg." ctermfg=".ctermfg +endfunction + +function! s:hibg(group,guibg,first,second) + let ctermbg = s:choose(a:first,a:second) + exe "highlight ".a:group." guibg=".a:guibg." ctermbg=".ctermbg +endfunction + +hi link rubyDefine Keyword +hi link rubySymbol Constant +hi link rubyEval rubyMethod +hi link rubyException rubyMethod +hi link rubyInclude rubyMethod +hi link rubyMacro rubyMethod +hi link rubyStringDelimiter rubyString +hi link rubyRegexp Regexp +hi link rubyRegexpDelimiter rubyRegexp + +hi link javascriptRegexpString Regexp + +hi link diffAdded String +hi link diffRemoved Statement +hi link diffLine PreProc +hi link diffSubname Comment + +call s:hifg("Normal","#EEEEEE","White",87) +if &background == "light" || has("gui_running") + hi Normal guibg=Black ctermbg=Black +else + hi Normal guibg=Black ctermbg=NONE +endif +highlight StatusLine guifg=Black guibg=#aabbee gui=bold ctermfg=Black ctermbg=White cterm=bold +highlight StatusLineNC guifg=#444444 guibg=#aaaaaa gui=none ctermfg=Black ctermbg=Grey cterm=none +"if &t_Co == 256 + "highlight StatusLine ctermbg=117 +"else + "highlight StatusLine ctermbg=43 +"endif + +highlight Ignore ctermfg=Black +highlight WildMenu guifg=Black guibg=#ffff00 gui=bold ctermfg=Black ctermbg=Yellow cterm=bold +highlight Cursor guifg=Black guibg=White ctermfg=Black ctermbg=White +call s:hibg("ColorColumn","#333333","DarkGrey",81) +call s:hibg("CursorLine","#333333","DarkGrey",81) +call s:hibg("CursorColumn","#333333","DarkGrey",81) +highlight NonText guifg=#404040 ctermfg=8 +highlight SpecialKey guifg=#404040 ctermfg=8 +highlight Directory none +high link Directory Identifier +highlight ErrorMsg guibg=Red ctermbg=DarkRed guifg=NONE ctermfg=NONE +highlight Search guifg=NONE ctermfg=NONE gui=none cterm=none +call s:hibg("Search" ,"#555555","DarkBlue",81) +highlight IncSearch guifg=White guibg=Black ctermfg=White ctermbg=Black +highlight MoreMsg guifg=#00AA00 ctermfg=Green +highlight LineNr guifg=#DDEEFF ctermfg=White +call s:hibg("LineNr" ,"#222222","DarkBlue",80) +highlight Question none +high link Question MoreMsg +highlight Title guifg=Magenta ctermfg=Magenta +highlight VisualNOS gui=none cterm=none +call s:hibg("Visual" ,"#555577","LightBlue",83) +call s:hibg("VisualNOS" ,"#444444","DarkBlue",81) +call s:hibg("MatchParen","#1100AA","DarkBlue",18) +highlight WarningMsg guifg=Red ctermfg=Red +highlight Error ctermbg=DarkRed +highlight SpellBad ctermbg=DarkRed +" FIXME: Comments +highlight SpellRare ctermbg=DarkMagenta +highlight SpellCap ctermbg=DarkBlue +highlight SpellLocal ctermbg=DarkCyan + +call s:hibg("Folded" ,"#110077","DarkBlue",17) +call s:hifg("Folded" ,"#aaddee","LightCyan",63) +highlight FoldColumn none +high link FoldColumn Folded +highlight DiffAdd ctermbg=4 guibg=DarkBlue +highlight DiffChange ctermbg=5 guibg=DarkMagenta +highlight DiffDelete ctermfg=12 ctermbg=6 gui=bold guifg=Blue guibg=DarkCyan +highlight DiffText ctermbg=DarkRed +highlight DiffText cterm=bold ctermbg=9 gui=bold guibg=Red + +highlight Pmenu guifg=White ctermfg=White gui=bold cterm=bold +highlight PmenuSel guifg=White ctermfg=White gui=bold cterm=bold +call s:hibg("Pmenu" ,"#000099","Blue",18) +call s:hibg("PmenuSel" ,"#5555ff","DarkCyan",39) +highlight PmenuSbar guibg=Grey ctermbg=Grey +highlight PmenuThumb guibg=White ctermbg=White +highlight TabLine gui=underline cterm=underline +call s:hifg("TabLine" ,"#bbbbbb","LightGrey",85) +call s:hibg("TabLine" ,"#333333","DarkGrey",80) +highlight TabLineSel guifg=White guibg=Black ctermfg=White ctermbg=Black +highlight TabLineFill gui=underline cterm=underline +call s:hifg("TabLineFill","#bbbbbb","LightGrey",85) +call s:hibg("TabLineFill","#808080","Grey",83) + +hi Type gui=none +hi Statement gui=none +if !has("gui_mac") + " Mac GUI degrades italics to ugly underlining. + hi Comment gui=italic +endif +hi Identifier cterm=none +" Commented numbers at the end are *old* 256 color values +call s:hifg("Comment" ,"#9933CC","DarkMagenta",34) " 92 +" 26 instead? +call s:hifg("Constant" ,"#339999","DarkCyan",21) " 30 +call s:hifg("String" ,"#66FF00","LightGreen",44,82) " 82 +call s:hifg("Identifier" ,"#FFCC00","Yellow",72) " 220 +call s:hifg("Statement" ,"#FF6600","Brown",68) " 202 +call s:hifg("PreProc" ,"#AAFFFF","LightCyan",47) " 213 +call s:hifg("Type" ,"#AAAA77","Grey",57) " 101 +call s:hifg("Special" ,"#33AA00","DarkGreen",24) " 7 +call s:hifg("Regexp" ,"#44B4CC","DarkCyan",21) " 74 +call s:hifg("rubyMethod" ,"#DDE93D","Yellow",77) " 191 diff --git a/nvim/init.lua b/nvim/init.lua index 6fe6c31..7325f6f 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -3,11 +3,17 @@ vim.o.smarttab = true vim.o.swapfile = false vim.o.number = true +vim.o.cursorline = true vim.api.nvim_cmd({ cmd = 'colorscheme', - args = {'slate'}, + args = {'jien'}, }, {}) +require("maps") + +-- Do not put basic things after it, +-- because the manager does not like it. + -- Plugin manager "Lazy" local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then @@ -46,5 +52,4 @@ require("nvim-tree").setup({ }, }) -require("maps") diff --git a/nvim/lua/maps.lua b/nvim/lua/maps.lua index 7308f71..e8ebc41 100644 --- a/nvim/lua/maps.lua +++ b/nvim/lua/maps.lua @@ -4,8 +4,8 @@ local map = vim.api.nvim_set_keymap -- Configuration fast editing. local opts = {noremap = true, silent = true} - map('n', '\\econf', ':source $HOME/lib/nvim/init.lua\n', opts) - map('n', '\\rconf', ':e $HOME/lib/nvim/init.lua\n', opts) + map('n', '\\rconf', ':source $HOME/lib/nvim/init.lua\n', opts) + map('n', '\\econf', ':e $HOME/lib/nvim/init.lua\n', opts) map('n', '\\rmap', ':source $HOME/lib/nvim/lua/maps.lua\n', opts) map('n', '\\emap', ':e $HOME/lib/nvim/lua/maps.lua\n', opts) @@ -17,6 +17,9 @@ local opts = {noremap = true, silent = true} -- Tabs. map('n', '\\tn', ':tabnew\n', opts) +-- Line + map('n', '\\nl', ':if &cursorline==1set nocursorlineelse set cursorelineendif', opts) + -- Windows -- Moving opts = {silent = true}