Merge branch 'master' of gitlab.com:Sheppy_/config

basic_setup/basic_install.sh

@@ -1,5 +1,3 @@
-su
-mv ~/.config/basic_setup/sources.list /etc/apt/sources.list
 apt update
 apt upgrade --asume-yes
 cat ../other/package_list_desktop_essential.txt | while read line

basic_setup/symlinks.sh

@@ -1,6 +1,7 @@
+mkdir -p ~/.ssh/
 ln -s ~/.config/vim/rc ~/.vimrc
 ln -s ~/.config/zshrc ~/.zshrc
-ln -s ~/.config/xconf/Xressources ~/.Xressources
-ln -s ~/.config/xconf/.xsessionsrc ~/.xinitrc
+ln -s ~/.config/xconf/Xresources ~/.Xresources
+ln -s ~/.config/xconf/.xinitrc ~/.xinitrc
 ln -s ~/.config/ssh/config ~/.ssh/config
 mkdir -p ~/.zsh

herbstluftwm/autostart

@@ -65,7 +65,8 @@ hc keybind $Mod-q close
 hc keybind $Mod-Return spawn urxvt 
 hc keybind $Mod-y spawn urxvt #easier to press with one hand
 hc keybind $Mod-Shift-Return spawn ~/.config/herbstluftwm/hl_start_urxvt_cwd.py
-hc keybind $Mod-i spawn urxvt -e nohup zsh -c "chromium &" #need to reliably use the zshconf chromium
+hc keybind $Mod-i spawn "/usr/bin/chromium"
+
 if [[ $HOST =~ atlantis* ]]; then
     hc keybind $Mod-l spawn i3lock -i ~/.config/i3lock/bg.png -t
 else

libcoloredstderr.so.license

@@ -0,0 +1,2 @@
+libcoloredstderr is licensed GPL-v3. The Code can be found here:
+https://ruderich.org/simon/coloredstderr/

other/notify_logout.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-wget "https://atlantishq.de/ciplog/${HOST}&inactive&nothing"
+# wget "https://atlantishq.de/ciplog/${HOST}&inactive&nothing"

xconf/.xinitrc

@@ -1,4 +1,4 @@
-xrdb ~/.Xressources
+xrdb ~/.Xresources
 xset r rate 300 25
 eval `ssh-agent`
 exec herbstluftwm

zshrc

@@ -30,6 +30,23 @@ fi
 ############################################## PROMT ###################################################
 ########################################################################################################
 
+## git ##
+setopt prompt_subst
+autoload -Uz vcs_info
+zstyle ':vcs_info:*' actionformats '%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
+zstyle ':vcs_info:*' formats '%F{5}[%F{2}%b%F{5}]%f '
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+zstyle ':vcs_info:*' enable git cvs svn
+
+# or use pre_cmd, see man zshcontrib
+vcs_info_wrapper() {
+  vcs_info
+  if [ -n "$vcs_info_msg_0_" ]; then
+    echo "%{$fg[grey]%}${vcs_info_msg_0_}%{$reset_color%}$del"
+  fi
+}
+VERSION_CONTROL_PROMT=$'$(vcs_info_wrapper)'
+
 ## colors ##
 SEPERATOR_LINE_COLOR="green"
 USER_COLOR="yellow"
@@ -77,7 +94,7 @@ if [[ $USER == 'sheppy' || $USER == 'ik15ydit' || $USER == 'root' ]]; then
 fi
 
 ## build the complete promt ##
-PS1="${SEPERATOR_LINE}${USER_NAME}${USER_HOST_SEPERATOR}${HOSTNAME}${HOST_PATH_SEPERATOR}${PATH_STR}${PATH_INPUT_SEPERATOR}"
+PS1="${SEPERATOR_LINE}${USER_NAME}${USER_HOST_SEPERATOR}${HOSTNAME}${HOST_PATH_SEPERATOR}${PATH_STR}${VERSION_CONTROL_PROMT}${PATH_INPUT_SEPERATOR}"
 
 ## replace the magic values, i.e. %m with hostname ##
 setopt promptsubst #enable the promt