diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 272f691..a45dbb1 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,3 +1,19 @@
 set -x PATH $PATH $HOME/.cargo/bin
 
+alias yay paru
+alias j z
+
+abbr --add gst git status
+abbr --add gaa git add --all
+abbr --add gds git diff --staged
+abbr --add gdh git diff HEAD
+abbr --add gl git log --oneline --graph
+
+abbr --add ls exa
+abbr --add la exa -al
+abbr --add l exa -l
+
+abbr --add bat cat
+
+zoxide init fish | source
 starship init fish | source
diff --git a/.config/paru/paru.conf b/.config/paru/paru.conf
new file mode 100644
index 0000000..f1122fb
--- /dev/null
+++ b/.config/paru/paru.conf
@@ -0,0 +1,2 @@
+[options]
+BottomUp
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..921cdce
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,34 @@
+[user]
+  name = Rasmus Rosengren
+  email = rasmus.rosengren@protonmail.com
+  signingkey = A5EE9B6829E20E3E
+
+[commit]
+  gpgsign = true
+
+[pull]
+  rebase = false
+
+[pager]
+  diff = delta
+  log = delta
+  reflog = delta
+  show = delta
+
+[interactive]
+  diffFilter = delta --color-only --features=interactive
+
+[delta]
+  features = decorations
+
+[delta "interactive"]
+  keep-plus-minus-markers = false
+
+[delta "decorations"]
+  commit-decoration-style = blue ol
+  commit-style = raw
+  file-style = omit
+  hunk-header-decoration-style = blue box
+  hunk-header-file-style = red
+  hunk-header-line-number-style = "#067a00"
+  hunk-header-style = file line-number syntax