diff --git a/configs.yml b/configs.yml
index 5810a4f..c5062f6 100644
--- a/configs.yml
+++ b/configs.yml
@@ -25,15 +25,6 @@ mariadb:
         command: sudo mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql && sudo systemctl start mysqld.service && sudo mysql_secure_installation
         condition: "sudo find /var/lib/mysql -mindepth 1 | read"
 
-rust:
-    - run:
-        command: rustup self uninstall
-        condition: "[ -e ~/.cargo ]"
-    - install:
-        - rustup
-    - run:
-        - rustup default stable
-
 pacman_hooks:
     - run:
         - sudo mkdir -p /etc/pacman.d/hooks
diff --git a/playbook.yml b/playbook.yml
index 375008f..450bc75 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -23,4 +23,5 @@
     - { role: lilypond, tags: lilypond }
     - { role: latex, tags: latex }
     - { role: powershell, tags: powershell }
+    - { role: rust, tags: rust }
     - { role: protonvpn, tags: protonvpn }
diff --git a/roles/rust/tasks/main.yml b/roles/rust/tasks/main.yml
new file mode 100644
index 0000000..a82d019
--- /dev/null
+++ b/roles/rust/tasks/main.yml
@@ -0,0 +1,28 @@
+---
+- name: Check if ~/.cargo exists
+  stat:
+    path: ~/.cargo
+  register: cargo_dir
+
+- name: Uninstall rustup if installed without package manager
+  command: rustup self uninstall
+  when: cargo_dir.stat.exists
+
+- name: Install rust (Archlinux)
+  become: true
+  pacman:
+    name:
+      - rustup
+  when: ansible_distribution == 'Archlinux'
+
+- name: Install rust (Debian)
+  become: true
+  apt:
+    name:
+      - rustup
+  when: ansible_distribution == 'Debian'
+
+- name: Setup rustup stable
+  command: rustup default stable
+  register: result
+  changed_when: "'using existing install' not in result.stderr"