From c1fd5c8b499238071b76c57cfce47cd08fc766e8 Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Mon, 5 Jun 2017 19:50:20 +0300
Subject: [PATCH] quit assuming we can haz bash version < 4, declare PATH in
 profile, as it should be done, prepare for separate aliases

---
 bashplugins |  6 +++---
 bashrc      | 28 ++++++++++------------------
 gvimrc      |  2 +-
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/bashplugins b/bashplugins
index b4fc003..0fc2d6e 100644
--- a/bashplugins
+++ b/bashplugins
@@ -1,5 +1,4 @@
-vscripts="${HOME}/vscripts"
-[[ -d ${vscripts} && ${PATH} != *${vscripts}* ]] && export PATH=${PATH}:${vscripts}
+export SSH_AUTH_SOCK="${HOME}/.ssh/ssh_auth_sock"
 
 completion_path='/usr/share/bash-completion/bash_completion'
 [[ -r "${completion_path}" ]] && . "${completion_path}"
@@ -15,8 +14,9 @@ colorize() {
             alias ${cmd}="command grc -es --colour=auto ${cmd}"
         done
 }
-if is_exec grc; then
+if [[ -x $(type -P grc) ]]; then
     colorize
+    unset -f colorize
 fi
 
 # because fuck you thats' why
diff --git a/bashrc b/bashrc
index 6e39263..4985170 100644
--- a/bashrc
+++ b/bashrc
@@ -2,27 +2,19 @@
 [[ $- != *i* ]] && return
 
 # {{{ settings
-local_bin="${HOME}/.local/bin"
-[[ -d "${local_bin}" && "${PATH}" != *${local_bin}* ]] && export PATH="${PATH}:${local_bin}"
-
 HISTSIZE=1000
 HISTFILE="${HOME}/.bash_history.${UID}"
 HISTCONTROL=ignoredups
-shopt -s histappend checkwinsize
-[[ ${BASH_VERSINFO} -ge 4 ]] && shopt -s autocd
+shopt -s histappend checkwinsize autocd
 
-export MYSQL_PS1="mysql [\d]> "
-export SSH_AUTH_SOCK="${HOME}/.ssh/ssh_auth_sock"
-export TIME_STYLE='long-iso'
-
-export LC_CTYPE='ru_RU.utf8'
 export LANG='en_US.utf8'
 export LANGUAGE="$LANG"
-export EDITOR='vim'
+export LC_CTYPE='ru_RU.utf8'
 export PAGER='less -R'
+export EDITOR='vim'
+export MYSQL_PS1="mysql [\d]> "
+export TIME_STYLE='long-iso'
 export LS_COLORS='no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;44:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.sh=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.dot=31:*.dotx=31:*.xls=31:*.xlsx=31:*.ppt=31:*.pptx=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:'
-
-is_exec() { [[ -x $(type -P ${1}) ]]; }
 # }}}
 # {{{ prompt
 color_number=0
@@ -92,18 +84,18 @@ alias gup='command git pull'
 alias gsi='command tig status'
 
 # tmux
-if is_exec tmux; then
-    alias tmux='command tmux -2'
-    alias atmux='command tmux -2 attach'
-fi
+alias tmux='command tmux -2'
+alias atmux='command tmux -2 attach'
 
 # screen
 alias rscreen='command screen -Dr'
 alias scr='command screen sudo -Es'
 # }}}
 # {{{ plugins and traps
+aliases="${HOME}/.aliases"
 plugins="${HOME}/.bashplugins"
-[[ -r "${plugins}" && "$BASH_VERSINFO" -ge 4 ]] && . "${plugins}"
+[[ -r "${aliases}" ]] && . "${aliases}"; unset aliases
+[[ -r "${plugins}" ]] && . "${plugins}"; unset plugins
 
 # we want to see exit code on error (it also has to be the last entry here)
 trap 'printf "${red}>>${reset} ${black}exit${reset} ${red}%s${reset}\n" "$?" >&2' ERR
diff --git a/gvimrc b/gvimrc
index dd5a653..0927521 100644
--- a/gvimrc
+++ b/gvimrc
@@ -1,7 +1,7 @@
 if has('win32')
     set guifont=Fantasque_Sans_Mono:h11
 else
-    set guifont=Fantasque\ Sans\ Mono\ 11
+    set guifont=Input\ 10
 endif
 set guiheadroom=0 guioptions=aei mouse=a
 set noerrorbells visualbell t_vb=