diff --git a/_machines/notebook01.yml b/_machines/notebook01.yml
index 5b6ed5a..e29b5b1 100644
--- a/_machines/notebook01.yml
+++ b/_machines/notebook01.yml
@@ -4,3 +4,4 @@ mail: hannes.koerber@haktec.de
 git_gpg_sign: true
 gpg_agent: true
 ssh_agent: true
+terminal_binary: urxvt256c
diff --git a/_machines/tb-hak.yml b/_machines/tb-hak.yml
index 4e1e3a0..2a54b34 100644
--- a/_machines/tb-hak.yml
+++ b/_machines/tb-hak.yml
@@ -4,3 +4,4 @@ mail: hannes.koerber@tradebyte.com
 git_gpg_sign: false
 gpg_agent: false
 ssh_agent: false
+terminal_binary: urxvt
diff --git a/i3/config.j2 b/i3/config.j2
index 5a0a571..8707f13 100644
--- a/i3/config.j2
+++ b/i3/config.j2
@@ -17,8 +17,8 @@
     set $mod Mod4
 
     # The default terminal
-    set $terminal "urxvt -title terminal"
-    set $calc "urxvt -title calc -e $SHELL -i -c calc"
+    set $terminal "{{ machine.terminal_binary }} -title terminal"
+    set $calc "{{ machine.terminal_binary }} -title calc -e $SHELL -i -c calc"
 
     set $scriptdir ~/.i3/scripts
 
diff --git a/zsh/zprofile.j2 b/zsh/zprofile.j2
index 5dff422..d7f3ed8 100644
--- a/zsh/zprofile.j2
+++ b/zsh/zprofile.j2
@@ -51,12 +51,6 @@ fi
 # because gpg-agent is somehow broken for ssh, use the usual ssh-agent
 eval $(ssh-agent -s)
 
-{% if distro == 'fedora' %}
-alias urxvt=urxvt256c
-{% endif %}
-
-alias vim="nvim"
-
 # exec startx breaks some logind fuckery, without exec it works
 if [[ -z $DISPLAY ]] ; then
     if (( $XDG_VTNR == 1 )) ; then
diff --git a/zsh/zshrc.d/20_aliases.sh b/zsh/zshrc.d/20_aliases.sh
index cef524f..e705fd8 100644
--- a/zsh/zshrc.d/20_aliases.sh
+++ b/zsh/zshrc.d/20_aliases.sh
@@ -1,3 +1,5 @@
+alias vim="nvim"
+
 ### COMMON OPERATIONS
 alias ll='ls -AlFh'
 alias la='ls -A'