New PS1, gitbranch in vim, working lock

dotfiles/bashrc

@@ -1,21 +1,23 @@
-########################
-### bashrc from Marc ###
-########################
+git_branch() {
+	git branch 2>/dev/null | grep '^*' | colrm 1 2
+}
 
 CHAR="\[\033[1;93m\]$\[\033[m\]"
 NAME="\[\033[1;32m\]\u\[\033[m\]"
 HOST="\[\033[0;37m\]\h\[\033[m\]"
+GIT="\[\033[1;91m\](\$(git_branch))\[\033[m\]"
 DIR="\[\033[1;94m\]\w\[\033[m\]"
-export PS1="${NAME}@${HOST}:${DIR} ${CHAR} "
+export PS1="${NAME}@${HOST}:${DIR} ${GIT} ${CHAR} "
 
-# dotfile management
 alias dotdrop="~/dotfiles/dotdrop.sh --cfg=~/dotfiles/config.yaml"
-
-# shortcuts
 alias ..="cd .."
 alias ll="ls -l"
 alias la="ls -la"
 alias rm="rm -i"
+alias bashrc="vim ~/.bashrc"
+alias sourcebashrc="source ~/.bashrc"
+alias sbash="sourcebashrc"
+alias vimrc="vim ~/.vimrc"
 
 # Source global definitions
 if [ -f /etc/bashrc ]; then

dotfiles/config/i3/config

@@ -180,7 +180,7 @@ bar {
         status_command i3status
 }
 
-bindsym $mod+Shift+b exec "xlock -mode blank -startCmd /opt/genua/bin/isweg -endCmd /opt/genua/bin/isda"
+bindsym $mod+Shift+b exec "xlock -mode blank -startCmd /share/bin/isweg -endCmd /share/bin/isda"
 bindsym $mod+Shift+d exec "xlock -mode matrix"
 
 bindsym Ctrl+Shift+1 exec --no-startup-id setxkbmap us

dotfiles/vimrc

@@ -1,7 +1,3 @@
-" #######################
-" ### vimrc from Marc ###
-" #######################
-
 " Vundle Plugin Manager - START
 " Required
 set nocompatible
@@ -14,6 +10,7 @@ Plugin 'jiangmiao/auto-pairs'
 Plugin 'scrooloose/nerdtree'
 Plugin 'editorconfig/editorconfig-vim'
 Plugin 'maxboisvert/vim-simple-complete'
+Plugin 'itchyny/vim-gitbranch'
 
 " Colorscheme
 Plugin 'joshdick/onedark.vim'
@@ -28,12 +25,17 @@ filetype plugin indent on
 " NerdTree
 let NERDTreeShowHidden=1
 " Lightline Statusbar
+" absolutepath or filename
 set laststatus=2
 let g:lightline = {
 	\ 'colorscheme': 'wombat',
 	\ 'active': {
-	\    'left': [ [ 'mode', 'paste' ], [ 'readonly', 'absolutepath', 'modified' ] ],
-	\}
+	\    'left': [ [ 'mode', 'paste' ],
+    \              [ 'gitbranch', 'readonly', 'filename', 'modified' ] ]
+	\ },
+	\ 'component_function': {
+	\	'gitbranch': 'gitbranch#name'
+	\ },
 	\ }
 " Onedark Colorscheme
 let g:onedark_hide_endofbuffer=1