Merge branch 'master' into hjp
This commit is contained in:
commit
d8c7ad831d
|
@ -37,7 +37,7 @@ hi Tag term=bold ctermfg=DarkGreen
|
||||||
hi Todo term=standout ctermfg=Black ctermbg=Yellow guifg=Blue guibg=Yellow
|
hi Todo term=standout ctermfg=Black ctermbg=Yellow guifg=Blue guibg=Yellow
|
||||||
hi Type term=underline ctermfg=Blue gui=NONE guifg=Blue
|
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 Visual term=reverse ctermfg=White ctermbg=DarkBlue gui=NONE guifg=Black guibg=Yellow
|
||||||
hi Title ctermfg=black
|
hi Title ctermfg=white
|
||||||
hi IncSearch term=reverse cterm=NONE ctermfg=black ctermbg=cyan
|
hi IncSearch term=reverse cterm=NONE ctermfg=black ctermbg=cyan
|
||||||
|
|
||||||
hi link Boolean Constant
|
hi link Boolean Constant
|
||||||
|
|
1
.vimrc
1
.vimrc
|
@ -1,6 +1,7 @@
|
||||||
set ai
|
set ai
|
||||||
" Disable (ab)use of X11 selection
|
" Disable (ab)use of X11 selection
|
||||||
set clipboard=
|
set clipboard=
|
||||||
|
set colorcolumn=72,80,100,132
|
||||||
set comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,n:\|
|
set comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,n:\|
|
||||||
set expandtab
|
set expandtab
|
||||||
set exrc
|
set exrc
|
||||||
|
|
13
.zshenv
13
.zshenv
|
@ -109,6 +109,19 @@ then
|
||||||
unsetopt NULL_GLOB
|
unsetopt NULL_GLOB
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
for i in ~/bin/match_locale /usr/bin/match_locale
|
||||||
|
do
|
||||||
|
if [ -x "$i" ]
|
||||||
|
then
|
||||||
|
match_locale="$i"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [ -n "$match_locale" ]
|
||||||
|
then
|
||||||
|
LC_TIME=$($match_locale LC_TIME en_IE.UTF-8 en_AU.UTF-8 en_GB.UTF-8 en_DK.UTF-8 C.UTF-8)
|
||||||
|
fi
|
||||||
|
|
||||||
case "$LANG" in
|
case "$LANG" in
|
||||||
*.iso88591)
|
*.iso88591)
|
||||||
export LESSCHARSET=latin1
|
export LESSCHARSET=latin1
|
||||||
|
|
28
.zshrc
28
.zshrc
|
@ -67,14 +67,26 @@ dup(){
|
||||||
cls() { clear; true }
|
cls() { clear; true }
|
||||||
|
|
||||||
man () {
|
man () {
|
||||||
LESS_TERMCAP_mb=$'\e'"[1;31m" \
|
if [[ "$BG" = "dark" ]]
|
||||||
LESS_TERMCAP_md=$'\e'"[1;38;5;88m" \
|
then
|
||||||
LESS_TERMCAP_me=$'\e'"[0m" \
|
LESS_TERMCAP_mb=$'\e'"[1;31m" \
|
||||||
LESS_TERMCAP_se=$'\e'"[0m" \
|
LESS_TERMCAP_md=$'\e'"[1;32m" \
|
||||||
LESS_TERMCAP_so=$'\e'"[1;44;33m" \
|
LESS_TERMCAP_me=$'\e'"[0m" \
|
||||||
LESS_TERMCAP_ue=$'\e'"[0m" \
|
LESS_TERMCAP_se=$'\e'"[0m" \
|
||||||
LESS_TERMCAP_us=$'\e'"[1;38;5;22m" \
|
LESS_TERMCAP_so=$'\e'"[1;44;33m" \
|
||||||
command man "$@"
|
LESS_TERMCAP_ue=$'\e'"[0m" \
|
||||||
|
LESS_TERMCAP_us=$'\e'"[36m" \
|
||||||
|
command man "$@"
|
||||||
|
else
|
||||||
|
LESS_TERMCAP_mb=$'\e'"[1;31m" \
|
||||||
|
LESS_TERMCAP_md=$'\e'"[1;38;5;88m" \
|
||||||
|
LESS_TERMCAP_me=$'\e'"[0m" \
|
||||||
|
LESS_TERMCAP_se=$'\e'"[0m" \
|
||||||
|
LESS_TERMCAP_so=$'\e'"[1;44;33m" \
|
||||||
|
LESS_TERMCAP_ue=$'\e'"[0m" \
|
||||||
|
LESS_TERMCAP_us=$'\e'"[1;38;5;22m" \
|
||||||
|
command man "$@"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
venv() {
|
venv() {
|
||||||
|
|
Loading…
Reference in New Issue