diff --git a/config/btop/btop.conf b/config/btop/btop.conf
index 82a46b55..ec6d3fff 100644
--- a/config/btop/btop.conf
+++ b/config/btop/btop.conf
@@ -50,14 +50,14 @@ graph_symbol_net = "default"
 graph_symbol_proc = "default"
 
 #* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace.
-shown_boxes = "mem net proc cpu"
+shown_boxes = "net proc cpu mem"
 
 #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
 update_ms = 500
 
 #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
 #* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
-proc_sorting = "cpu direct"
+proc_sorting = "memory"
 
 #* Reverse sorting order, True or False.
 proc_reversed = False
diff --git a/config/git/check_email.sh b/config/git/check_email.sh
new file mode 100755
index 00000000..c1669ca9
--- /dev/null
+++ b/config/git/check_email.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+GLOBAL_EMAIL=$(git config --global user.email)
+REPO_EMAIL=$(git config --local user.email)
+
+# Check if the local email is empty OR equal to the global email
+if [ -z "$REPO_EMAIL" ] || [ "$REPO_EMAIL" = "$GLOBAL_EMAIL" ]; then
+    exit 0  # TRUE: Include the key
+else
+    exit 1  # FALSE: Don't include the key
+fi
diff --git a/config/git/config b/config/git/config
index f6acb8e9..5adcb271 100644
--- a/config/git/config
+++ b/config/git/config
@@ -5,6 +5,18 @@
     defaultBranch = main
 [core]
     editor = nvim
+    compression = 9
+    whitespace = error
+    preloadindex = true
+
+[url "git@github.com:kristoferssolo"]
+    insteadOf = "solo:"
+[url "git@github.com"]
+    insteadOf = "gh:"
+
+[status]
+    branch = true
+    showStash = true
 
 # https://blog.gitbutler.com/how-git-core-devs-configure-git/
 # clearly makes git better
@@ -18,7 +30,9 @@
     algorithm = histogram
     colorMoved = plain
     mnemonicPrefix = true
-    renames = true
+    renames = true ; copies
+    context = 3
+    interHunkContext = 10
 [push]
     default = simple
     autoSetupRemote = true
@@ -34,6 +48,7 @@
     autocorrect = prompt
 [commit]
     verbose = true
+    gpgSign = true
 [rerere]
     enabled = true
     autoupdate = true
@@ -43,6 +58,7 @@
     autoSquash = true
     autoStash = true
     updateRefs = true
+    missingCommitsCheck = warn
 
 # a matter of taste (uncomment if you dare)
 
@@ -54,3 +70,42 @@
         # conflictstyle = zdiff3
 [pull]
         # rebase = true
+[log]
+    abbrevCommit = true
+    graphColors = blue, yellow,cyan,magenta,green,red
+
+
+[pager]
+    diff = diff-so-fancy | less --tabs=4 -RF
+    branch = false
+    tag = false
+
+[interactive]
+    diffFilter = diff-so-fancy --patch
+    singlekey = true
+
+[diff-so-fancy]
+    markEmptyLines = false
+
+[color "diff"]
+    meta = black bold
+    frag = magenta
+    context = white
+    whitespace = yellow reverse
+    old = red
+
+[color "decorate"]
+    HEAD = red
+    branch = blue
+    tag = yellow
+    remoteBranch = magenta
+
+[color "branch"]
+    current = magenta
+    local = default
+    remote = yellow
+    upstream = green
+    plain = blue
+
+[include] # TODO: include only for my repos
+    path = ~/.config/git/key
diff --git a/config/shell/aliasrc b/config/shell/aliasrc
index 17ea8e11..43f514ad 100644
--- a/config/shell/aliasrc
+++ b/config/shell/aliasrc
@@ -31,13 +31,6 @@ alias \
     dv="doasedit" \
     e="$EDITOR" \
     fetch="fastfetch" \
-    g="git" \
-    gP="git push" \
-    ga="git add" \
-    gc="git commit" \
-    gd="git diff" \
-    gp="git pull" \
-    gs="git status" \
     j="joshutoub" \
     lf="lfub" \
     lg="lazygit" \
@@ -54,6 +47,17 @@ alias \
     yarn="yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config" \
     yy="yazi"
 
+alias \
+    gP="git push" \
+    ga="git add" \
+    gap="git add --patch" \
+    gc="git commit" \
+    gd="git diff --output-indicator-new=' ' --output-indicator-old=' '" \
+    gds="git diff --staged" \
+    gl="git log --all --graph --pretty=format:'%C(magenta)%h %C(white) %an  %ar%C(auto)  %D%n%s%n'" \
+    gp="git pull" \
+    gs="git status --short"
+
 # doas not required for some system commands
 for command in mount umount rsv sv pacman updatedb su shutdown poweroff reboot zzz systemctl wg wg-quick; do
     alias "$command=doas $command"