diff --git a/home/.bashrc b/home/.bashrc
index 82c61c9..7f3fe13 100644
--- a/home/.bashrc
+++ b/home/.bashrc
@@ -6,14 +6,3 @@ else
 	PS1='\u@\h:\w\$ '
 fi
 
-export EDITOR="nvim"
-export PATH=$HOME/programs_local/:~/projects/scripts:$PATH
-
-alias r="ranger"
-alias rr="yazi"
-alias oati="~/projects/scripts/oathi.sh"
-alias chch="~/projects/scripts/check_git.sh"
-alias aut="~/projects/scripts/autostart-server.sh"
-alias z="cd"
-alias tt="~/projects/scripts/find_gits.sh"
-
diff --git a/home/.zshrc b/home/.zshrc
index 1bf9727..44dccfa 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -1,7 +1,5 @@
-# Main zsh configuration
-
-# Common modules
 source $HOME/.common_shell
+
 bindkey '^R' history-incremental-search-backward
 bindkey -v
 
@@ -12,24 +10,16 @@ function rgnvim() {
     | awk -F: '{print $1, $2}' \
     | xargs -r sh -c 'nvim +"$1" "$0"'
 }
-
-# Functions
 function battery_status() {
-    # Get the percentage of both batteries using acpi and extract the percentage values
-	#
     perc1=$(acpi | grep -i 'Battery 0' | sed 's/^[^,]*, //' | awk '{print $1}' | tr -d '%,')
     perc2=$(acpi | grep -i 'Battery 1' | sed 's/^[^,]*, //' | awk '{print $1}' | tr -d '%,')
 	echo -e "$(((perc1 + perc2) / 2))"
 }
 function time_status_custom() {
-	# Get the current local time without seconds
 	time=$(timedatectl | grep Local | awk '{print $5}' | awk -F: '{print $1 ":" $2 }')
 	echo -e "$time"
 }
-
 function up() {
-	# TODO: implement this function do autodetect what unison script to run
-	# Depending on the home user
 	user=$(pwd)
 	echo $user
 }
@@ -59,8 +49,6 @@ function r() {
   rm -f -- "$tmp"
 }
 
-
-# Update the terminal colors
 if [ "$TERM" = "linux" ]; then
     echo -en "\e]P0000000" #black
     echo -en "\e]P8393939" #darkgrey
@@ -81,24 +69,6 @@ if [ "$TERM" = "linux" ]; then
     clear #for background artifacting
 fi
 
-# useful fror checking for nix or other
 if [ -f "/etc/NIXOS" ]; then
-	# nachbesserungen
-	alias cd="z"
-	alias ls="eza"
-	alias cat="bat"
-	alias ls='exa'
-	export TERM='kitty'
-    # We're on NixOS
     eval "$(starship init zsh)"
-else
-    # Custom manual prompt
-	alias z="cd"
-	#Default prompt
-	if [ -f "$HOME/programs_local/starship" ]; then
-		export STARSHIP_CONFIG=~/configuration/other/starship.toml
-		eval "$(starship init zsh)"
-	else
-		PS1="%n@%m %1~$ "
-	fi
 fi
diff --git a/home/dot-common_shell b/home/dot-common_shell
index 8a2b92f..6333042 100644
--- a/home/dot-common_shell
+++ b/home/dot-common_shell
@@ -6,11 +6,18 @@ export EDITOR='nvim'
 export HTTP_HOME="duckduckgo.com"
 export RANGER_LOAD_DEFAULT_RC=false
 export PATH=$HOME/programs_local/:$HOME/.cargo/bin:~/projects/scripts:$HOME/.local/bin:/usr/local/bin:$PATH
+export PATH=$HOME/programs_local/:~/projects/scripts:$PATH
 export MANPAGER="nvim +Man!"
 export GOPATH=$HOME/.go
 export PATH=$HOME/.go/bin:$PATH
 export ANDROID_HOME=/home/jonas/Android
 
