From 9d175fcc9963619a8ecebf25c326aafa73b4cf88 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Wed, 24 Jan 2024 09:27:39 -0500
Subject: [PATCH] chore: improve arch taskfile and update readme

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .devcontainer/ci/features/install.sh |  2 +-
 .taskfiles/Workstation/Taskfile.yaml | 17 ++++++-----------
 README.md                            | 12 ++++++------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.devcontainer/ci/features/install.sh b/.devcontainer/ci/features/install.sh
index 4cb2c8c9..0b2fca30 100644
--- a/.devcontainer/ci/features/install.sh
+++ b/.devcontainer/ci/features/install.sh
@@ -63,7 +63,7 @@ EOF
 # Custom fish prompt
 tee /home/vscode/.config/fish/conf.d/fish_greeting.fish > /dev/null <<EOF
 function fish_greeting
-    echo (set_color yellow)"Welcome! Press [enter] to clear the direnv error"
+    echo (set_color yellow)"Welcome! Press [enter] if you see a direnv error"
 end
 EOF
 
diff --git a/.taskfiles/Workstation/Taskfile.yaml b/.taskfiles/Workstation/Taskfile.yaml
index 1a0eaa54..93b336d3 100644
--- a/.taskfiles/Workstation/Taskfile.yaml
+++ b/.taskfiles/Workstation/Taskfile.yaml
@@ -35,16 +35,11 @@ tasks:
       - { msg: "Missing Homebrew", sh: "command -v brew" }
       - { msg: "Missing Brewfile", sh: "test -f {{.BREWFILE}}" }
 
-  paru:
-    desc: Install workstation dependencies with Paru
-    cmd: paru -Syu --needed --noconfirm --noprogressbar $(cat {{.ARCHFILE}} | xargs)
+  arch:
+    desc: Install Arch workstation dependencies with Paru Or Yay
+    cmd: "{{.helper}} -Syu --needed --noconfirm --noprogressbar $(cat {{.ARCHFILE}} | xargs)"
+    vars:
+      helper:
+        sh: "command -v yay || command -v paru"
     preconditions:
-      - { msg: "Missing Paru", sh: "command -v paru" }
-      - { msg: "Missing Archfile", sh: "test -f {{.ARCHFILE}}" }
-
-  yay:
-    desc: Install workstation dependencies with Yay
-    cmd: yay -Syu --needed --noconfirm --noprogressbar $(cat {{.ARCHFILE}} | xargs)
-    preconditions:
-      - { msg: "Missing Yay", sh: "command -v yay" }
       - { msg: "Missing Archfile", sh: "test -f {{.ARCHFILE}}" }
diff --git a/README.md b/README.md
index aabb1645..387f8fa6 100644
--- a/README.md
+++ b/README.md
@@ -175,8 +175,8 @@ You have two different options for setting up your local workstation. First one
     ```sh
     # Homebrew
     brew install go-task
-    # or, Arch / yay
-    yay -S go-task && ln -sf /usr/bin/go-task /usr/local/bin/task
+    # or, Arch
+    pacman -S --noconfirm go-task && ln -sf /usr/bin/go-task /usr/local/bin/task
     ```
 
 2. Install the most recent version of [direnv](https://direnv.net/), see the [installation docs](https://direnv.net/docs/installation.html) for other supported platforms.
@@ -184,8 +184,8 @@ You have two different options for setting up your local workstation. First one
     ```sh
     # Homebrew
     brew install direnv
-    # or, Arch / yay
-    yay -S direnv
+    # or, Arch
+    pacman -S --noconfirm direnv
     ```
 
     📍 _After `direnv` is installed be sure to **[hook it into your preferred shell](https://direnv.net/docs/hook.html)** and then run `task workstation:direnv`_
@@ -197,8 +197,8 @@ You have two different options for setting up your local workstation. First one
     ```sh
     # Homebrew
     task workstation:brew
-    # or, Arch / yay
-    go-task workstation:yay
+    # or, Arch with yay/paru
+    go-task workstation:arch
     ```
 
 4. Setup a Python virual environment by running the following task command.