commit 7dad9e05050504f68e3eaba5db079cfcde025d02
parent 3480b55859971ecc124d3271de3d318c05c61527
Author: hhvn <dev@hhvn.uk>
Date: Sat, 8 Jan 2022 15:18:06 +0000
.c/nvim/: use new colours
Diffstat:
7 files changed, 124 insertions(+), 136 deletions(-)
diff --git a/.config/nvim/.netrwhist b/.config/nvim/.netrwhist
@@ -0,0 +1,12 @@
+let g:netrw_dirhistmax =10
+let g:netrw_dirhistcnt =5
+let g:netrw_dirhist_5='/home/hayden/general/work/website2/localgit/xinitf/story'
+let g:netrw_dirhist_4='/home/hayden/.scripts/openbsd-compat'
+let g:netrw_dirhist_3='/home/hayden/general/work/website2/localgit/intfix/story'
+let g:netrw_dirhist_2='/home/hayden/.config/nvim/ftplugin'
+let g:netrw_dirhist_1='/home/hayden/general/work/website2/localgit/hlircnet-ircd/include'
+let g:netrw_dirhist_0='/home/hayden/general/work/website2/ascii/hlircnet.irc'
+let g:netrw_dirhist_9='/home/hayden/general/work/website2/localgit/hhttpd'
+let g:netrw_dirhist_8='/home/hayden/general/music/Linkin Park'
+let g:netrw_dirhist_7='/home/hayden/general/work/website2/localgit/austall/handlers'
+let g:netrw_dirhist_6='/home/hayden/.scripts/man/man1'
diff --git a/.config/nvim/colors/hhvn.vim b/.config/nvim/colors/hhvn.vim
@@ -15,58 +15,58 @@ hi clear Folded
hi clear StatusLine
hi clear StatusLineNC
-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=#66aa88 cterm=none gui=none
-hi label ctermfg=255 guifg=#eeeeee cterm=none gui=none
-hi Visual cterm=reverse gui=reverse
-hi hicomment cterm=bold ctermbg=3 ctermfg=255 guibg=#31364b guifg=#eeeeee gui=none,bold
-
-hi Error ctermfg=10 ctermbg=0 guifg=#892b2b guibg=#141726 gui=none
-hi ErrorMsg ctermfg=0 ctermbg=10 guibg=#892b2b guifg=#141726 gui=none
-hi MsgArea ctermbg=0 guibg=#141726 gui=none
-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 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 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 Statusbar ctermbg=0 ctermfg=0 guifg=#141726 guibg=#141726
-hi Basecol ctermbg=1 guibg=#24283c
-hi Blankcol ctermbg=1 ctermfg=1 guifg=#24283c 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 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 VertSplit ctermfg=1 ctermbg=1 guifg=#24283c guibg=#24283c gui=none cterm=none
-
-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 ctermbg=1 gui=none guibg=#24283c
-
+hi comment ctermfg=238 cterm=none
+hi constant ctermfg=13 cterm=none
+hi identifier ctermfg=14 cterm=none
+hi statement ctermfg=5 cterm=none
+hi preproc ctermfg=95 cterm=none
+hi type ctermfg=11 cterm=bold
+hi special ctermfg=255 cterm=none
+hi variable ctermfg=38 cterm=none
+hi search cterm=reverse,bold
+hi title ctermfg=225 cterm=none
+hi label ctermfg=255 cterm=none
+hi Visual cterm=reverse
+hi hicomment ctermfg=2 cterm=bold
+
+hi Error ctermfg=10 ctermbg=0
+hi ErrorMsg ctermfg=0 ctermbg=10
+hi MsgArea ctermbg=0
+hi MsgSeparator ctermbg=1 cterm=none
+
+hi LineNr ctermfg=3 cterm=none
+hi CursorLineNr ctermfg=3 cterm=bold
+hi CursorLine ctermbg=none cterm=none
+set cursorline
+
+hi SpellBad ctermbg=1 ctermfg=10 cterm=bold
+hi SpellCap ctermbg=1 ctermfg=13 cterm=bold
+hi SpellRare ctermbg=1 cterm=none,underline
+hi SpellLocal ctermbg=1 ctermfg=255 cterm=bold
+
+hi MatchParen ctermfg=30 cterm=reverse
+hi Underlined cterm=underline ctermfg=23
+
+hi QuickScopePrimary ctermfg=4 cterm=bold,reverse
+hi QuickScopeSecondary ctermfg=7 cterm=bold,reverse
+
+hi Statusbar ctermbg=1 ctermfg=0
+hi Basecol ctermbg=1 ctermfg=5 cterm=bold
+hi Blankcol ctermbg=1 ctermfg=1
+hi Filecol ctermbg=1 ctermfg=7 cterm=bold
+hi Positioncol ctermbg=1 ctermfg=254 cterm=bold
+
+hi InsertMode ctermfg=13 ctermbg=1 cterm=bold
+hi CommandMode ctermfg=24 ctermbg=1 cterm=bold
+hi VisualMode ctermfg=8 ctermbg=1 cterm=bold
+hi NormalMode ctermfg=5 ctermbg=1 cterm=bold
+hi VertSplit ctermfg=1 ctermbg=1 cterm=none
+
+hi TabLine ctermfg=252 ctermbg=1 cterm=none
+hi TabLineSel ctermfg=252 ctermbg=3 cterm=bold
+hi TabLineFill ctermbg=1 cterm=none
+
+hi clear Todo
hi link Todo hicomment
hi link Number constant
hi link Float constant
@@ -80,15 +80,17 @@ hi link string constant
hi link Folded Normal
hi link StatusLine VertSplit
hi link StatusLineNC VertSplit
+hi link Function comment
+" The colour for comments just makes sense for functions, IMO
" diff/patch files
-hi diffAdded ctermfg=36 guifg=#00af87
-hi diffRemoved ctermfg=10 guifg=#892b2b
-hi link diffFile preproc
-hi link diffNewFile preproc
-hi link diffOldFile preproc
-hi link diffIndexLine preproc
-hi link diffSubname statement
+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
" ksh/bash/posix
hi link shSetList variable
@@ -96,12 +98,10 @@ hi link shShellVariables variable
hi link shQuote string
" markdown
-hi link markdownHeadingDelimiter preproc
+hi link markdownHeadingDelimiter preproc
" 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
+hi Pmenu ctermfg=none ctermbg=0
+hi PmenuSel ctermfg=0 ctermbg=7 cterm=bold
let g:colors_name = "hhvn"
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
@@ -30,7 +30,6 @@ set path+=**
set encoding=utf-8
set title
syntax on
-set termguicolors
colo hhvn
set background=dark
set relativenumber
@@ -106,7 +105,6 @@ set clipboard=unnamed
source ~/.config/nvim/modules/statusline.vim
source ~/.config/nvim/modules/splits.vim
source ~/.config/nvim/modules/netrw.vim
-source ~/.config/nvim/modules/term.vim
source ~/.config/nvim/modules/message.vim
source ~/.config/nvim/modules/openc.vim
source ~/.config/nvim/modules/filetype.vim
diff --git a/.config/nvim/modules/statusline.vim b/.config/nvim/modules/statusline.vim
@@ -35,8 +35,6 @@ function! Modecol()
if l:mode == 'INSERT'
let lcol = 'InsertMode'
- elseif l:mode == 'TERMINAL'
- let lcol = 'TerminalMode'
elseif l:mode == 'COMMAND'
let lcol = 'CommandMode'
elseif l:mode == 'VISUAL' || l:mode == 'V-BLOCK' || l:mode == 'V-LINE' || l:mode == 'SELECT'
@@ -54,7 +52,6 @@ function! Gitbranch()
endfunction
function! Activestatus()
- set termguicolors
""File
let g:s.="%#Filecol#"
let g:s.=" %f\ -\ %y%m "
@@ -105,21 +102,6 @@ function! NetrwIstatus()
return g:s
endfunction
-function! TermAstatus()
-
- return g:s
-endfunction
-
-function! TermIstatus()
- ""Reminder
- let g:s.="%#Blankcol#"
- let g:s.="%="
- let g:s.="%#Basecol#"
- let g:s.=" [terminal] "
-
- return g:s
-endfunction
-
augroup Statusline
autocmd!
autocmd FileType netrw let &l:statusline=Choosestatus(1, &filetype)
@@ -138,17 +120,12 @@ function! Choosestatus(active, filetype)
endif
"Overwrite if special
- let s="term"
if a:filetype == 'netrw' && a:active == '1'
let g:s=""
let statusline=NetrwAstatus()
elseif a:filetype == 'netrw'
let g:s=""
let statusline=NetrwIstatus()
- elseif stridx(expand('%:p'), s) == '0' && a:active == '1'
- let statusline=TermAstatus()
- elseif stridx(expand('%:p'), s) == '0'
- let statusline=TermIstatus()
endif
return statusline
diff --git a/.config/nvim/modules/term.vim b/.config/nvim/modules/term.vim
@@ -1,47 +0,0 @@
-function! Termstart()
- let s="term"
- if stridx(expand('%:p'), s) == '0'
- setlocal nonumber norelativenumber
- endif
-endfunction
-
-function! Termend()
- let s="term"
- if stridx(expand('%:p'), s) == '0'
- set termguicolors
- endif
-endfunction
-
-function! Quickterm()
- call Shwin()
- setlocal winhl=Normal:Float
- set notermguicolors
- terminal
-endfunction
-
-function! Shmenu(dir, prompt)
- call Shwin()
- setlocal winhl=Normal:Float
- execute 'silent! terminal find ' . a:dir . ' | shmenu ' . a:prompt . ' > /tmp/shmenu-out'
- startinsert
-endfunction
-
-function! Shwin()
- let width=(&columns-(&columns/3)-10)
- let height=(&lines-(&lines/3)-5)
- let top=(&lines-height)/2
- let left=(&columns-width)/2
- let opts = {'relative': 'editor', 'row': top, 'col': left, 'width': width, 'height': height, 'style': 'minimal'}
- let opts.row += 1
- let opts.height -= 2
- let opts.col += 2
- let opts.width -= 4
- call nvim_open_win(nvim_create_buf(v:false, v:true), v:true, opts)
-endfunction
-
-command! -nargs=0 Qterm call Quickterm()
-
-augroup terminal
- autocmd WinNew,BufNew,BufNewFile,BufEnter,WinEnter * call Termstart()
- autocmd WinLeave,BufLeave,BufWinLeave * call Termend()
-augroup END
diff --git a/.config/nvim/syntax/girl.vim b/.config/nvim/syntax/girl.vim
@@ -0,0 +1,27 @@
+syn match GirlTit "(o)"
+syn match GirlBush ".##*."
+syn match GirlCrotch1 "/[ ]*||[ ]*\\" contains=GirlCock1
+syn match GirlCrotch2 "/[ ]*(_*)[ ]*\\" contains=GirlCock2
+syn match GirlCrotch3 "/[ ]*/\\[ ]*\\" contains=GirlCock3
+syn match GirlCock1 "||" contained
+syn match GirlCock2 "(__)" contained
+syn match GirlCock3 "/\\" contained
+syn match GirlNavalC "n()" contains=GirlNaval,GirlNavalMark
+syn match GirlNaval "()" contained
+syn match GirlNavalMark "n" contained
+syn match GirlAHole "(\~)"
+syn match GirlVag "v..." contains=GirlVagMark
+syn match GirlVagMark "v" contained
+
+hi GirlTit guifg=#aa2244
+hi GirlBush guifg=#000000
+hi GirlCock1 guifg=#553315
+hi link GirlCock2 GirlCock1
+hi GirlCock3 guifg=#a84b8d
+hi GirlNaval guifg=#FFFAAA
+hi GirlAHole guifg=#553315
+hi Normal guifg=#aa9977 guibg=#0c1726
+hi GirlVag guifg=#aa2244
+
+hi GirlVagMark guifg=#0c1726
+hi link GirlNavalMark GirlVagMark
diff --git a/.config/nvim/syntax/hirc.vim b/.config/nvim/syntax/hirc.vim
@@ -0,0 +1,21 @@
+" hirc config syntax highlighting
+" Colours comments and formats.
+" I haven't done any autocmd stuff,
+" so you'll likely want to tell vim
+" to use this syntax (:help modeline) */
+
+if exists("b:current_syntax")
+ finish
+endif
+
+syn match hircComment "^[^/].*"
+syn region hircFormatA start="^/format" end=/$/ contains=hircStyle,hircVariable,hircNickStyle
+syn region hircFormatB start="^/set format." end=/$/ contains=hircStyle,hircVariable,hircNickStyle
+syn match hircStyle "%{[^}]*}" contained
+syn match hircNickStyle "%{nick:\${[^}]*}}" contained contains=hircVariable
+syn match hircVariable "\${[^}]*}" contained
+
+hi link hircComment comment
+hi link hircStyle preproc
+hi link hircNickStyle hircStyle
+hi link hircVariable variable
