diff --git a/roles/cli-utils/templates/bash_aliases.j2 b/roles/cli-utils/templates/bash_aliases.j2
index a77737f..c1249ea 100644
--- a/roles/cli-utils/templates/bash_aliases.j2
+++ b/roles/cli-utils/templates/bash_aliases.j2
@@ -21,10 +21,10 @@ alias cd='cd -P'
 alias ip='ip -c'
 
 alias less='less -R'
-
-alias toilet='toilet -f mono12 --rainbow'
+{% if ansible_os_family == "Archlinux" -%}
 
 alias startx='exec startx'
+{% endif %}
 
 alias gst='git status -s'
 
@@ -38,6 +38,9 @@ alias jack="ssh -L 8006:jack.adm.crans.org:8006 jack.adm.crans.org"
 alias daniel="ssh -L 8006:daniel.adm.crans.org:8006 daniel.adm.crans.org"
 
 alias vi=vim
+{% if ansible_os_family == "Debian" -%}
+alias bat=batcat
+{% endif -%}
 alias cat=bat
 
 # Add some emoji aliases
@@ -47,5 +50,7 @@ alias 🚆=sl
 alias 🚂=sl
 alias 🚅=sl
 alias 💿=cd
-
+{% if ansible_os_family == "Archlinux" -%}
+{# Personal computer #}
 alias 🐿️="cd /home/ynerant/PycharmProjects/SquirrelBattle && venv/bin/python main.py"
+{% endif -%}
diff --git a/roles/vim/templates/vimrc.j2 b/roles/vim/templates/vimrc.j2
index 3f68115..f25a158 100644
--- a/roles/vim/templates/vimrc.j2
+++ b/roles/vim/templates/vimrc.j2
@@ -44,5 +44,3 @@ set whichwrap+=<,>,h,l,[,]
 colorscheme elflord
 highlight ExtraWhitespace ctermbg=lightgreen guibg=lightgreen
 match ExtraWhitespace /\s\+$/
-
-set tw=80