+export loc="$HOME/files_local/"
+
+alias oati="~/projects/scripts/oathi.sh"
+alias chch="~/projects/scripts/check_git.sh"
+alias aut="~/projects/scripts/autostart-server.sh"
+alias tt="~/projects/scripts/find_gits.sh"
 alias on="nvim ~/projects/planner/quick.md"
 alias ns="nix-shell -p "
 alias um="umount /mnt/webdav"
@@ -23,12 +30,9 @@ alias ne="newsboat"
 alias po="castero"
 alias h="zsh"
 alias tw="torify w3m duckduckgo.com"
-
 alias rmbak="mkdir -p ~/.local/share/Trash/files && find . -name '.bak.*' -exec mv '{}' ~/.local/share/Trash/files \;"
 alias f="~/projects/scripts/search.sh"
-
 alias studup="~/projects/scripts/update_stud.sh"
-
 alias ssd="s && shd"
 alias lg="lazygit"
 alias m="make"
@@ -42,24 +46,13 @@ alias flr="NIX_SSHOPTS='-o RequestTTY=force'; nixos-rebuild --use-remote-sudo --
 alias tt="~/projects/scripts/find_gits.sh"
 alias dotu="bash ~/configuration/install_dots.sh"
 alias tkkk="tmux kill-server"
-
 alias feh="feh -d"
-alias os="cd /nix/store && yazi"
-export loc="$HOME/files_local/"
-alias rga="rg --hidden --no-ignore"
-alias g='nvim -c "lua require(\"telescope.builtin\").live_grep()"'
+alias store="cd /nix/store && yazi"
 alias n="nvim"
-alias nr='nvim -c "lua require(\"telescope.builtin\").oldfiles()"'
-alias nn='nvim -c "lua require(\"helpers.functions\") find_eff()"'
-alias k='nvim -c "lua require(\"config.keymaps\") open_cal()"'
-alias rt='rm /tmp/all_git_projects'
-alias nt='nvim -c ":e ~/management/brainstore/todos/todo.txt"'
-
 alias ta="todo.sh add"
 alias t="todo.sh"
 alias tl="todo.sh list"
 alias td="todo.sh do"
-
 alias de="sudo loadkeys de"
 alias us="sudo loadkeys us"
 alias b="btop"
@@ -69,17 +62,13 @@ alias fa="fastfetch"
 alias gui="Hyprland && clear"
 alias ls='ls --color=auto'
 alias tofiu='rm ~/.cache/tofi-drun'
-
 alias ll='exa -la '
 alias shd="shutdown now"
 alias ttt='timer -f 10m'
 alias zshconfig="mate ~/.zshrc"
 alias giter="git add . && git commit -a -m 'auto commit' && git push"
 alias grep='grep --color=always'
-
 alias oiiiii="bash ~/management/office/sync.sh in"
 alias ou="bash ~/management/office/sync.sh out"
-
 alias aiiiii="bash ~/projects/scripts/sync_all.sh in"
 alias au="bash ~/projects/scripts/sync_all.sh out"
-
diff --git a/home/dot-ssh/config b/home/dot-ssh/config
index 2c6c5a9..c733f4a 100644
--- a/home/dot-ssh/config
+++ b/home/dot-ssh/config
@@ -6,7 +6,7 @@ Host github.com
 Host gitlab.gwdg.de
 	HostName gitlab.gwdg.de
 	User git
-	IdentityFile ~/.ssh/id_gitlab_gwdg
+	IdentityFile ~/.ssh/id_university
 
 Host strato
 	HostName hahn1.one
@@ -20,6 +20,7 @@ Host bitzz
 Host physik
 	HostName login.physik.uni-goettingen.de
 	User j.hahn02
+	IdentityFile ~/.ssh/id_university
 
 Host informatik
 	HostName shell.informatik.uni-goettingen.de