commit f4ee11304f4f9c66224b7d6bc88dec571c751a93
parent 73ce69ca75bc0c49480d1d59c32d700c94853339
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Fri, 24 May 2019 11:59:31 +0200
Tweak colorscheme
Diffstat:
6 files changed, 50 insertions(+), 112 deletions(-)
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
@@ -1,3 +1,3 @@
-set runtimepath+=~/.vim,~/.vim/after
-set packpath+=~/.vim
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath = &runtimepath
source ~/.vim/vimrc
diff --git a/.mutt/muttrc b/.mutt/muttrc
@@ -88,7 +88,7 @@ set meta_key=yes
set attribution="* %n <%a> [%{%Y-%m-%d %H:%M:%S %Z}]:\n"
set edit_headers # edit the message headers.
set fast_reply=yes # skip initial prompts when replying
-set editor="vim +'normal G' -c 'set ft=mail noautoindent spell spelllang=en_us,da'"
+set editor="$EDITOR +'normal G' -c 'set ft=mail noautoindent spell spelllang=en_us,da'"
set nomark_old # Don't mark unread new msgs as old.
set mime_forward # Forward message as MIME attachments.
set pager_context=3 # Display 3 lines of context in pager.
diff --git a/.vim/colors/adbasic.vim b/.vim/colors/adbasic.vim
@@ -1,85 +1,51 @@
-" Vim syntax support file
-" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2001 Sep 12
+" Vim color file, derived from Vim peachpuff theme
-" This file sets up the default methods for highlighting.
-" It is loaded from "synload.vim" and from Vim for ":syntax reset".
-" Also used from init_highlight().
-
-if !exists("syntax_cmd") || syntax_cmd == "on"
- " ":syntax on" works like in Vim 5.7: set colors but keep links
- command -nargs=* SynColor hi <args>
- command -nargs=* SynLink hi link <args>
-else
- if syntax_cmd == "enable"
- " ":syntax enable" keeps any existing colors
- command -nargs=* SynColor hi def <args>
- command -nargs=* SynLink hi def link <args>
- elseif syntax_cmd == "reset"
- " ":syntax reset" resets all colors to the default
- command -nargs=* SynColor hi <args>
- command -nargs=* SynLink hi! link <args>
- else
- " User defined syncolor file has already set the colors.
- finish
- endif
+" First remove all existing highlighting.
+set background=light
+hi clear
+if exists("syntax_on")
+ syntax reset
endif
-" Many terminals can only use six different colors (plus black and white).
-" Therefore the number of colors used is kept low. It doesn't look nice with
-" too many colors anyway.
-" Careful with "cterm=bold", it changes the color to bright for some terminals.
-" There are two sets of defaults: for a dark and a light background.
-if &background == "dark"
- SynColor Comment term=bold cterm=NONE ctermfg=15 ctermbg=NONE gui=NONE guifg=#80a0ff guibg=NONE
- SynColor Constant term=underline cterm=NONE ctermfg=Magenta ctermbg=NONE gui=NONE guifg=#ffa0a0 guibg=NONE
- SynColor Special term=bold cterm=NONE ctermfg=LightRed ctermbg=NONE gui=NONE guifg=Orange guibg=NONE
- SynColor Identifier term=underline cterm=bold ctermfg=Cyan ctermbg=NONE gui=NONE guifg=#40ffff guibg=NONE
- SynColor Statement term=bold cterm=NONE ctermfg=Yellow ctermbg=NONE gui=bold guifg=#ffff60 guibg=NONE
- SynColor PreProc term=underline cterm=NONE ctermfg=LightBlue ctermbg=NONE gui=NONE guifg=#ff80ff guibg=NONE
- SynColor Type term=underline cterm=NONE ctermfg=LightGreen ctermbg=NONE gui=bold guifg=#60ff60 guibg=NONE
- SynColor Underlined term=underline cterm=underline ctermfg=LightBlue gui=underline guifg=#80a0ff
- SynColor Ignore term=NONE cterm=NONE ctermfg=black ctermbg=NONE gui=NONE guifg=bg guibg=NONE
-else
- SynColor Comment term=NONE cterm=NONE ctermfg=8 ctermbg=NONE gui=NONE guifg=Blue guibg=NONE
- SynColor Constant term=NONE cterm=NONE ctermfg=6 ctermbg=NONE gui=NONE guifg=Magenta guibg=NONE
- SynColor Special term=bold cterm=NONE ctermfg=DarkMagenta ctermbg=NONE gui=NONE guifg=SlateBlue guibg=NONE
- SynColor Identifier term=underline cterm=NONE ctermfg=5 ctermbg=NONE gui=NONE guifg=DarkCyan guibg=NONE
- SynColor Statement term=bold cterm=NONE ctermfg=12 ctermbg=NONE gui=bold guifg=Brown guibg=NONE
- SynColor PreProc term=underline cterm=NONE ctermfg=DarkMagenta ctermbg=NONE gui=NONE guifg=Purple guibg=NONE
- SynColor Type term=underline cterm=NONE ctermfg=4 ctermbg=NONE gui=bold guifg=SeaGreen guibg=NONE
- SynColor Underlined term=underline cterm=underline ctermfg=DarkMagenta gui=underline guifg=SlateBlue
- SynColor Ignore term=NONE cterm=NONE ctermfg=white ctermbg=NONE gui=NONE guifg=bg guibg=NONE
-endif
-SynColor Error term=reverse cterm=NONE ctermfg=Red ctermbg=NONE gui=NONE guifg=White guibg=Red
-SynColor Todo term=standout cterm=NONE ctermfg=Black ctermbg=Yellow gui=NONE guifg=Blue guibg=Yellow
+let colors_name = "adbasic"
+
+hi Normal guibg=Black guifg=White
-" Common groups that link to default highlighting.
-" You can specify other highlighting easily.
-SynLink String Constant
-SynLink Character Constant
-SynLink Number Constant
-SynLink Boolean Constant
-SynLink Float Number
-SynLink Function Identifier
-SynLink Conditional Statement
-SynLink Repeat Statement
-SynLink Label Statement
-SynLink Operator Statement
-SynLink Keyword Statement
-SynLink Exception Statement
-SynLink Include PreProc
-SynLink Define PreProc
-SynLink Macro PreProc
-SynLink PreCondit PreProc
-SynLink StorageClass Type
-SynLink Structure Type
-SynLink Typedef Type
-SynLink Tag Special
-SynLink SpecialChar Special
-SynLink Delimiter Special
-SynLink SpecialComment Special
-SynLink Debug Special
+hi SpecialKey term=bold ctermfg=4 guifg=Gray45
+hi NonText term=bold cterm=bold ctermfg=8 gui=bold guifg=Blue
+hi Directory term=bold ctermfg=4 guifg=Blue
+hi ErrorMsg term=standout cterm=bold ctermfg=7 ctermbg=1 gui=bold guifg=White guibg=Red
+hi IncSearch term=reverse cterm=reverse gui=reverse
+hi Search term=reverse ctermbg=3 guibg=Gold2
+hi MoreMsg term=bold ctermfg=2 gui=bold guifg=SeaGreen
+hi ModeMsg term=bold cterm=bold gui=bold
+hi LineNr term=underline ctermfg=3 guifg=Red3
+hi Question term=standout ctermfg=2 gui=bold guifg=SeaGreen
+hi StatusLine term=bold,reverse cterm=bold,reverse gui=bold guifg=White guibg=Black
+hi StatusLineNC term=reverse cterm=reverse gui=bold guifg=PeachPuff guibg=Gray45
+hi VertSplit term=reverse ctermfg=7 gui=bold guifg=White guibg=Gray45
+hi Title term=bold ctermfg=5 gui=bold guifg=DeepPink3
+hi Visual term=reverse cterm=reverse gui=reverse guifg=Grey80 guibg=fg
+hi WarningMsg term=standout ctermfg=1 gui=bold guifg=Red
+hi WildMenu term=standout ctermfg=0 ctermbg=3 guifg=Black guibg=Yellow
+hi Folded term=standout ctermfg=4 ctermbg=7 guifg=Black guibg=#e3c1a5
+hi FoldColumn term=standout ctermfg=4 ctermbg=7 guifg=DarkBlue guibg=Gray80
+hi DiffAdd term=bold ctermbg=4 guibg=White
+hi DiffChange term=bold ctermbg=5 guibg=#edb5cd
+hi DiffDelete term=bold cterm=bold ctermfg=4 ctermbg=6 gui=bold guifg=LightBlue guibg=#f6e8d0
+hi DiffText term=reverse cterm=bold ctermbg=1 gui=bold guibg=#ff8060
+hi Cursor guifg=bg guibg=fg
+hi lCursor guifg=bg guibg=fg
+hi ColorColumn ctermbg=7
-delcommand SynColor
-delcommand SynLink
+" Colors for syntax highlighting
+hi Comment term=bold ctermfg=4 guifg=#406090
+hi Constant term=underline ctermfg=1 guifg=#c00058
+hi Special term=bold ctermfg=5 guifg=SlateBlue
+hi Identifier term=underline ctermfg=6 guifg=DarkCyan
+hi Statement term=bold ctermfg=3 gui=bold guifg=Brown
+hi PreProc term=underline ctermfg=5 guifg=Magenta3
+hi Type term=underline ctermfg=2 gui=bold guifg=SeaGreen
+hi Ignore cterm=bold ctermfg=7 guifg=bg
+hi Error term=reverse cterm=bold ctermfg=7 ctermbg=1 gui=bold guifg=White guibg=Red
+hi Todo term=standout ctermfg=0 ctermbg=3 guifg=Blue guibg=Yellow
diff --git a/.vim/plugin/00-general.vim b/.vim/plugin/00-general.vim
@@ -1,4 +1,4 @@
-set clipboard=unnamed " use system clipboard
+set clipboard=unnamedplus " use system clipboard
set dictionary+=/usr/share/dict/words " word completion using Ctrl-x Ctrl-k
set directory=.,~/tmp,/var/tmp,/tmp " location for swap files
set expandtab " use the appropriate number of spaces for <Tab>
diff --git a/.vim/plugin/appearance.vim b/.vim/plugin/appearance.vim
@@ -1,32 +1,6 @@
" highlight 81st column
set colorcolumn=+1
-function! ColorSchemeTweaks() abort
-
- highlight ColorColumn ctermbg=7
-
- highlight Normal cterm=NONE ctermfg=NONE ctermbg=NONE
- highlight Search cterm=NONE ctermfg=0 ctermbg=2
- highlight MatchParen cterm=NONE ctermfg=255 ctermbg=199
-
- " tab, nbsp, trail
- highlight SpecialKey ctermfg=7 guifg=#555555
-
- " eol, extends, precedes
- highlight NonText ctermfg=7 guifg=#555555
-
- " split divider appearance
- highlight VertSplit ctermfg=7 guifg=#555555 ctermbg=15 term=NONE
-
- " hide end-of-buffer tilde symbols
- highlight EndOfBuffer cterm=NONE ctermfg=0 ctermbg=NONE
-
-endfunction
-
-augroup ColorSchemeCmds
- autocmd ColorScheme * call ColorSchemeTweaks()
-augroup end
-
augroup GVimTweaks
if has("gui_running")
set guioptions-=T " no toolbar
@@ -44,7 +18,6 @@ augroup GVimTweaks
endif
augroup end
-"colorscheme tender
colorscheme adbasic
" Show syntax highlighting groups for word under cursor
diff --git a/.vim/plugin/keybinds.vim b/.vim/plugin/keybinds.vim
@@ -23,7 +23,6 @@ nnoremap <leader>n :set relativenumber!<cr>
" netrw
nnoremap <leader>d :Lex<cr>
-nnoremap <leader>h :Hex<cr>
" https://www.vi-improved.org/recommendations/
"" add files with wildcards
