Fix bash config

.bashrc

@@ -1,9 +1,16 @@
-# Path to your oh-my-bash installation.
-export OSH=/home/tobias/.config/bash/oh-my-bash
+source "$HOME/.config/environment"
+
+if [ ! -f "$OSH/oh-my-bash.sh" ]
+then
+    echo "Installing oh-my-bash"
+    sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/oh-my-zsh/master/tools/install.sh)" > /dev/null
+    mv $HOME/.bashrc.pre-oh-my-bash $HOME/.bashrc
+    exit
+fi
 
 # Set name of the theme to load. Optionally, if you set this to "random"
 # it'll load a random theme each time that oh-my-bash is loaded.
-OSH_THEME="font"
+OSH_THEME="brainy"
 
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
@@ -38,7 +45,7 @@ OSH_THEME="font"
 # Uncomment the following line if you want to change the command execution time
 # stamp shown in the history command output.
 # The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
-# HIST_STAMPS="mm/dd/yyyy"
+HIST_STAMPS="yyyy-mm-dd"
 
 # Would you like to use another custom folder than $OSH/custom?
 # OSH_CUSTOM=/path/to/new-custom-folder
@@ -58,7 +65,6 @@ completions=(
 # Example format: aliases=(vagrant composer git-avh)
 # Add wisely, as too many aliases slow down shell startup.
 aliases=(
-  general
 )
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-bash/plugins/*)
@@ -67,35 +73,18 @@ aliases=(
 # Add wisely, as too many plugins slow down shell startup.
 plugins=(
   git
-  bashmarks
 )
 
 source $OSH/oh-my-bash.sh
 
-# User configuration
-# export MANPATH="/usr/local/man:$MANPATH"
+HISTCONTROL=ignoreboth
+export SAVEHIST=1000000
+export HISTSIZE=1000000
+export HISTFILE="$HOME/.cache/bash_history"
+shopt -s histappend
+shopt -s checkwinsize
 
-# You may need to manually set your language environment
-# export LANG=en_US.UTF-8
 
-# Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='mvim'
-# fi
-
-# Compilation flags
-# export ARCHFLAGS="-arch x86_64"
-
-# ssh
-# export SSH_KEY_PATH="~/.ssh/rsa_id"
-
-# Set personal aliases, overriding those provided by oh-my-bash libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-bash
-# users are encouraged to define aliases within the OSH_CUSTOM folder.
-# For a full list of active aliases, run `alias`.
-#
-# Example aliases
-# alias bashconfig="mate ~/.bashrc"
-# alias ohmybash="mate ~/.oh-my-bash"
+source "$HOME/.config/environment"
+[ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc
+[ -x "$(command -v thefuck)" ] && eval $(thefuck --alias)

.config/zsh/.zshrc

@@ -97,7 +97,7 @@ source $ZSH/oh-my-zsh.sh
 
 # User configuration
 
-[ -f "$HOME/.config/environment" ] && source $HOME/.config/environment
+source "$HOME/.config/environment"
 [ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc
 [ -x "$(command -v thefuck)" ] && eval $(thefuck --alias)