From ce88492373ad76f3aae9b464dae88a4ad70396cd Mon Sep 17 00:00:00 2001
From: hellerve <veit.heller@student.htw-berlin.de>
Date: Mon, 9 Jan 2017 17:24:26 +0100
Subject: [PATCH] miscellaneous changes of the last few weeks

---
 gitconfig | 1 +
 inputrc   | 3 ++-
 vimrc     | 1 -
 zshrc     | 3 ---
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/gitconfig b/gitconfig
index 4b9924f..78907c3 100644
--- a/gitconfig
+++ b/gitconfig
@@ -18,6 +18,7 @@
     ps = push
     repourl = config --get remote.origin.url
     shallow = clone --depth=1
+    st = status
     staged = diff --cached
     tags = for-each-ref --sort='*authordate' --format='%(tag)' refs/tags
     undo = reset --soft HEAD^
diff --git a/inputrc b/inputrc
index f0685c5..b004a98 100644
--- a/inputrc
+++ b/inputrc
@@ -1,3 +1,4 @@
 set meta-flag on
-set convert-meta off
+set input-meta on
 set output-meta on
+set convert-meta off
diff --git a/vimrc b/vimrc
index 147dfa7..442dec5 100644
--- a/vimrc
+++ b/vimrc
@@ -90,7 +90,6 @@ Bundle 'digitaltoad/vim-jade'
 Bundle 'zepto-lang/zepto-vim'
 Bundle 'hellerve/luna-vim'
 Plugin 'rust-lang/rust.vim'
-Plugin 'elixir-lang/vim-elixir'
 
 " Custom bundles
 if filereadable(expand("~/.vim.local/bundles.vim"))
diff --git a/zshrc b/zshrc
index 23a202d..3ef89f7 100644
--- a/zshrc
+++ b/zshrc
@@ -106,9 +106,6 @@ case $TERM in
 
 function rprompt-git-current-branch {
     local name st color gitdir action
-    if [[ "$PWD" =~ '/\.git(/.*)?$' ]]; then
-        return
-    fi
     name=`git rev-parse --abbrev-ref=loose HEAD 2> /dev/null`
     if [[ -z $name ]]; then
         return