From a911136979e5b78a2dcf280d3fd8440d0c17270d Mon Sep 17 00:00:00 2001
From: Matt C <mdc028@bucknell.edu>
Date: Wed, 20 Oct 2021 11:30:29 -0400
Subject: [PATCH] ok sorry (not) we're using micro now

---
 citrine.internal.sh |  4 ++--
 continue.sh         | 23 +----------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/citrine.internal.sh b/citrine.internal.sh
index 2490793..bf9f963 100755
--- a/citrine.internal.sh
+++ b/citrine.internal.sh
@@ -176,10 +176,10 @@ fi
 
 inf "Setting up base Crystal System"
 
-crystalstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager grub crystal-grub-theme man-db man-pages texinfo nano sudo curl archlinux-keyring neofetch
+crystalstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager grub crystal-grub-theme man-db man-pages texinfo micro sudo curl archlinux-keyring neofetch
 if [[ ! "$?" == "0" ]]; then
     inf "CrystalStrap had some error. Retrying."
-    crystalstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager grub crystal-grub-theme man-db man-pages texinfo nano sudo curl archlinux-keyring neofetch
+    crystalstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager grub crystal-grub-theme man-db man-pages texinfo micro sudo curl archlinux-keyring neofetch
 fi
 
 if [[ "$EFI" == "yes" ]]; then
diff --git a/continue.sh b/continue.sh
index 361337a..fecbf7e 100755
--- a/continue.sh
+++ b/continue.sh
@@ -36,31 +36,10 @@ echo "MORE=$response"
 MORE="$response"
 
 if [[ "$MORE" == "y" || "$MORE" == "Y" ]]; then
-    prompt "Preferred editor"
-    PGRM="$response"
-    echo "PGRM=$response"
-
-    if [[ "$PGRM" == *"vim"* ]]; then
-        inf "The only *vim* package we support is nvim. Sorry!"
-        PGRM="neovim"
-    fi
-
-    inf "Checking if we have ${PGRM} already.."
-    which ${PGRM}
-
-    if [[ "$?" == "1" ]]; then
-        inf "Attempting to install ${PGRM}"
-        pacman -Sy ${PGRM} --noconfirm
-    fi
-
-    if [[ "$PGRM" == "neovim" ]]; then
-        PGRM="nvim"
-    fi
-
     inf "When we open the file, please remove the leading # before any locales you need."
     inf "Then, save and exit.\nPress enter."
     read
-    ${PGRM} /etc/locale.gen
+    micro /etc/locale.gen
 fi
 
 inf "Generating selected locales."