From 418bb8662f208d32b42bc39663de709ce3af2170 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date: Thu, 29 May 2014 16:02:08 +0300
Subject: [PATCH] bashrc & zshrc: read through.

Changes can be seen in the diff and I the only thing I checked is that
bash and zsh start without errors.
---
 bashrc | 23 +++++------------------
 zshrc  | 24 ++++--------------------
 2 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/bashrc b/bashrc
index 1e1940af..984e9f5e 100644
--- a/bashrc
+++ b/bashrc
@@ -14,7 +14,7 @@ fi" > ~/.bash_profile
 
 if [ -f /usr/bin/xset ];
 then
-    xset b on
+    (xset b on&)
 fi
 
 #####   Defaults etc...             M0TZLS  #####
@@ -33,17 +33,6 @@ HISTCONTROL=ignoredups
 # append to the history file, don't overwrite it
 shopt -s histappend
 
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-export HISTSIZE=
-export HISTFILESIZE=
-
-export HISTTIMEFORMAT='%F %T '
-
-HISTFILE=~/.history
-export APPEND_HISTORY=
-export SHARE_HISTORY=
-
-
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
 shopt -s checkwinsize
@@ -177,8 +166,7 @@ if [ -f ~/.bash_environment ]; then
 fi
 
 # Enable core files.
-ulimit -c unlimited
-
+(ulimit -c unlimited&)
 
 # More colours :D
 if [[ $TERM == 'xterm' ]]; then
@@ -189,7 +177,6 @@ if [[ $TERM == 'screen' ]]; then
 export TERM=screen-256color              
 fi
 
-
 # Things after this are just examples and should be put to some other file, which is sourced above.
 
 # Sets the default editor. I am vim user, so I want it to be vim. If you don't like terminal based text editors, change "" to gedit (Gnome) or Kate (KDE).
@@ -243,7 +230,7 @@ fi
 
 # Copied from http://homepages.see.leeds.ac.uk/~eeaol/notes/2012/03/how_to_only_type_ssh_passphrase_once/
 export SSH_AUTH_SOCK=/tmp/$USER.agent
-ssh-agent -a /tmp/$USER.agent > /dev/null 2>&1
+(ssh-agent -a /tmp/$USER.agent > /dev/null 2>&1&)
 
 # In our series useless/weird environment variables, beep
 export beep=
@@ -308,9 +295,9 @@ alias rscp='rsync -h --progress -avz '
 alias rscpr='rsync -h --progress -azvv '
 
 # TMUX specific
-alias attach="tmux -u attach-session"
-alias detach="tmux -u detach"
 alias tmux="tmux -u"
+alias attach="tmux attach-session"
+alias detach="tmux detach"
 
 # I am always typoing "aptitude" with my phone...
 alias aptitute="aptitude "
diff --git a/zshrc b/zshrc
index 27478717..9fa0fc33 100644
--- a/zshrc
+++ b/zshrc
@@ -12,7 +12,7 @@ UNAME=$(uname)
 
 if [ -f /usr/bin/xset ];
 then
-    xset b on
+    (xset b on&)
 fi
 
 #####   Defaults etc...             M0TZLS  #####
@@ -36,25 +36,9 @@ precmd() { vcs_info }
 PS1="%B%(!.%F{red}.%F{green})%n@%m %~
 %# %(?..%B%?%b )%f%b"
 
-setopt histignorealldups sharehistory 
-
 # Use emacs keybindings even if our EDITOR is set to vi
 bindkey -e
 
-HISTCONTROL=ignoredups
-export HISTSIZE=9999999999
-export HISTFILESIZE=99999999999
-export HISTTIMEFORMAT='%F %T '
-export HISTFILE=~/.zsh_history
-
-HISTSIZE=9999999999
-if (( ! EUID )); then
-  HISTFILE=~/.history_root
-else
-  HISTFILE=~/.history
-fi
-SAVEHIST=9999999999
-
 # Use modern completion system
 autoload -Uz compinit
 compinit
@@ -117,7 +101,7 @@ if [ -f ~/.zshenv ]; then
 fi
 
 # Enable core files.
-ulimit -c unlimited
+(ulimit -c unlimited&)
 
 
 #More colours 
@@ -239,9 +223,9 @@ alias rscp='rsync -h --progress -avz '
 alias rscpr='rsync -h --progress -azvv '
 
 # TMUX specific
-alias attach="tmux -u attach-session"
-alias detach="tmux -u detach"
 alias tmux="tmux -u"
+alias attach="tmux attach-session"
+alias detach="tmux detach"
 
 # I am always typoing "aptitude" with my phone...
 alias aptitute="aptitude "