From 32d90f1e234d11bd5c31739582f4fc54797b69f2 Mon Sep 17 00:00:00 2001
From: Marco Thomas <mthomas@farellien.genua.de>
Date: Thu, 14 Nov 2019 15:56:25 +0100
Subject: [PATCH] Added aliases in bashrc; Added UTF-8 encoding in vimrc

---
 dotfiles/bashrc | 13 ++++++++++++-
 dotfiles/vimrc  |  2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dotfiles/bashrc b/dotfiles/bashrc
index 20c152c..d827549 100755
--- a/dotfiles/bashrc
+++ b/dotfiles/bashrc
@@ -5,7 +5,18 @@ export PS1="\[\033[0;32m\]\u\[\033[m\]@\h: \[\033[1;34m\]\w\[\033[m\] \n> "
 LS_COLORS=$LS_COLORS:'di=1;32:'
 export LS_COLORS
 
-alias dotdrop='~/dotfiles/dotdrop.sh --cfg=~/dotfiles/config.yaml'
+# dotfile management
+alias dotdrop="~/dotfiles/dotdrop.sh --cfg=~/dotfiles/config.yaml"
+
+# general shorcuts
+alias ..="cd .."
+alias ll="ls -l"
+
+# git shotcuts
+alias ga="git add"
+alias gs="git show"
+alias gl="git log"
+alias gd="git diff"
 
 # Source global definitions
 if [ -f /etc/bashrc ]; then
diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index ec4c27a..f5e94c4 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -25,6 +25,8 @@ set colorcolumn=80
 " mouse behavior
 set mouse=a
 set mouse=c
+" encoding
+set encoding=utf-8
 
 
 " INDENTS