From f068dee35e331573b57241436adfa7d3c1c7f535 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sat, 1 Feb 2020 17:54:44 +0000
Subject: [PATCH] moar aliases

---
 .config/fish/config.fish |  7 +++++--
 .gitconfig               | 22 ++++++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index c1864a4..262db63 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,11 +1,14 @@
 set -U -x EDITOR vim
-
+set -U -x MPD_HOST 172.19.138.20
 set -U fish_features stderr-nocaret qmark-noglob
 set -e fish_greeting
-
 set PATH /home/kunsi/.gem/ruby/2.6.0/bin/ $PATH
 
 alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
 alias weechat='mosh ex42-1048908 -- tmux attach-session -d -t ex42'
 alias voc-ansible='/home/kunsi/.bin/voc-ansible'
 alias share-via-ssh='/home/kunsi/git/share-via-ssh/share-via-ssh'
+
+alias v='vim -p'
+alias r='vim -R'
+alias master='git checkout master && git pull --all --no-commit'
diff --git a/.gitconfig b/.gitconfig
index a3d00e9..b42a074 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,11 +1,17 @@
-# This is Git's per-user configuration file.
 [user]
-# Please adapt and uncomment the following lines:
-name = Franziska Kunsmann
-email = hi@kunsmann.eu
-signingkey = 5FE37FF3C981A9146C3805324205EF53ECE0D2BC
+  name = Franziska Kunsmann
+  email = hi@kunsmann.eu
+  signingkey = 5FE37FF3C981A9146C3805324205EF53ECE0D2BC
+
 [commit]
-gpgsign = true
+  gpgsign = true
+
 [alias]
-logs = log --show-signature
-yolo = push --force
+  tree = log --all --graph --decorate --oneline
+  logs = log --show-signature
+  yolo = push --force
+
+[pager]
+  branch = false
+  config = false
+  stash = false