diff --git a/etc/rc.linux-gnu b/etc/rc.linux-gnu index 3bfe468..fb5e097 100644 --- a/etc/rc.linux-gnu +++ b/etc/rc.linux-gnu @@ -4,7 +4,7 @@ # [ Shell ] -+ shell/bash/bash_profile ~ +- shell/bash/bash_profile ~ + shell/bash/bashrc ~ - shell/guile/guile ~ + shell/tcl/tclshrc ~ @@ -39,7 +39,7 @@ + soft/htop ~/.config - soft/mc ~/.config + soft/vim/vim ~ -+ soft/vim/vimrc ~ +- soft/vim/vimrc ~ - soft/vimperator ~ - soft/vimperator/vimperatorrc ~ + soft/git/gitconfig ~ diff --git a/etc/shell/bash/aliases b/etc/shell/bash/aliases index 4ba76b4..ae6d74a 100755 --- a/etc/shell/bash/aliases +++ b/etc/shell/bash/aliases @@ -47,7 +47,7 @@ alias src=vimcat #noindex #- Замена стандартных путей для конфигурационных файлов alias mpd="mpd $SHELLRC/etc/media/mpd/mpd.conf" #noindex alias mpdr="\mpd $SHELLRC/etc/media/mpd/mpd_remote.conf" #noindex -alias vim="vim -i $SHELLRC/var/vim/viminfo -p $*" #noindex +alias vim="vim -N -u $SHELLRC/etc/soft/vim/vimrc -i $SHELLRC/var/vim/viminfo -p $*" #noindex alias mutt="mutt -F $SHELLRC/etc/mail/mutt/muttrc && echo "0" > $MD/new" #noindex alias screen="TERM=rxvt-256color screen" #noindex alias figlet="figlet -f $SHELLRC/etc/soft/figlet/fonts/standard.flf" #noindex @@ -56,6 +56,7 @@ alias zathura="nh zathura" #noindex alias z="nh zathura" #noindex alias sendemail="sendemail -l $LOGDIR/sendemail" #noindex alias g=git #noindex +alias startx="xinit -- /usr/bin/X" #noindex alias fm="PAGER=autoex fm" #noindex diff --git a/etc/shell/bash/bashrc b/etc/shell/bash/bashrc index 477fe7c..1acda92 100755 --- a/etc/shell/bash/bashrc +++ b/etc/shell/bash/bashrc @@ -1,6 +1,6 @@ #!/bin/bash #################################################################### # -# Изменён: Вс 27 июл 2014 10:46:23 +# Изменён: Пн 29 сен 2014 23:43:15 # ################################################################################ @@ -80,6 +80,10 @@ export HTTP_PROXY= export SBCL_HOME=/usr/lib/sbcl +export MPLAYER_HOME=$HOME/.config/mplayer +export GIMP2_DIRECTORY=$HOME/.local/share/gimp-2.8 +export VIMDIR=$SHELLRC/etc/soft/vim/vim + # }}} ########################################################################## # {{{ Опции подсветки ################################################################################ diff --git a/etc/soft/vim/vimrc b/etc/soft/vim/vimrc index 1fde686..f4a3932 100644 --- a/etc/soft/vim/vimrc +++ b/etc/soft/vim/vimrc @@ -8,6 +8,8 @@ " {{{-------------------------- Общие настройки -------------------------------- +" let &runtimepath.=',$SHELLRC/etc/vim/vim' + set nocompatible " Несовместимость настроек с Vi set history=500 " Настройка истории set t_Co=256 " 256-цветный режим