From 9d718e39cb4e54d4887d0fdbb97dcc0ac8b37cb7 Mon Sep 17 00:00:00 2001 From: Anton Bobov Date: Mon, 7 Jan 2013 21:53:45 +0600 Subject: Remove local configuration from default. + persistent vim local files includes. - remove vim color schema from default - remove zsh local configurations --- files/.gvimrc | 2 +- files/.gvimrc-10093352-SIBSAC | 2 -- files/.gvimrc-dexter-laptop | 2 -- files/.vimrc | 6 +----- files/.vimrc-10093352-SIBSAC | 5 ----- files/.zsh/rc-10093352-sibsac/S10_functions | 13 ------------- files/.zsh/rc-10093352-sibsac/S20_environment | 4 ---- files/.zsh/rc-10093352-sibsac/S55_hash | 5 ----- files/.zsh/zshenv | 4 ---- files/.zsh/zshrc | 7 ------- 10 files changed, 2 insertions(+), 48 deletions(-) delete mode 100755 files/.gvimrc-10093352-SIBSAC delete mode 100644 files/.gvimrc-dexter-laptop delete mode 100644 files/.vimrc-10093352-SIBSAC delete mode 100644 files/.zsh/rc-10093352-sibsac/S10_functions delete mode 100644 files/.zsh/rc-10093352-sibsac/S20_environment delete mode 100644 files/.zsh/rc-10093352-sibsac/S55_hash diff --git a/files/.gvimrc b/files/.gvimrc index f89c4c1..27011d4 100644 --- a/files/.gvimrc +++ b/files/.gvimrc @@ -20,7 +20,7 @@ hi Pmenu guibg=#75507B autocmd InsertEnter * set cursorline autocmd InsertLeave * set nocursorline -let s:local_gvimrc=$HOME . "/.gvimrc-" . hostname() +let s:local_gvimrc=$MYGVIMRC . ".local" if filereadable(s:local_gvimrc) silent! execute ':source ' . s:local_gvimrc endif diff --git a/files/.gvimrc-10093352-SIBSAC b/files/.gvimrc-10093352-SIBSAC deleted file mode 100755 index 6fe1949..0000000 --- a/files/.gvimrc-10093352-SIBSAC +++ /dev/null @@ -1,2 +0,0 @@ -" Испольщзуемый шрифт -set guifont=Consolas:h10:cRUSSIAN diff --git a/files/.gvimrc-dexter-laptop b/files/.gvimrc-dexter-laptop deleted file mode 100644 index 3531a73..0000000 --- a/files/.gvimrc-dexter-laptop +++ /dev/null @@ -1,2 +0,0 @@ -" Испольщзуемый шрифт -set guifont=Terminus\ 10 diff --git a/files/.vimrc b/files/.vimrc index df0fddd..3bf7554 100644 --- a/files/.vimrc +++ b/files/.vimrc @@ -25,10 +25,6 @@ set hidden set showcmd " По умолчанию пользоваться :help справкой set keywordprg= -" Включить подсветку синтаксиса -if &t_Co >= 256 || has('gui_running') - colorscheme eclipse -endif if &t_Co > 2 || has('gui_running') syntax on endif @@ -188,7 +184,7 @@ map gf :e map YY "+yy -let s:local_vimrc=$HOME . "/.vimrc-" . hostname() +let s:local_vimrc=$MYVIMRC . ".local" if filereadable(s:local_vimrc) silent! execute ':source ' . s:local_vimrc endif diff --git a/files/.vimrc-10093352-SIBSAC b/files/.vimrc-10093352-SIBSAC deleted file mode 100644 index 8249fb4..0000000 --- a/files/.vimrc-10093352-SIBSAC +++ /dev/null @@ -1,5 +0,0 @@ -colorscheme eclipse -set backupext=.bak -set backupdir=$TEMP/bak -set directory+=$TEMP -set shellslash diff --git a/files/.zsh/rc-10093352-sibsac/S10_functions b/files/.zsh/rc-10093352-sibsac/S10_functions deleted file mode 100644 index 2d51014..0000000 --- a/files/.zsh/rc-10093352-sibsac/S10_functions +++ /dev/null @@ -1,13 +0,0 @@ -open() { explorer $(cygpath -w "$*") } -wsdl2html() { - while : ; do - local fname="$1" - local out="$fname.html" - xsltproc /cygdrive/d/bobov/scripts/wsdl-viewer.xsl "$fname" > "$out" - echo "WSDL documentation file: $out" - shift - [[ $# -eq 0 ]] && break - done -} - -# vim: et ft=zsh : diff --git a/files/.zsh/rc-10093352-sibsac/S20_environment b/files/.zsh/rc-10093352-sibsac/S20_environment deleted file mode 100644 index 9f2f868..0000000 --- a/files/.zsh/rc-10093352-sibsac/S20_environment +++ /dev/null @@ -1,4 +0,0 @@ -path=(/bin $path) -cdpath=($cdpath /cygdrive) - -# vim: et ft=zsh : diff --git a/files/.zsh/rc-10093352-sibsac/S55_hash b/files/.zsh/rc-10093352-sibsac/S55_hash deleted file mode 100644 index a822944..0000000 --- a/files/.zsh/rc-10093352-sibsac/S55_hash +++ /dev/null @@ -1,5 +0,0 @@ -# vim: ft=sh : - -if [ -d /cygdrive/d/bobov/Uniar ]; then - hash -d uniar=/cygdrive/d/bobov/Uniar -fi diff --git a/files/.zsh/zshenv b/files/.zsh/zshenv index c204cf9..7fca80e 100644 --- a/files/.zsh/zshenv +++ b/files/.zsh/zshenv @@ -1,5 +1 @@ source "$HOME/.zsh/rc/S20_environment" -local_zshenv=$HOME/.zsh/rc-$(/bin/hostname)/S20_environment -if [ -e "$local_zshenv" ] ; then - source "$local_zshenv" -fi diff --git a/files/.zsh/zshrc b/files/.zsh/zshrc index e914e48..945cabf 100644 --- a/files/.zsh/zshrc +++ b/files/.zsh/zshrc @@ -11,13 +11,6 @@ for zshrc_snippet in "$HOME/.zsh/rc/S"[0-9][0-9]* ; do source "$zshrc_snippet" done -local_dir=$HOME/.zsh/rc-$HOSTNAME -if [ -d "$local_dir" ] ; then - for zshrc_snippet in "$local_dir/S"[0-9][0-9]* ; do - source "$zshrc_snippet" - done -fi - if [ -f "/etc/zsh_command_not_found" ] ; then source /etc/zsh_command_not_found fi -- cgit v1.2.3