From 14932b6656a61369775152704acfdd4e369c42c0 Mon Sep 17 00:00:00 2001
From: John Doty <john@d0ty.me>
Date: Tue, 14 Jun 2022 05:30:46 -0700
Subject: [PATCH] Render that which belongs to caesar unto caesar

---
 install.sh | 12 ++++++++++++
 setup.py   |  5 -----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index 4088933..49758ad 100755
--- a/install.sh
+++ b/install.sh
@@ -1,4 +1,16 @@
 #!/bin/bash
+#
+# This is my dotfiles setup script. It is invoked by coder.com instances.
+# We have this shared part of the setup, in setup.py, so let's run that first.
 MY_PATH=$(dirname "$0")
 cd $MY_PATH
+
 python3 "./setup.py"
+
+# OK this stuff here is better in bash, and also is specific to setting up
+# coder.com instances, so.
+sudo add-apt-repository ppa:kelleyk/emacs -y
+sudo apt-get update
+sudo apt-get install -y fish emacs27-nox tmux
+
+sudo chsh -s /usr/bin/fish $USER
diff --git a/setup.py b/setup.py
index 2cee2e1..2a0a0e6 100644
--- a/setup.py
+++ b/setup.py
@@ -105,8 +105,3 @@ if os.getenv("LOCALAPPDATA") is not None:
         )
 
 # Check to set the shell to fish, if we need to
-if os.getenv("CODER_WORKSPACE_ID"):
-    subprocess.run(["sudo", "add-apt-repository", "ppa:kelleyk/emacs", "-y"])
-    subprocess.run(["sudo", "apt-get", "update"])
-    subprocess.run(["sudo", "apt-get", "install", "-y", "fish", "emacs27-nox", "tmux"])
-    subprocess.run(["sudo", "chsh", "-s", "/usr/bin/fish", os.getenv("USER")])