Merge branch 'master' of gitlab.liu.se:hcs-rpi/rpi-idstudio-setup

configs/.vimrc

@@ -2,6 +2,13 @@
 
 set nocompatible
 
+" automatic install of vim-plug. https://github.com/junegunn/vim-plug/wiki/tips#automatic-installation
+let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
+if empty(glob(data_dir . '/autoload/plug.vim'))
+  silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+endif
+
 " vim-plug config, https://github.com/junegunn/vim-plug {{{1
 call plug#begin('~/.vim/plugged')
 Plug 'junegunn/vim-plug'             " for help on vim-plug
@@ -159,15 +166,7 @@ let g:xml_syntax_folding=1  " enable syntax folding for xml files
 
 " STATUS LINE {{{2
 
-" Stuff from https://shapeshed.com/vim-statuslines/
-function! GitBranch()
-  return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'")
-endfunction
-
-function! StatuslineGit()
-  let l:branchname = GitBranch()
-  return strlen(l:branchname) > 0?'  '.l:branchname.' ':''
-endfunction
+" TODO: statusline stuff from https://shapeshed.com/vim-statuslines/
 
 " clear statusline
 set statusline=
@@ -175,7 +174,6 @@ set statusline=
 " set color to PmenuSel
 "set statusline+=%#PmenuSel#
 
-set statusline+=%{StatuslineGit()}   " add git branch
 "set statusline+=%#LineNr#            " set color to LineNr
 set statusline+=\ %f                 " add path to current file
 set statusline+=%m\                  " add modified flag