From b979bd9a2d268444399af36e12e32264c6e7a45c Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Sun, 30 May 2021 22:04:18 -0400 Subject: [PATCH] vim ansi colortheme --- .Xresources | 39 +++++++++++++++--------------- .config/shell/commonrc | 1 + .vimrc | 54 +++++++++++++++++++++++++++++++++++++++--- 3 files changed, 72 insertions(+), 22 deletions(-) diff --git a/.Xresources b/.Xresources index 47bc1ea..2bfb858 100644 --- a/.Xresources +++ b/.Xresources @@ -28,24 +28,6 @@ #define nordbg #2E3440 /* gruvbox */ -/* #define gruv0 #282828 */ -/* #define gruv8 #928374 */ -/* #define gruv1 #CC241D */ -/* #define gruv9 #FB4934 */ -/* #define gruv2 #98971A */ -/* #define gruv10 #B8BB26 */ -/* #define gruv3 #D79921 */ -/* #define gruv11 #FABD2F */ -/* #define gruv4 #458588 */ -/* #define gruv12 #83A598 */ -/* #define gruv5 #B16286 */ -/* #define gruv13 #D3869B */ -/* #define gruv6 #689D6A */ -/* #define gruv14 #8EC07C */ -/* #define gruv7 #A89984 */ -/* #define gruv15 #EBDBB2 */ -/* #define gruvfg #EBDBB2 */ -/* #define gruvbg #282828 */ #define gruv0 #32302f #define gruv1 #ea6962 @@ -66,6 +48,25 @@ #define gruvfg #d4be98 #define gruvbg #32302f +/* #define gruv0 #32302f */ +/* #define gruv1 #fb4934 */ +/* #define gruv2 #b8bb26 */ +/* #define gruv3 #fabd2f */ +/* #define gruv4 #83a598 */ +/* #define gruv5 #d3869b */ +/* #define gruv6 #8ec07c */ +/* #define gruv7 #d5c4a1 */ +/* #define gruv8 #665c54 */ +/* #define gruv9 #fe8019 */ +/* #define gruv10 #3c3836 */ +/* #define gruv11 #504945 */ +/* #define gruv12 #bdae93 */ +/* #define gruv13 #ebdbb2 */ +/* #define gruv14 #d65d0e */ +/* #define gruv15 #fbf1c7 */ +/* #define gruvfg #d5c4a1 */ +/* #define gruvbg #32302f */ + #define theme0 gruv0 #define theme8 gruv8 #define theme1 gruv1 @@ -84,7 +85,7 @@ #define theme15 gruv15 #define themefg gruvfg #define themebg gruvbg -#define themehl gruv11 +#define themehl gruv3 *.font: Source Code Pro:size=12 diff --git a/.config/shell/commonrc b/.config/shell/commonrc index ef3845f..dbea038 100644 --- a/.config/shell/commonrc +++ b/.config/shell/commonrc @@ -12,6 +12,7 @@ alias nmaplocal='nmap -sn 192.168.1.0/24' alias refreshusb='udevadm control --reload-rules' alias vpnup='nmcli connection up pinovpn' alias drill-srs='drill-srs 2>/dev/null' +alias scrkey='screenkey -t 2.5 --mods-mode emacs -s small -p fixed -g $(slop -n -f '%g')' alias v="$EDITOR" alias z="$READER" diff --git a/.vimrc b/.vimrc index 43c2132..0cb4acd 100644 --- a/.vimrc +++ b/.vimrc @@ -47,13 +47,19 @@ set spellcapcheck= " accept first spell check fix map z 1z= +" folding +set foldmethod=manual +set foldnestmax=10 +set nofoldenable +set foldlevel=2 + + " View whitespace map s :set list! set listchars=tab:▸\ ,space:·,eol:¬ -" colors -hi Conceal ctermbg=Black -hi SpellBad ctermfg=Red ctermbg=Black cterm=underline +" reload vimrc +map r :source ~/.vimrc " statusline function! StatusModeColor() @@ -130,6 +136,7 @@ Plug 'PietroPate/vim-tex-conceal' Plug 'jiangmiao/auto-pairs' Plug 'tpope/vim-commentary' Plug 'rlue/vim-barbaric' +Plug 'jeffkreeftmeijer/vim-dim' " Plug 'ptzz/lf.vim' " Plug 'voldikss/vim-floaterm' @@ -171,3 +178,44 @@ set ttimeoutlen=0 " Run after plugins autocmd FileType * set formatoptions-=o + +" colors +" based off https://github.com/jeffkreeftmeijer/vim-dim/blob/main/colors/default-light.vim +hi SpecialKey ctermfg=4 +hi TermCursor cterm=reverse +hi NonText ctermfg=12 +hi Directory ctermfg=4 +hi ErrorMsg ctermfg=15 ctermbg=1 +hi IncSearch cterm=reverse +hi MoreMsg ctermfg=2 +hi ModeMsg cterm=bold +hi Question ctermfg=2 +hi Title ctermfg=5 +hi WarningMsg ctermfg=1 +hi WildMenu ctermfg=0 ctermbg=11 +hi Conceal ctermfg=0 +hi SpellBad ctermbg=9 ctermbg=0 cterm=underline +hi SpellRare ctermbg=13 +hi SpellLocal ctermbg=14 +hi PmenuSbar ctermbg=8 +hi PmenuThumb ctermbg=0 +hi TabLine cterm=underline ctermfg=0 ctermbg=7 +hi TabLineSel cterm=bold +hi TabLineFill cterm=reverse +hi CursorColumn ctermbg=7 +hi CursorLine cterm=underline +hi MatchParen ctermbg=14 +hi Constant ctermfg=1 +hi Special ctermfg=5 +hi Identifier cterm=NONE ctermfg=6 +hi Statement ctermfg=3 +hi PreProc ctermfg=5 +hi Type ctermfg=2 +hi Underlined cterm=underline ctermfg=5 +hi Ignore ctermfg=15 +hi Error ctermfg=15 ctermbg=9 +hi Todo ctermfg=0 ctermbg=11 +hi Comment ctermfg=7 +hi lineNr ctermfg=DarkGrey +hi Folded ctermfg=0 + -- 2.20.1