enable modeline, disable mouse in vim, also dont switch from koi8-r in shell
This commit is contained in:
parent
104d46826d
commit
b2100914bb
2 changed files with 8 additions and 9 deletions
8
shellrc
8
shellrc
|
@ -36,11 +36,13 @@ vcs_enabled=true
|
||||||
export MYSQL_PS1="mysql [\d]> "
|
export MYSQL_PS1="mysql [\d]> "
|
||||||
export SSH_AUTH_SOCK="${HOME}/.ssh/ssh_auth_sock"
|
export SSH_AUTH_SOCK="${HOME}/.ssh/ssh_auth_sock"
|
||||||
export TIME_STYLE='long-iso'
|
export TIME_STYLE='long-iso'
|
||||||
export LANG='en_US.utf8'
|
if [[ ${LANG} != 'ru_RU.KOI8-R' ]]; then
|
||||||
export LANGUAGE="$LANG"
|
export LANG='en_US.utf8'
|
||||||
if [[ ${OSTYPE} != 'cygwin' ]]; then
|
export LANGUAGE="$LANG"
|
||||||
|
if [[ ${OSTYPE} != 'cygwin' ]]; then
|
||||||
export LC_TIME='en_DK.utf8'
|
export LC_TIME='en_DK.utf8'
|
||||||
export LC_MEASUREMENT='en_DK.utf8'
|
export LC_MEASUREMENT='en_DK.utf8'
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
export EDITOR='vim'
|
export EDITOR='vim'
|
||||||
export PAGER='less -R'
|
export PAGER='less -R'
|
||||||
|
|
5
vimrc
5
vimrc
|
@ -21,7 +21,6 @@ set noerrorbells visualbell t_vb=
|
||||||
set shiftwidth=3
|
set shiftwidth=3
|
||||||
set tabstop=3
|
set tabstop=3
|
||||||
set noexpandtab
|
set noexpandtab
|
||||||
set nomodeline
|
|
||||||
|
|
||||||
" 256 colours at almost all times
|
" 256 colours at almost all times
|
||||||
if $TERM =~ '^[xterm|rxvt-unicode|screen]'
|
if $TERM =~ '^[xterm|rxvt-unicode|screen]'
|
||||||
|
@ -138,10 +137,8 @@ if v:version >= 700
|
||||||
set guicursor+=a:blinkon0 "and none of them should blink
|
set guicursor+=a:blinkon0 "and none of them should blink
|
||||||
map <S-Insert> <MiddleMouse>
|
map <S-Insert> <MiddleMouse>
|
||||||
map! <S-Insert> <MiddleMouse>
|
map! <S-Insert> <MiddleMouse>
|
||||||
elseif empty($TMUX) && $TERM =~ "^screen"
|
|
||||||
set mouse=
|
|
||||||
else
|
else
|
||||||
set mouse=a
|
set mouse=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
let g:solarized_bold=0
|
let g:solarized_bold=0
|
||||||
|
|
Loading…
Reference in a new issue