From c5ec72783614a44b35fb411a3eeaf97648f0b7b0 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <anthony@anthonycicchetti.com>
Date: Sat, 19 Jun 2021 15:01:25 -0400
Subject: [PATCH] Fix ubuntu and rust extras

---
 playbooks/launch                    |  4 +---
 playbooks/roles/rust/tasks/main.yml | 14 --------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/playbooks/launch b/playbooks/launch
index 21b1c35..0988002 100755
--- a/playbooks/launch
+++ b/playbooks/launch
@@ -12,9 +12,7 @@ elif [[ $(uname) == "Linux" ]]; then
         sudo zypper install -y ansible
         sudo ln -sf /usr/bin/python3 /usr/bin/python
     elif [[ $(command -v apt) ]]; then
-        sudo apt install -y ansible python3-apt
-        # ubuntu doesn't create a /usr/bin/python, so we have to make one ourselves
-        ln -sf /usr/bin/python3 /usr/bin/python
+        sudo apt install -y ansible python3-apt python-is-python3
     elif [[ $(command -v dnf) ]]; then
         sudo dnf install ansible -y
     elif [[ $(command -v emerge) ]]; then
diff --git a/playbooks/roles/rust/tasks/main.yml b/playbooks/roles/rust/tasks/main.yml
index 82ba168..261cc87 100644
--- a/playbooks/roles/rust/tasks/main.yml
+++ b/playbooks/roles/rust/tasks/main.yml
@@ -84,13 +84,6 @@
   when:
     - rust_extras == true
 
-- name: Install blindfold
-  shell: ~/.cargo/bin/cargo install blindfold
-  args:
-    creates: ~/.cargo/bin/blindfold
-  when:
-    - rust_extras == true
-
 - name: Install kondo
   shell: ~/.cargo/bin/cargo install kondo
   args:
@@ -98,13 +91,6 @@
   when:
     - rust_extras == true
 
-- name: Install silicon
-  shell: ~/.cargo/bin/cargo install silicon
-  args:
-    creates: ~/.cargo/bin/silicon
-  when:
-    - rust_extras == true
-
 - name: Install zoxide
   shell: ~/.cargo/bin/cargo install zoxide
   args: