Merge branch 'master' into wsr_shared

This commit is contained in:
Peter J. Holzer 2022-09-10 23:06:38 +02:00
commit 76af3fcca0
6 changed files with 84 additions and 3 deletions

View File

@ -3,7 +3,7 @@
ci = commit
st = status
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short --date-order
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --no-color --date=short --date-order
type = cat-file -t
dump = cat-file -p
[push]

69
.vim/colors/hjp-dark.vim Executable file
View File

@ -0,0 +1,69 @@
" local syntax file - set colors on a per-machine basis:
" vim: tw=0 ts=8 sw=4
" Vim color file
" (adapted from zellner.vim)
" Maintainer: Peter J. Holzer
" Last Change: 2009-08-14
set background=dark
hi clear
if exists("syntax_on")
syntax reset
endif
let g:colors_name = "hjp-dark"
hi Comment term=bold ctermfg=88 ctermbg=White guifg=Red
hi Constant term=underline ctermfg=201 guifg=Magenta
hi Error term=reverse ctermfg=15 ctermbg=9 guifg=White guibg=Red
hi ErrorMsg term=standout cterm=NONE ctermfg=226 ctermbg=DarkRed gui=NONE guifg=Yellow guibg=DarkRed
hi Identifier term=underline cterm=NONE ctermfg=40 ctermbg=NONE guifg=Blue
hi LineNr term=bold cterm=NONE ctermfg=226 ctermbg=17 gui=NONE guifg=DarkGrey guibg=NONE
hi MatchParen ctermbg=yellow
hi Normal guifg=black guibg=white
hi PreProc term=underline ctermfg=Magenta ctermbg=0 guifg=Purple
hi Search term=reverse cterm=NONE ctermfg=White ctermbg=19 gui=NONE guifg=Black guibg=Cyan
hi Special term=bold ctermfg=53 ctermbg=NONE guifg=Magenta
hi Statement term=bold ctermfg=105 gui=NONE guifg=Brown
hi Underlined term=underline cterm=underline ctermfg=163 gui=underline guifg=SlateBlue
" Use color 226 (pale yellow) instead of the default yellow, because I refined
" the default yellow to orange for better contrast against a light background
" (there are way too many command line tools that assume a black background and
" hilight stuff in yellow).
hi StatusLine term=bold,reverse cterm=NONE ctermfg=226 ctermbg=DarkGray gui=NONE guifg=Yellow guibg=DarkGray
hi String term=bold ctermfg=177 ctermbg=NONE guifg=Magenta
hi Tag term=bold ctermfg=DarkGreen guifg=DarkGreen
hi Todo term=standout ctermfg=Black ctermbg=Yellow guifg=Blue guibg=Yellow
hi Type term=underline ctermfg=Blue gui=NONE guifg=Blue
hi Visual term=reverse ctermfg=White ctermbg=DarkBlue gui=NONE guifg=Black guibg=Yellow
hi Title ctermfg=black
hi IncSearch term=reverse cterm=NONE ctermfg=black ctermbg=cyan
hi link Boolean Constant
hi link Character Constant
hi link Conditional Statement
hi link Debug Special
hi link Define PreProc
hi link Delimiter Special
hi link Exception Statement
hi link Float Number
hi link Function Identifier
hi link Include PreProc
hi link Keyword Statement
hi link Label Statement
hi link Macro PreProc
hi link Number Constant
hi link Operator Statement
hi link PreCondit PreProc
hi link Repeat Statement
hi link SpecialChar Special
hi link SpecialComment Special
hi link StorageClass Type
hi link String Constant
hi link Structure Type
hi link Typedef Type
hi! link ErrorMsg Visual
hi! link MoreMsg Comment
hi! link Question Comment
hi! link WarningMsg ErrorMsg

6
.vimrc
View File

@ -3,6 +3,7 @@ set ai
set clipboard=
set comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,n:\|
set exrc
set hls
set list
set listchars=tab:»·,trail
set modeline
@ -45,6 +46,7 @@ autocmd FileType go set noexpandtab
autocmd BufRead,BufNewFile *.ts set filetype=javascript
autocmd FileType javascript set sw=2
autocmd FileType javascript set tw=132
autocmd FileType html set sw=2
@ -52,3 +54,7 @@ autocmd FileType crontab set tw=0
autocmd BufRead,BufNewFile redmine*.txt set filetype=textile
autocmd FileType textile set tw=0 linebreak
autocmd FileType python set tw=79
autocmd FileType css set iskeyword+=-

View File

@ -45,8 +45,8 @@ fi
case "$TERM" in
xterm*|screen)
# indicated exit status by smiley (suggested by Stig Sandbeck Mathisen)
smiley="%b%(0?,%{%}:-),%{%}:-()%{%}%B"
# indicate exit status by smiley (suggested by Stig Sandbeck Mathisen)
smiley="%b%(0?,%{%}:-),%{%}:-()%{%}%B"
prompt="%{]0;%m(%l)%n %~%}%B%m:%~ %T $smiley %h%# %b"
unsetopt PRINT_EXIT_VALUE
# force backspace key to send BS:

View File

@ -29,6 +29,7 @@ export PARBODY=_A_a
export DEBEMAIL=hjp@hjp.at
export DEB_SIGN_KEYID=4ED25B463C8FC154D8189E64F20E485112FE285D
export ACK_COLOR_FILENAME='blue on_white'
export NODE_DISABLE_COLORS=1
# Fix up locale. Must do this early or we get a lot of warnings if a
# locale isn't installed.

5
.zshrc
View File

@ -89,6 +89,11 @@ venv() {
done
}
locale_en () {
export LANGUAGE=en_US:en
export LANG=en_US.UTF-8
}
source ~/.znewterm
# assume pseudo terminals are from a "safe" terminal