From 73648c254cde69c29485c9e79badd903d39c21f9 Mon Sep 17 00:00:00 2001
From: Gerrit Pannek <nold@gnu.one>
Date: Thu, 14 Feb 2019 19:45:24 +0100
Subject: [PATCH 1/4] Update

---
 bashrc   | 2 +-
 setup.sh | 6 ++++--
 vimrc    | 8 --------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/bashrc b/bashrc
index e6d1e37..9592ac8 100644
--- a/bashrc
+++ b/bashrc
@@ -15,7 +15,7 @@ else
 	USER=$(whoami)
 fi
 
-PS1='\[\033[0;32m\]${USER}@\h\[\033[0m\] [\[\033[0;33m\]\w\[\]\[\033[0;32m\]]'$PROMPT_SUFFIX
+PS1='\[\033[0;32m\]${USER}@\h\[\033[0m\] [\[\033[0;33m\]\w\[\]\[\033[0;32m\]]\n'$PROMPT_SUFFIX
 export PATH=$PATH:~/bin:~/local/bin
 
 function tmux_title {
diff --git a/setup.sh b/setup.sh
index b96cd7b..154f63d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LINK_FILES=(bashrc vimrc tmux.conf gitconfig dircolors)
+LINK_FILES=(vimrc tmux.conf gitconfig dircolors)
 mkdir ~/.home-git-back 2>/dev/null
 for file in ${LINK_FILES[@]}; do
 	if  [ ! -L ~/.${file} ] ; then
@@ -12,7 +12,9 @@ done
 
 [ ! -d ~/.bash-git-prompt ] && git clone https://github.com/nold360/bash-git-prompt.git ~/.bash-git-prompt
 
-mkdir ~/.vim 2>/dev/null
+mkdir -p ~/.vim/bundle 2>/dev/null
 [ ! -d ~/.vim/bundle/Vundle.vim ] && git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
 
 vim -c ":PluginInstall" -c ":q" -c ":q"
+
+grep -q "source $(pwd)/bashrc" ~/.bashrc || echo "source $(pwd)/bashrc" >> ~/.bashrc
diff --git a/vimrc b/vimrc
index 3b7e06c..538c95c 100644
--- a/vimrc
+++ b/vimrc
@@ -1,11 +1,3 @@
-"Installation:
-" $ mkdir -p ~/.vim/bundle
-" $ git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
-" Insert the contant of this file into ~/.vimrc
-" $ vim
-" Type: :PluginInstall <ENTER>
-" Restart vim & be happy :)
-
 set nocompatible              " be iMproved, required
 filetype off                  " required
 set rtp+=~/.vim/bundle/Vundle.vim

From 2a867c339dd7a3d9fd4e889041444a113aea68d4 Mon Sep 17 00:00:00 2001
From: Gerrit Pannek <nold@gnu.one>
Date: Tue, 11 Jun 2019 21:26:36 +0200
Subject: [PATCH 2/4] No Syntastic for cpp/c

---
 vimrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vimrc b/vimrc
index 538c95c..74f2320 100644
--- a/vimrc
+++ b/vimrc
@@ -88,6 +88,7 @@ let g:syntastic_always_populate_loc_list = 1
 let g:syntastic_auto_loc_list = 1
 let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 0
+let g:syntastic_mode_map = { 'passive_filetypes': ['cpp', 'c'] }
 
 " ------------------------------------ NERDTree  -------------------------------------------
 "" NERDTree Setup

From 8cb550595c1a28f2f9e32a9d7f8a411d3957cbc1 Mon Sep 17 00:00:00 2001
From: Gerrit Pannek <nold@gnu.one>
Date: Fri, 2 Aug 2019 07:41:01 +0200
Subject: [PATCH 3/4] bashrc

---
 bashrc | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/bashrc b/bashrc
index 9592ac8..c1a6569 100644
--- a/bashrc
+++ b/bashrc
@@ -21,7 +21,7 @@ export PATH=$PATH:~/bin:~/local/bin
 function tmux_title {
     printf '\033]2;%s\033\\' $@
 }
-tmux_title $(hostname -s)
+#tmux_title $(hostname -s)
 
 # Git prompt
 GIT_PROMPT_ONLY_IN_REPO=1
@@ -57,3 +57,14 @@ alias dcu="docker-compose up -d --remove-orphans"
 alias dcd="docker-compose down"
 alias dcp="docker-compose pull"
 alias dcb="docker build ."
+export VIRTUALENVWRAPPER_PYTHON=/usr/bin/python3
+source ~/.local/bin/virtualenvwrapper.sh
+export WORKON_HOME=/home/nold/.virtualenvs
+export PIP_VIRTUALENV_BASE=/home/nold/.virtualenvs
+
+#echo RAID Status:
+#awk '/algorithm/ {print $5" "$6" "$11" "$12'} /proc/mdstat | sed 's/level/RAID/'
+#echo
+
+export KUBECONFIG=/data/docker/kubeconfig.yaml
+source <(kubectl completion bash)

From c455b8179bda77522b2955ea80240877f06b1698 Mon Sep 17 00:00:00 2001
From: Gerrit Pannek <nold@gnu.one>
Date: Fri, 2 Aug 2019 07:43:13 +0200
Subject: [PATCH 4/4] Vim spaces = 2

---
 vimrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vimrc b/vimrc
index 74f2320..3ee9f25 100644
--- a/vimrc
+++ b/vimrc
@@ -21,7 +21,7 @@ filetype plugin indent on    " required
 syntax enable
 set background=dark
 "" Default Tab Setup
-set tabstop=4
+set tabstop=2
 set softtabstop=0
 set shiftwidth=4
 set expandtab