Merge branch 'master' into wsr_shared
This commit is contained in:
commit
78e3786ed8
|
@ -19,3 +19,5 @@
|
|||
commit = blue white
|
||||
[pull]
|
||||
rebase = false
|
||||
[init]
|
||||
defaultBranch = master
|
||||
|
|
|
@ -22,7 +22,7 @@ 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 Special term=bold ctermfg=Yellow 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
|
||||
|
||||
|
@ -37,7 +37,7 @@ hi Tag term=bold ctermfg=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 Title ctermfg=white
|
||||
hi IncSearch term=reverse cterm=NONE ctermfg=black ctermbg=cyan
|
||||
|
||||
hi link Boolean Constant
|
||||
|
|
1
.vimrc
1
.vimrc
|
@ -31,6 +31,7 @@ if $BG == "light"
|
|||
elseif $BG == "dark"
|
||||
colorscheme default
|
||||
set bg=dark
|
||||
colorscheme hjp-dark
|
||||
syntax on
|
||||
endif
|
||||
|
||||
|
|
13
.zshenv
13
.zshenv
|
@ -109,6 +109,19 @@ then
|
|||
unsetopt NULL_GLOB
|
||||
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
|
||||
*.iso88591)
|
||||
export LESSCHARSET=latin1
|
||||
|
|
12
.zshrc
12
.zshrc
|
@ -67,6 +67,17 @@ dup(){
|
|||
cls() { clear; true }
|
||||
|
||||
man () {
|
||||
if [[ "$BG" = "dark" ]]
|
||||
then
|
||||
LESS_TERMCAP_mb=$'\e'"[1;31m" \
|
||||
LESS_TERMCAP_md=$'\e'"[1;32m" \
|
||||
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'"[36m" \
|
||||
command man "$@"
|
||||
else
|
||||
LESS_TERMCAP_mb=$'\e'"[1;31m" \
|
||||
LESS_TERMCAP_md=$'\e'"[1;38;5;88m" \
|
||||
LESS_TERMCAP_me=$'\e'"[0m" \
|
||||
|
@ -75,6 +86,7 @@ man () {
|
|||
LESS_TERMCAP_ue=$'\e'"[0m" \
|
||||
LESS_TERMCAP_us=$'\e'"[1;38;5;22m" \
|
||||
command man "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
venv() {
|
||||
|
|
|
@ -9,6 +9,7 @@ ALLSRC = \
|
|||
.gitconfig \
|
||||
.psqlrc \
|
||||
.vim/colors/hjp.vim \
|
||||
.vim/colors/hjp-dark.vim \
|
||||
.vimrc \
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue