commit 2f1dc2ee24e1e2e24b8d2e688891a1df0760e88d
parent d717341f508de87c1dcb31929fb72d41d6fe2fee
Author: hhvn <dev@hhvn.uk>
Date: Sat, 19 Jun 2021 17:35:15 +0100
.c/n/c/hhvn.vim .c/n/init.vim .c/n/m/statusline.vim: restyle
Diffstat:
3 files changed, 85 insertions(+), 68 deletions(-)
diff --git a/.config/nvim/colors/hhvn.vim b/.config/nvim/colors/hhvn.vim
@@ -2,70 +2,98 @@
" First created by: Ron Aaron <ron@ronware.org>
" Modified by: hhvn <hhvn@hhvn.uk>
" Last Change: 17 March 2020
+"
set background=dark
+syntax reset
hi clear
-if exists("syntax_on")
- syntax reset
-endif
-let g:colors_name = "hhvn"
-" Modified for term colors
hi clear Normal
hi clear NonText
-hi comment ctermfg=14 guifg=#434343 gui=none
-hi constant ctermfg=13 guifg=#a84b8d gui=none
-hi identifier ctermfg=14 guifg=#434343 gui=NONE
-hi statement ctermfg=11 guifg=#a1a1d9 gui=NONE
-hi preproc ctermfg=44 guifg=#00d7d7 gui=none
-hi type ctermfg=85 guifg=#5fffaf gui=none
-"hi type ctermfg=243 guifg=#767676 gui=none
-hi special ctermfg=255 guifg=#eeeeee gui=none
-hi link ErrorMsg Error
-hi link WarningMsg Error
-hi Cursor cterm=reverse ctermfg=255 guifg=#eeeeee gui=reverse
-hi Search cterm=bold ctermbg=5 guibg=#777b8e gui=bold
-hi IncSearch cterm=bold ctermbg=5 guibg=#777b8e gui=bold
-hi title ctermfg=225 guifg=#ffd7ff gui=none
-" hi ShowMarksHL ctermfg=cyan ctermbg=lightblue cterm=bold guifg=yellow guibg=black gui=bold
-hi label ctermfg=255 guifg=#eeeeee gui=none
-hi operator ctermfg=240 guifg=#585858 gui=none
-hi link Operator operator
hi clear Visual
+hi clear Search
+
+hi comment ctermfg=238 guifg=#434343 cterm=none gui=none
+hi constant ctermfg=13 guifg=#a84b8d cterm=none gui=none
+hi identifier ctermfg=14 guifg=#434343 cterm=none gui=none
+hi statement ctermfg=11 guifg=#a1a1d9 cterm=none gui=none
+hi preproc ctermfg=95 guifg=#875f5f cterm=none gui=none
+hi type ctermfg=42 guifg=#3abf8f cterm=none gui=none
+hi special ctermfg=255 guifg=#eeeeee cterm=none gui=none
+hi variable ctermfg=38 guifg=#00afd7 cterm=none gui=none
+hi search cterm=reverse,bold gui=reverse,bold
+hi title ctermfg=225 guifg=#ffd7ff cterm=none gui=none
+hi label ctermfg=255 guifg=#eeeeee cterm=none gui=none
hi Visual cterm=reverse gui=reverse
-" hi DiffChange guibg=darkgreen
-" hi DiffText guibg=olivedrab
-" hi DiffAdd guibg=slateblue
-" hi DiffDelete guibg=coral
hi Folded cterm=bold ctermfg=255 ctermbg=none guifg=#aaaaaa guibg=#555555 gui=bold
hi FoldColumn cterm=none ctermfg=249 ctermbg=1 guifg=#b2b2b2 gui=none
" hi cIf0 guifg=gray
" hi diffOnly guifg=red gui=bold
+hi hicomment cterm=bold ctermbg=3 ctermfg=255 guibg=#31364b guifg=#eeeeee gui=none,bold
-" Following section entirely created by Hayden Hamilton
hi Error ctermfg=10 ctermbg=0 guifg=#892b2b guibg=#141726 gui=none
-hi link NvimInternalError Error
hi ErrorMsg ctermfg=0 ctermbg=10 guibg=#892b2b guifg=#141726 gui=none
-hi link WarningMsg ErrorMsg
hi MsgArea ctermbg=0 guibg=#141726 gui=none
-hi MsgSeparator ctermbg=1 guibg=#24283c gui=none
-hi Todo cterm=bold ctermbg=3 ctermfg=255 guibg=#31364b guifg=#eeeeee gui=none,bold
-hi Number ctermfg=13 guifg=#a84b8d
-hi link Float Number
-hi link Constant Number
-hi LineNr ctermfg=11 guifg=#616199 gui=none
-hi CursorLineNr ctermfg=11 gui=bold cterm=bold guifg=#a1a1d9
-hi SpellBad ctermbg=1 ctermfg=10 guifg=#892b2b guibg=#24283c gui=none
-hi SpellCap ctermbg=1 ctermfg=13 guifg=#a84b8d guibg=#24283c gui=none
-hi SpellRare ctermbg=1 ctermfg=none cterm=underline guifg=none guibg=#24283c gui=none,underline
-hi SpellLocal ctermbg=1 ctermfg=255 cterm=bold guifg=#eeeeee gui=none,bold
+hi MsgSeparator ctermbg=1 guibg=#24283c gui=none cterm=none
+
+hi LineNr ctermfg=11 guifg=#616199 gui=none cterm=none
+hi CursorLineNr ctermfg=11 guifg=#a1a1d9 gui=bold cterm=bold
+
+hi SpellBad ctermbg=1 ctermfg=10 guifg=#892b2b gui=bold cterm=bold
+hi SpellCap ctermbg=1 ctermfg=13 guifg=#a84b8d gui=bold cterm=bold
+hi SpellRare ctermbg=1 ctermfg=none guifg=none gui=none,underline cterm=none,underline
+hi SpellLocal ctermbg=1 ctermfg=255 guifg=#eeeeee gui=bold cterm=bold
+
hi MatchParen ctermfg=30 cterm=reverse guifg=#003740 gui=reverse
hi Underlined cterm=underline ctermfg=23 gui=underline guifg=#005f5f
-hi QuickScopePrimary guifg=#892b2b gui=bold,reverse
-hi QuickScopeSecondary guifg=#d750d7 gui=bold,reverse
hi ColorColumn guibg=#24283c
+hi QuickScopePrimary ctermfg=4 guifg=#575b72 cterm=bold,reverse gui=bold,reverse
+hi QuickScopeSecondary ctermfg=7 guifg=#c7cad9 cterm=bold,reverse gui=bold,reverse
+
+" hi diffChange guibg=olivedrab
+" hi diffText guibg=olivedrab
+hi diffAdded ctermfg=36
+hi diffRemoved ctermfg=10
+
+hi link diffFile preproc
+hi link diffNewFile preproc
+hi link diffOldFile preproc
+hi link diffIndexLine preproc
+hi link diffSubname statement
+
+hi Statusbar ctermbg=0 ctermfg=0 guifg=#141726 guibg=#141726
+hi Basecol ctermbg=1 ctermfg=7 guibg=#24283c
+hi Filecol cterm=bold ctermbg=3 ctermfg=7 gui=bold guifg=#c7cad9 guibg=#40445c
+hi Branchcol cterm=bold ctermbg=9 ctermfg=7 gui=bold guifg=#c7cad9 guibg=#4747e1
+hi Positioncol cterm=bold ctermbg=3 ctermfg=254 gui=bold guifg=#e4e4e4 guibg=#40445c
+hi Buffcol ctermbg=4 ctermfg=159 guifg=#afffff guibg=#575b72
+
+hi InsertMode ctermfg=126 ctermbg=1 guifg=#af0087 guibg=#24283c gui=bold cterm=bold
+hi TerminalMode ctermfg=190 ctermbg=1 guifg=#d7ff00 guibg=#24283c gui=bold cterm=bold
+hi CommandMode ctermfg=24 ctermbg=1 guifg=#005f87 guibg=#24283c gui=bold cterm=bold
+hi VisualMode ctermfg=202 ctermbg=1 guifg=#ff5f00 guibg=#24283c gui=bold cterm=bold
+hi NormalMode ctermfg=7 ctermbg=1 guifg=#c7cad9 guibg=#24283c gui=bold cterm=bold
+
+hi TabLine cterm=none ctermfg=252 ctermbg=1 gui=none guifg=#d0d0d0 guibg=#24283c
+hi TabLineSel cterm=bold ctermfg=252 ctermbg=3 gui=bold guifg=#d0d0d0 guibg=#40445c
+hi TabLineFill cterm=none ctermfg=none ctermbg=1 gui=none guifg=none guibg=#24283c
+
+hi link Todo hicomment
+hi link Number constant
+hi link Float constant
+hi link Constant constant
+hi link Operator statement
+hi link NvimInternalError Error
+hi link WarningMsg ErrorMsg
+hi link Search search
+hi link IncSearch search
+hi link shSetList variable
+hi link shShellVariables variable
+
" menu from ctrl+n or tab completions
hi Pmenu guifg=#1e5eb3 guibg=#141726
hi PmenuSel guifg=#141726 guibg=#777b8e gui=bold
hi PmenuSbar guibg=#24283c
hi PmenuThumb guibg=#892b2b
+
+let g:colors_name = "hhvn"
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
@@ -188,8 +188,8 @@ nnoremap <leader>CS :let @/=''<CR>
set clipboard=unnamed
"Terminals
-nnoremap <leader>Tt :vsplit term://zsh<CR><c-h><c-l>
-nnoremap <leader>TT :split term://zsh<CR><c-k><c-j>
+nnoremap <leader>Tt :vsplit term://ksh<CR><c-h><c-l>
+nnoremap <leader>TT :split term://ksh<CR><c-k><c-j>
tnoremap <leader><Esc> <C-\><C-n>
nnoremap <leader>shs :call Shmenu("~/.scripts/", "select a script")<CR>
nnoremap <leader>sho :let file=system("cat /tmp/shmenu-out")<CR>:execute 'edit! ' . file<CR>
diff --git a/.config/nvim/modules/statusline.vim b/.config/nvim/modules/statusline.vim
@@ -1,10 +1,3 @@
-hi Statusbar ctermbg=0 ctermfg=0 guifg=#141726 guibg=#141726
-hi Basecol ctermbg=1 guibg=#24283c
-hi Filecol cterm=bold ctermbg=3 ctermfg=7 gui=bold guifg=#c7cad9 guibg=#40445c
-hi Branchcol cterm=bold ctermbg=9 ctermfg=7 gui=bold guifg=#c7cad9 guibg=#4747e1
-hi Positioncol cterm=bold ctermbg=3 ctermfg=254 gui=bold guifg=#e4e4e4 guibg=#40445c
-hi Buffcol ctermbg=4 ctermfg=159 guifg=#afffff guibg=#575b72
-
let g:currentmode={
\'n' : 'Normal ',
\'no' : 'N·Operator Pending ',
@@ -41,20 +34,18 @@ function! Modecol()
let l:mode=tolower(Modecurrent())
if l:mode == 'insert '
- let gbg='#af005f'
+ let lcol = 'InsertMode'
elseif l:mode == 'terminal '
- let gbg='#af8700'
+ let lcol = 'TerminalMode'
elseif l:mode == 'command '
- let gbg='#005f5f'
+ let lcol = 'CommandMode'
elseif l:mode == 'visual ' || l:mode == 'v-block ' || l:mode == 'v-line ' || l:mode == 'select '
- let gbg='#af5f00'
+ let lcol = 'VisualMode'
else
- let gbg='#892b2b'
+ let lcol = 'NormalMode'
endif
- let hargs='gui=bold guifg=#e4e4e4 guibg=' . gbg . ' ' . other
-
- execute 'hi! Modecol ' . hargs
+ execute 'hi link Modecol ' . lcol
return ''
endfunction
@@ -63,14 +54,15 @@ function! Gitbranch()
endfunction
function! Activestatus()
- ""Mode
- let g:s.="%#Modecol#"
- let g:s.=" %{Modecurrent()}"
- let g:s.="%#Basecol#"
+ set termguicolors
""File
let g:s.="%#Filecol#"
let g:s.=" %f\ -\ %y%m "
let g:s.="%#Basecol#"
+ ""Mode
+ let g:s.="%#Modecol#"
+ let g:s.=" %{Modecurrent()}"
+ let g:s.="%#Basecol#"
let g:s.="%="
""Branch
" let g:s.="%#Branchcol#"
@@ -114,16 +106,13 @@ function! NetrwIstatus()
endfunction
function! TermAstatus()
- ""Reminder
- let g:s.="%#Modecol#"
- let g:s.=" [terminal] "
- let g:s.="%#Basecol#"
return g:s
endfunction
function! TermIstatus()
""Reminder
+ let g:s.="%="
let g:s.="%#Basecol#"
let g:s.=" [terminal] "
