diff --git a/.aliases b/.aliases
index dc10a63..f0f6d79 100644
--- a/.aliases
+++ b/.aliases
@@ -1,6 +1,5 @@
 alias mkdir='mkdir -p'
 
-alias cat='bat'
 alias vim='nvim'
 
 alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
@@ -10,8 +9,6 @@ alias dops='docker ps -a'
 alias doe='docker exec'
 alias dol='docker logs -f'
 
-alias update='sudo apt-get update && sudo apt-get upgrade'
-
 alias sudo='sudo '
 
 open () {
diff --git a/.aliases_arch b/.aliases_arch
new file mode 100644
index 0000000..2a1bd5d
--- /dev/null
+++ b/.aliases_arch
@@ -0,0 +1,3 @@
+
+alias cat='bat'
+alias update='yay -Syu'
\ No newline at end of file
diff --git a/.aliases_ubuntu b/.aliases_ubuntu
new file mode 100644
index 0000000..aa682b9
--- /dev/null
+++ b/.aliases_ubuntu
@@ -0,0 +1,2 @@
+alias cat='batcat'
+alias update='sudo apt-get update && sudo apt-get upgrade'
diff --git a/.ideavimrc b/.ideavimrc
deleted file mode 100644
index 9bf4766..0000000
--- a/.ideavimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-set selectmode=cmd
-set mouse-=a
diff --git a/.zshrc b/.zshrc
index 2cf9aad..c87c7c6 100644
--- a/.zshrc
+++ b/.zshrc
@@ -23,6 +23,14 @@ if [ $TILIX_ID ] || [ $VTE_VERSION ]; then
     source /etc/profile.d/vte.sh
 fi
 
+# Distro specific aliases
+DISTRO=`cat /etc/os-release | grep ^ID= | cut -f2 -d'='`
+if [ "$DISTRO" = 'arch' ]; then
+  source .aliases_arch
+else
+  source .aliases_ubuntu
+fi
+
 # Conda
 __conda_setup="$('/home/matus/bin/anaconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
 if [ $? -eq 0 ]; then