Fix urxvt, vim

_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

_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

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
 

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

zsh/zshrc.d/20_aliases.sh

@@ -1,3 +1,5 @@
+alias vim="nvim"
+
 ### COMMON OPERATIONS
 alias ll='ls -AlFh'
 alias la='ls -A'