From 248d76efb18b301b7983d7dd2ccaf67f56103134 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 08:10:42 -0500
Subject: [PATCH 01/39] fix: Updates to taskfiles and e2e workflow

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml   |  8 ++++----
 .taskfiles/AnsibleTasks.yaml | 38 ++++++++++++++++++++++++------------
 .taskfiles/RepoTasks.yaml    |  2 +-
 .taskfiles/SopsTasks.yaml    |  6 ++++--
 README.md                    | 10 +++++++++-
 5 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 0c41e0388e0..2a72a9f294c 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -46,13 +46,13 @@ jobs:
 
       - name: Initialize Sops Age key
         shell: bash
-        run: task sops:init
+        run: task sops:age-keygen
 
       - name: Install Ansible dependencies
         shell: bash
-        run: task ansible:deps
+        run: task ansible:deps force=false
 
-      - name: Initialize config
+      - name: Generate bootstrap config file
         shell: bash
         run: |
           task init
@@ -65,7 +65,7 @@ jobs:
         shell: bash
         run: task --yes configure
 
-      - name: List Hosts
+      - name: List Hosts with Ansible
         shell: bash
         run: task ansible:list
 
diff --git a/.taskfiles/AnsibleTasks.yaml b/.taskfiles/AnsibleTasks.yaml
index 4b3169a1586..91a2e1f67fc 100644
--- a/.taskfiles/AnsibleTasks.yaml
+++ b/.taskfiles/AnsibleTasks.yaml
@@ -4,6 +4,7 @@ version: "3"
 
 vars:
   PYTHON_BIN: python3
+  ANSIBLE_INVENTORY_FILE: "{{.ANSIBLE_DIR}}/inventory/hosts.yaml"
 
 env:
   PATH: "{{.ROOT_DIR}}/.venv/bin:$PATH"
@@ -18,6 +19,8 @@ tasks:
     desc: Set up Ansible dependencies for the environment
     cmds:
       - task: .venv
+        vars:
+          force: '{{.force | default "true"}}'
 
   run:
     desc: Run an Ansible playbook for configuring a cluster
@@ -27,46 +30,53 @@ tasks:
     prompt: Run Ansible playbook '{{.playbook}}'... continue?
     deps: ["deps"]
     cmd: |
-      .venv/bin/ansible-playbook \
-        --inventory {{.ANSIBLE_DIR}}/inventory/hosts.yaml \
-        {{.ANSIBLE_DIR}}/playbooks/{{.playbook}}.yaml {{.CLI_ARGS}}
+      .venv/bin/ansible-playbook --inventory {{.ANSIBLE_INVENTORY_FILE}} \
+          {{.ANSIBLE_DIR}}/playbooks/{{.playbook}}.yaml {{.CLI_ARGS}}
     preconditions:
       - { msg: "Argument (playbook) is required", sh: "test -n {{.playbook}}" }
       - { msg: "Venv not found",                  sh: "test -d {{.ROOT_DIR}}/.venv" }
-      - { msg: "Inventory not found",             sh: "test -f {{.ANSIBLE_DIR}}/inventory/hosts.yaml" }
+      - { msg: "Inventory not found",             sh: "test -f {{.ANSIBLE_INVENTORY_FILE}}" }
       - { msg: "Playbook not found",              sh: "test -f {{.ANSIBLE_DIR}}/playbooks/{{.playbook}}.yaml" }
 
   poweroff:
     desc: Shutdown all the k8s nodes
     deps: ["deps"]
-    cmd: .venv/bin/ansible kubernetes -i {{.ANSIBLE_DIR}}/inventory/hosts.yaml -a '/usr/bin/systemctl poweroff' --become
+    cmd: |
+      .venv/bin/ansible kubernetes --inventory {{.ANSIBLE_INVENTORY_FILE}} \
+          -a '/usr/bin/systemctl poweroff' --become
     preconditions:
       - { msg: "Venv not found",      sh: "test -d {{.ROOT_DIR}}/.venv" }
-      - { msg: "Inventory not found", sh: "test -f {{.ANSIBLE_DIR}}/inventory/hosts.yaml" }
+      - { msg: "Inventory not found", sh: "test -f {{.ANSIBLE_INVENTORY_FILE}}" }
 
   list:
     desc: List all the hosts
     deps: ["deps"]
-    cmd: .venv/bin/ansible kubernetes -i {{.ANSIBLE_DIR}}/inventory/hosts.yaml --list-hosts
+    cmd: |
+      .venv/bin/ansible kubernetes --inventory {{.ANSIBLE_INVENTORY_FILE}} \
+          --list-hosts
     preconditions:
       - { msg: "Venv not found",      sh: "test -d {{.ROOT_DIR}}/.venv" }
-      - { msg: "Inventory not found", sh: "test -f {{.ANSIBLE_DIR}}/inventory/hosts.yaml" }
+      - { msg: "Inventory not found", sh: "test -f {{.ANSIBLE_INVENTORY_FILE}}" }
 
   ping:
     desc: Ping all the hosts
     deps: ["deps"]
-    cmd: .venv/bin/ansible kubernetes -i {{.ANSIBLE_DIR}}/inventory/hosts.yaml --one-line -m 'ping'
+    cmd: |
+      .venv/bin/ansible kubernetes --inventory {{.ANSIBLE_INVENTORY_FILE}} \
+          --one-line -m 'ping'
     preconditions:
       - { msg: "Venv not found",      sh: "test -d {{.ROOT_DIR}}/.venv" }
-      - { msg: "Inventory not found", sh: "test -f {{.ANSIBLE_DIR}}/inventory/hosts.yaml" }
+      - { msg: "Inventory not found", sh: "test -f {{.ANSIBLE_INVENTORY_FILE}}" }
 
   uptime:
     desc: Uptime of all the hosts
     deps: ["deps"]
-    cmd: .venv/bin/ansible kubernetes -i {{.ANSIBLE_DIR}}/inventory/hosts.yaml --one-line -a 'uptime'
+    cmd: |
+      .venv/bin/ansible kubernetes --inventory {{.ANSIBLE_INVENTORY_FILE}} \
+          --one-line -a 'uptime'
     preconditions:
       - { msg: "Venv not found",      sh: "test -d {{.ROOT_DIR}}/.venv" }
-      - { msg: "Inventory not found", sh: "test -f {{.ANSIBLE_DIR}}/inventory/hosts.yaml" }
+      - { msg: "Inventory not found", sh: "test -f {{.ANSIBLE_INVENTORY_FILE}}" }
 
   .venv:
     internal: true
@@ -74,7 +84,9 @@ tasks:
       - true && {{.PYTHON_BIN}} -m venv {{.ROOT_DIR}}/.venv
       - .venv/bin/python3 -m pip install --upgrade pip setuptools wheel
       - .venv/bin/python3 -m pip install --upgrade --requirement "{{.ROOT_DIR}}/requirements.txt"
-      - .venv/bin/ansible-galaxy install --role-file "{{.ROOT_DIR}}/requirements.yaml" --force
+      - .venv/bin/ansible-galaxy install --role-file "{{.ROOT_DIR}}/requirements.yaml" {{if eq .force "true"}}--force{{end}}
+    vars:
+      force: '{{.force | default "true"}}'
     sources:
       - "{{.ANSIBLE_DIR}}/requirements.txt"
       - "{{.ANSIBLE_DIR}}/requirements.yaml"
diff --git a/.taskfiles/RepoTasks.yaml b/.taskfiles/RepoTasks.yaml
index d832e500d73..4c6792e084e 100644
--- a/.taskfiles/RepoTasks.yaml
+++ b/.taskfiles/RepoTasks.yaml
@@ -12,7 +12,7 @@ tasks:
       - rm -rf {{.ROOT_DIR}}/.github/workflows/e2e.yaml
       # Move bootstrap directory to gitignored directory
       - mkdir -p {{.ROOT_DIR}}/.private
-      - mv {{.ROOT_DIR}}/bootstrap {{.ROOT_DIR}}/.private
+      - mv {{.ROOT_DIR}}/bootstrap {{.ROOT_DIR}}/.private/bootstrap-{{now | date "150405"}}
       # Update renovate.json5
       - sed -i {{if eq OS "darwin"}}''{{end}} 's/(..\.j2)\?(..\.j2)\?//g' {{.ROOT_DIR}}/.github/renovate.json5
       - sed -i {{if eq OS "darwin"}}''{{end}} '/addons/d' {{.ROOT_DIR}}/.github/renovate.json5
diff --git a/.taskfiles/SopsTasks.yaml b/.taskfiles/SopsTasks.yaml
index 53906ee1b4a..791be5c139c 100644
--- a/.taskfiles/SopsTasks.yaml
+++ b/.taskfiles/SopsTasks.yaml
@@ -4,14 +4,15 @@ version: "3"
 
 tasks:
 
-  init:
-    desc: Initialize Sops Age Key
+  age-keygen:
+    desc: Initialize Age Key for Sops
     cmd: age-keygen --output {{.ROOT_DIR}}/age.key
     status:
       - test -f "{{.ROOT_DIR}}/age.key"
 
   encrypt:
     desc: Encrypt a secret
+    aliases: ["e"]
     summary: |
       Args:
         file: Path to file to encrypt (required)
@@ -24,6 +25,7 @@ tasks:
 
   decrypt:
     desc: Decrypt a secret
+    aliases: ["d"]
     summary: |
       Args:
         file: Path to file to decrypt (required)
diff --git a/README.md b/README.md
index 2f73352cf13..7a514e79a6b 100644
--- a/README.md
+++ b/README.md
@@ -191,7 +191,7 @@ Once you have installed Debian on your nodes, there are six stages to getting a
     3a. Create a Age private / public key (this file is gitignored)
 
       ```sh
-      age-keygen -o age.key
+      task sops:age-keygen
       ```
 
     3b. Fill out the appropriate vars in `bootstrap/vars/config.yaml`
@@ -617,6 +617,14 @@ The benefits of a public repository include:
 
 </details>
 
+## Related Projects
+
+If this repo is too hot to handle or too cold to hold check out these following projects.
+
+- [danmanners/aws-argo-cluster-template](https://github.com/danmanners/aws-argo-cluster-template) - _A community opinionated template for deploying Kubernetes clusters on-prem and in AWS using Pulumi, SOPS, Sealed Secrets, GitHub Actions, Renovate, Cilium and more!_
+- [ricsanfre/pi-cluster](https://github.com/ricsanfre/pi-cluster) - _Pi Kubernetes Cluster. Homelab kubernetes cluster automated with Ansible and ArgoCD_
+- [techno-tim/k3s-ansible](https://github.com/techno-tim/k3s-ansible) - _The easiest way to bootstrap a self-hosted High Availability Kubernetes cluster. A fully automated HA k3s etcd install with kube-vip, MetalLB, and more_
+
 ## 🤝 Thanks
 
 Big shout out to all the contributors, sponsors and everyone else who has helped on this project.

From 930359f43d0866adb102e8b668668b2a27de996c Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 08:17:55 -0500
Subject: [PATCH 02/39] fix: silence ansible localhost warnings

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .envrc                       | 2 ++
 .github/workflows/e2e.yaml   | 1 +
 .taskfiles/AnsibleTasks.yaml | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/.envrc b/.envrc
index c84c3f45b99..3393855a3a0 100644
--- a/.envrc
+++ b/.envrc
@@ -7,6 +7,8 @@ export VIRTUAL_ENV="$(expand_path ./.venv)"
 export ANSIBLE_COLLECTIONS_PATH=$(expand_path ./.venv/galaxy)
 export ANSIBLE_ROLES_PATH=$(expand_path ./.venv/galaxy/ansible_roles)
 export ANSIBLE_VARS_ENABLED="host_group_vars,community.sops.sops"
+export ANSIBLE_LOCALHOST_WARNING="False"
+export ANSIBLE_INVENTORY_UNPARSED_WARNING="False"
 export K8S_AUTH_KUBECONFIG="$(expand_path ./kubeconfig)"
 # k0s
 export DISABLE_TELEMETRY="true"
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 2a72a9f294c..173a532ba6c 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -2,6 +2,7 @@
 name: "e2e"
 
 on:
+  workflow_dispatch:
   pull_request:
     branches: ["main"]
 
diff --git a/.taskfiles/AnsibleTasks.yaml b/.taskfiles/AnsibleTasks.yaml
index 91a2e1f67fc..f92eb45d256 100644
--- a/.taskfiles/AnsibleTasks.yaml
+++ b/.taskfiles/AnsibleTasks.yaml
@@ -12,6 +12,8 @@ env:
   ANSIBLE_COLLECTIONS_PATH: "{{.ROOT_DIR}}/.venv/galaxy"
   ANSIBLE_ROLES_PATH: "{{.ROOT_DIR}}/.venv/galaxy/ansible_roles"
   ANSIBLE_VARS_ENABLED: "host_group_vars,community.sops.sops"
+  ANSIBLE_LOCALHOST_WARNING: "False"
+  ANSIBLE_INVENTORY_UNPARSED_WARNING: "False"
 
 tasks:
 

From 6355fe8ebf08a910c196c56760c66d56d2519693 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 08:49:44 -0500
Subject: [PATCH 03/39] fix: move taskfiles to subdir and cache brew deps

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml                    | 17 ++++++++--
 .gitignore                                    |  1 +
 .../Taskfile.yaml}                            |  0
 .taskfiles/BrewTasks.yaml                     | 33 -------------------
 .../{FluxTasks.yaml => Flux/Taskfile.yaml}    |  0
 .../{K0sTasks.yaml => K0s/Taskfile.yaml}      |  0
 .../Taskfile.yaml}                            |  0
 .../{RepoTasks.yaml => Repo/Taskfile.yaml}    |  0
 .../{SopsTasks.yaml => Sops/Taskfile.yaml}    |  0
 .taskfiles/Workstation/ArchPackages           | 17 ++++++++++
 .taskfiles/Workstation/Brewfile               | 17 ++++++++++
 .taskfiles/Workstation/Taskfile.yaml          | 25 ++++++++++++++
 README.md                                     |  2 +-
 Taskfile.yaml                                 | 14 ++++----
 14 files changed, 82 insertions(+), 44 deletions(-)
 rename .taskfiles/{AnsibleTasks.yaml => Ansible/Taskfile.yaml} (100%)
 delete mode 100644 .taskfiles/BrewTasks.yaml
 rename .taskfiles/{FluxTasks.yaml => Flux/Taskfile.yaml} (100%)
 rename .taskfiles/{K0sTasks.yaml => K0s/Taskfile.yaml} (100%)
 rename .taskfiles/{KubernetesTasks.yaml => Kubernetes/Taskfile.yaml} (100%)
 rename .taskfiles/{RepoTasks.yaml => Repo/Taskfile.yaml} (100%)
 rename .taskfiles/{SopsTasks.yaml => Sops/Taskfile.yaml} (100%)
 create mode 100644 .taskfiles/Workstation/ArchPackages
 create mode 100644 .taskfiles/Workstation/Brewfile
 create mode 100644 .taskfiles/Workstation/Taskfile.yaml

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 173a532ba6c..24584c08910 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -30,16 +30,27 @@ jobs:
           key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('requirements.txt', 'requirements.yaml') }}
           path: .venv
 
+      - name: Cache Homebrew Packages
+        uses: actions/cache@v3
+        id: cache-workflow-tools
+        env:
+          cache-name: homebrew-packages
+        with:
+          path: $(brew --prefix)
+          key: homebrew-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.taskfiles/Workstation/Brewfile') }}
+
       - name: Setup Homebrew
         uses: Homebrew/actions/setup-homebrew@master
 
-      - name: Setup Workflow Tools
+      - if: steps.cache-workflow-tools.outputs.cache-hit != 'true'
+        name: Setup Workflow Tools
         shell: bash
         run: brew install go-task
 
-      - name: Install Brew dependencies
+      - if: steps.cache-workflow-tools.outputs.cache-hit != 'true'
+        name: Install Brew dependencies
         shell: bash
-        run: task brew:deps
+        run: task workstation:brew
 
       - name: Initialize Direnv
         shell: bash
diff --git a/.gitignore b/.gitignore
index 0aec0a75ae7..c74d026266b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ kubeconfig
 .venv*
 # Taskfile
 .task
+Brewfile.lock.json
 # intellij
 .idea
 # wiki
diff --git a/.taskfiles/AnsibleTasks.yaml b/.taskfiles/Ansible/Taskfile.yaml
similarity index 100%
rename from .taskfiles/AnsibleTasks.yaml
rename to .taskfiles/Ansible/Taskfile.yaml
diff --git a/.taskfiles/BrewTasks.yaml b/.taskfiles/BrewTasks.yaml
deleted file mode 100644
index 60a26cc5baa..00000000000
--- a/.taskfiles/BrewTasks.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-# yaml-language-server: $schema=https://taskfile.dev/schema.json
-version: "3"
-
-tasks:
-
-  deps:
-    desc: Install workstation dependencies with Brew
-    cmd: brew install {{.DEPS}} {{.CLI_ARGS}}
-    vars:
-      DEPS: >-
-        age
-        cilium-cli
-        cloudflared
-        direnv
-        fluxcd/tap/flux
-        helm
-        jq
-        k0sproject/tap/k0sctl
-        k9s
-        kubeconform
-        kubecolor/tap/kubecolor
-        kubernetes-cli
-        kustomize
-        moreutils
-        sops
-        stern
-        yq
-    preconditions:
-      - sh: command -v brew
-        msg: |
-          Homebrew is not installed. Using MacOS, Linux or WSL?
-          Head over to https://brew.sh to get up and running.
diff --git a/.taskfiles/FluxTasks.yaml b/.taskfiles/Flux/Taskfile.yaml
similarity index 100%
rename from .taskfiles/FluxTasks.yaml
rename to .taskfiles/Flux/Taskfile.yaml
diff --git a/.taskfiles/K0sTasks.yaml b/.taskfiles/K0s/Taskfile.yaml
similarity index 100%
rename from .taskfiles/K0sTasks.yaml
rename to .taskfiles/K0s/Taskfile.yaml
diff --git a/.taskfiles/KubernetesTasks.yaml b/.taskfiles/Kubernetes/Taskfile.yaml
similarity index 100%
rename from .taskfiles/KubernetesTasks.yaml
rename to .taskfiles/Kubernetes/Taskfile.yaml
diff --git a/.taskfiles/RepoTasks.yaml b/.taskfiles/Repo/Taskfile.yaml
similarity index 100%
rename from .taskfiles/RepoTasks.yaml
rename to .taskfiles/Repo/Taskfile.yaml
diff --git a/.taskfiles/SopsTasks.yaml b/.taskfiles/Sops/Taskfile.yaml
similarity index 100%
rename from .taskfiles/SopsTasks.yaml
rename to .taskfiles/Sops/Taskfile.yaml
diff --git a/.taskfiles/Workstation/ArchPackages b/.taskfiles/Workstation/ArchPackages
new file mode 100644
index 00000000000..5498238d39e
--- /dev/null
+++ b/.taskfiles/Workstation/ArchPackages
@@ -0,0 +1,17 @@
+age
+cilium-cli
+cloudflared-bin
+direnv
+flux-bin
+helm
+jq
+k0sctl-bin
+k9s
+kubeconform
+kubecolor
+kubectl-bin
+kustomize
+moreutils
+sops
+stern-bin
+go-yq
diff --git a/.taskfiles/Workstation/Brewfile b/.taskfiles/Workstation/Brewfile
new file mode 100644
index 00000000000..abc600c0674
--- /dev/null
+++ b/.taskfiles/Workstation/Brewfile
@@ -0,0 +1,17 @@
+brew "age"
+brew "cilium-cli"
+brew "cloudflared"
+brew "direnv"
+brew "fluxcd/tap/flux"
+brew "helm"
+brew "jq"
+brew "k0sproject/tap/k0sctl"
+brew "k9s"
+brew "kubeconform"
+brew "kubecolor/tap/kubecolor"
+brew "kubernetes-cli"
+brew "kustomize"
+brew "moreutils"
+brew "sops"
+brew "stern"
+brew "yq"
diff --git a/.taskfiles/Workstation/Taskfile.yaml b/.taskfiles/Workstation/Taskfile.yaml
new file mode 100644
index 00000000000..2d4624d0db2
--- /dev/null
+++ b/.taskfiles/Workstation/Taskfile.yaml
@@ -0,0 +1,25 @@
+---
+# yaml-language-server: $schema=https://taskfile.dev/schema.json
+version: "3"
+
+tasks:
+
+  brew:
+    desc: Install workstation dependencies with Brew
+    cmd: brew bundle --file {{.ROOT_DIR}}/.taskfiles/Workstation/Brewfile
+    preconditions:
+      - sh: command -v brew
+        msg: |
+          Homebrew is not installed. Using MacOS, Linux or WSL?
+          Head over to https://brew.sh to get up and running.
+      - { msg: "Brewfile not found", sh: "test -f {{.ROOT_DIR}}/.taskfiles/Workstation/Brewfile" }
+
+  paru:
+    desc: Install workstation dependencies with Paru
+    cmd: paru -S --needed --noconfirm - < {{.ROOT_DIR}}/.taskfiles/Workstation/ArchPackages
+    preconditions:
+      - sh: command -v paru
+        msg: |
+          Paru is not installed. Using Arch Linux?
+          Head over to https://github.com/Morganamilo/paru to get up and running.
+      - { msg: "ArchPackages not found", sh: "test -f {{.ROOT_DIR}}/.taskfiles/Workstation/ArchPackages" }
diff --git a/README.md b/README.md
index 7a514e79a6b..fd9dfe21966 100644
--- a/README.md
+++ b/README.md
@@ -169,7 +169,7 @@ Once you have installed Debian on your nodes, there are six stages to getting a
    📍 _Not using brew? Make sure to look up how to install the latest version of each of these CLI tools yourself._
 
     ```sh
-    task brew:deps
+    task workstation:brew
     ```
 
 ### 🔧 Stage 3: Do bootstrap configuration
diff --git a/Taskfile.yaml b/Taskfile.yaml
index 2689b402c13..07bbb4a23b0 100644
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -11,15 +11,15 @@ env:
   KUBECONFIG: "{{.ROOT_DIR}}/kubeconfig"
 
 includes:
-  ansible: .taskfiles/AnsibleTasks.yaml
-  brew: .taskfiles/BrewTasks.yaml
+  ansible: .taskfiles/Ansible/Taskfile.yaml
   kubernetes:
     aliases: ["k8s"]
-    taskfile: .taskfiles/KubernetesTasks.yaml
-  flux: .taskfiles/FluxTasks.yaml
-  k0s: .taskfiles/K0sTasks.yaml
-  repo: .taskfiles/RepoTasks.yaml
-  sops: .taskfiles/SopsTasks.yaml
+    taskfile: .taskfiles/Kubernetes/Taskfile.yaml
+  flux: .taskfiles/Flux/Taskfile.yaml
+  k0s: .taskfiles/K0s/Taskfile.yaml
+  repo: .taskfiles/Repo/Taskfile.yaml
+  sops: .taskfiles/Sops/Taskfile.yaml
+  workstation: .taskfiles/Workstation/Taskfile.yaml
 
 tasks:
 

From 7fc454835177ef499a473e639e6454cacfb3d060 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 08:58:25 -0500
Subject: [PATCH 04/39] fix: implement brew package caching in workflow

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml      | 34 +++++++++++++++++----------------
 .taskfiles/Workstation/Brewfile |  3 +++
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 24584c08910..726381e0b92 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -18,6 +18,19 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Setup Homebrew
+        uses: Homebrew/actions/setup-homebrew@master
+
+      - name: Cache homebrew packages
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: actions/cache@v3
+        id: cache-workflow-tools
+        env:
+          cache-name: homebrew-packages
+        with:
+          key: homebrew-${{ runner.os }}-${{ hashFiles('.taskfiles/Workstation/Brewfile') }}
+          path: $(brew --prefix)
+
       - name: Setup Python
         uses: actions/setup-python@v5
         id: setup-python
@@ -25,30 +38,19 @@ jobs:
           python-version: "3.12"
 
       - name: Cache venv
+        if: ${{ github.event_name == 'pull_request' }}
         uses: actions/cache@v3
         with:
           key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('requirements.txt', 'requirements.yaml') }}
           path: .venv
 
-      - name: Cache Homebrew Packages
-        uses: actions/cache@v3
-        id: cache-workflow-tools
-        env:
-          cache-name: homebrew-packages
-        with:
-          path: $(brew --prefix)
-          key: homebrew-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.taskfiles/Workstation/Brewfile') }}
-
-      - name: Setup Homebrew
-        uses: Homebrew/actions/setup-homebrew@master
-
-      - if: steps.cache-workflow-tools.outputs.cache-hit != 'true'
-        name: Setup Workflow Tools
+      - name: Setup Workflow Tools
+        if: ${{ github.event_name == 'pull_request' && steps.cache-workflow-tools.outputs.cache-hit != 'true' }}
         shell: bash
         run: brew install go-task
 
-      - if: steps.cache-workflow-tools.outputs.cache-hit != 'true'
-        name: Install Brew dependencies
+      - name: Install Brew dependencies
+        if: ${{ github.event_name == 'pull_request' && steps.cache-workflow-tools.outputs.cache-hit != 'true' }}
         shell: bash
         run: task workstation:brew
 
diff --git a/.taskfiles/Workstation/Brewfile b/.taskfiles/Workstation/Brewfile
index abc600c0674..090804cb838 100644
--- a/.taskfiles/Workstation/Brewfile
+++ b/.taskfiles/Workstation/Brewfile
@@ -1,3 +1,6 @@
+tap "fluxcd/tap"
+tap "go-task/tap"
+tap "k0sproject/tap"
 brew "age"
 brew "cilium-cli"
 brew "cloudflared"

From cb0409f5d5ce603a9c6688e905eb95161698a228 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 09:03:45 -0500
Subject: [PATCH 05/39] fix: implement brew package caching in workflow

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 726381e0b92..2835d257f86 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -19,16 +19,15 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Homebrew
+        id: setup-homebrew
         uses: Homebrew/actions/setup-homebrew@master
 
       - name: Cache homebrew packages
         if: ${{ github.event_name == 'pull_request' }}
         uses: actions/cache@v3
-        id: cache-workflow-tools
-        env:
-          cache-name: homebrew-packages
+        id: cache-homebrew-packages
         with:
-          key: homebrew-${{ runner.os }}-${{ hashFiles('.taskfiles/Workstation/Brewfile') }}
+          key: homebrew-${{ runner.os }}-${{ steps.setup-homebrew.outputs.gems-hash }}-${{ hashFiles('.taskfiles/Workstation/Brewfile') }}
           path: $(brew --prefix)
 
       - name: Setup Python
@@ -45,12 +44,12 @@ jobs:
           path: .venv
 
       - name: Setup Workflow Tools
-        if: ${{ github.event_name == 'pull_request' && steps.cache-workflow-tools.outputs.cache-hit != 'true' }}
+        if: ${{ github.event_name == 'pull_request' && steps.cache-homebrew-packages.outputs.cache-hit != 'true' }}
         shell: bash
         run: brew install go-task
 
       - name: Install Brew dependencies
-        if: ${{ github.event_name == 'pull_request' && steps.cache-workflow-tools.outputs.cache-hit != 'true' }}
+        if: ${{ github.event_name == 'pull_request' && steps.cache-homebrew-packages.outputs.cache-hit != 'true' }}
         shell: bash
         run: task workstation:brew
 

From 97e9de014b773d36461ad1681906aecd8122501d Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 09:08:44 -0500
Subject: [PATCH 06/39] fix: implement brew package caching in workflow

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml      | 12 ++++++------
 .taskfiles/Workstation/Brewfile |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 2835d257f86..6554d9353e5 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -22,6 +22,12 @@ jobs:
         id: setup-homebrew
         uses: Homebrew/actions/setup-homebrew@master
 
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        id: setup-python
+        with:
+          python-version: "3.12"
+
       - name: Cache homebrew packages
         if: ${{ github.event_name == 'pull_request' }}
         uses: actions/cache@v3
@@ -30,12 +36,6 @@ jobs:
           key: homebrew-${{ runner.os }}-${{ steps.setup-homebrew.outputs.gems-hash }}-${{ hashFiles('.taskfiles/Workstation/Brewfile') }}
           path: $(brew --prefix)
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        id: setup-python
-        with:
-          python-version: "3.12"
-
       - name: Cache venv
         if: ${{ github.event_name == 'pull_request' }}
         uses: actions/cache@v3
diff --git a/.taskfiles/Workstation/Brewfile b/.taskfiles/Workstation/Brewfile
index 090804cb838..1a3cdaf3efc 100644
--- a/.taskfiles/Workstation/Brewfile
+++ b/.taskfiles/Workstation/Brewfile
@@ -1,6 +1,7 @@
 tap "fluxcd/tap"
 tap "go-task/tap"
 tap "k0sproject/tap"
+tap "kubecolor/tap"
 brew "age"
 brew "cilium-cli"
 brew "cloudflared"

From 057865b83626ce5fd5f469a21dd9d611d110d7de Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 09:14:16 -0500
Subject: [PATCH 07/39] fix: implement brew package caching in workflow

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index c74d026266b..c8699cb7001 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ kubeconfig
 .venv*
 # Taskfile
 .task
+# Brew
 Brewfile.lock.json
 # intellij
 .idea

From 0c1ad858d6dceed33ebab2ac8b9bf49f209dab6f Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 09:21:26 -0500
Subject: [PATCH 08/39] fix: implement brew package caching in workflow

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 6554d9353e5..332848f40aa 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -34,7 +34,7 @@ jobs:
         id: cache-homebrew-packages
         with:
           key: homebrew-${{ runner.os }}-${{ steps.setup-homebrew.outputs.gems-hash }}-${{ hashFiles('.taskfiles/Workstation/Brewfile') }}
-          path: $(brew --prefix)
+          path: /home/linuxbrew/.linuxbrew
 
       - name: Cache venv
         if: ${{ github.event_name == 'pull_request' }}

From dca07754423f8771d70bf8b81989973fad151921 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 09:28:28 -0500
Subject: [PATCH 09/39] fix: implement brew package caching in workflow

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .taskfiles/Flux/Taskfile.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.taskfiles/Flux/Taskfile.yaml b/.taskfiles/Flux/Taskfile.yaml
index 94c912dc6c5..72c26e283c5 100644
--- a/.taskfiles/Flux/Taskfile.yaml
+++ b/.taskfiles/Flux/Taskfile.yaml
@@ -57,7 +57,6 @@ tasks:
     cmd: flux reconcile --namespace flux-system kustomization cluster --with-source
 
   github-deploy-key:
-    cmds:
-      - sops --decrypt {{.KUBERNETES_DIR}}/bootstrap/github-deploy-key.sops.yaml | kubectl apply --server-side --filename -
+    cmd: sops --decrypt {{.KUBERNETES_DIR}}/bootstrap/github-deploy-key.sops.yaml | kubectl apply --server-side --filename -
     preconditions:
       - { msg: "Flux is not installed", sh: "kubectl get namespace flux-system &>/dev/null && exit 0 || exit 1" }

From 0f62c6ff7ebe90ec74061f00c359540cd7375daa Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 09:32:58 -0500
Subject: [PATCH 10/39] fix: only kubeconform in e2e workflow

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 4 ++++
 README.md                  | 2 +-
 Taskfile.yaml              | 4 +---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 332848f40aa..a15fd481e08 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -78,6 +78,10 @@ jobs:
         shell: bash
         run: task --yes configure
 
+      - name: Run kubeconform
+        shell: bash
+        run: ./scripts/kubeconform.sh ./kubernetes
+
       - name: List Hosts with Ansible
         shell: bash
         run: task ansible:list
diff --git a/README.md b/README.md
index fd9dfe21966..97f2fa1fa90 100644
--- a/README.md
+++ b/README.md
@@ -164,7 +164,7 @@ Once you have installed Debian on your nodes, there are six stages to getting a
     task ansible:deps
     ```
 
-4. Install the required tools: [age](https://github.com/FiloSottile/age), [flux](https://toolkit.fluxcd.io/), [cloudflared](https://github.com/cloudflare/cloudflared), [kubectl](https://kubernetes.io/docs/tasks/tools/), [sops](https://github.com/getsops/sops), [kubeconform](https://github.com/yannh/kubeconform), [kustomize](https://github.com/kubernetes-sigs/kustomize)
+4. Install the required tools: [age](https://github.com/FiloSottile/age), [flux](https://toolkit.fluxcd.io/), [cloudflared](https://github.com/cloudflare/cloudflared), [kubectl](https://kubernetes.io/docs/tasks/tools/), [sops](https://github.com/getsops/sops)
 
    📍 _Not using brew? Make sure to look up how to install the latest version of each of these CLI tools yourself._
 
diff --git a/Taskfile.yaml b/Taskfile.yaml
index 07bbb4a23b0..6f4c468ec9a 100644
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -47,8 +47,6 @@ tasks:
   configure:
     desc: Configure repository from Ansible vars
     prompt: Any conflicting config in the root kubernetes and ansible directories will be overwritten... continue?
-    cmds:
-      - ./.venv/bin/ansible-playbook {{.BOOTSTRAP_DIR}}/configure.yaml
-      - ./scripts/kubeconform.sh {{.KUBERNETES_DIR}}
+    cmd: ./.venv/bin/ansible-playbook {{.BOOTSTRAP_DIR}}/configure.yaml
     env:
       ANSIBLE_DISPLAY_SKIPPED_HOSTS: "false"

From 061849d70d04f5eae1c147916f71af334632121c Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 10:22:43 -0500
Subject: [PATCH 11/39] chore: update readme

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .taskfiles/Workstation/ArchPackages  |  1 +
 .taskfiles/Workstation/Taskfile.yaml |  2 +-
 README.md                            | 57 ++++++++++++++--------------
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/.taskfiles/Workstation/ArchPackages b/.taskfiles/Workstation/ArchPackages
index 5498238d39e..d2f301efd52 100644
--- a/.taskfiles/Workstation/ArchPackages
+++ b/.taskfiles/Workstation/ArchPackages
@@ -14,4 +14,5 @@ kustomize
 moreutils
 sops
 stern-bin
+go-task-bin
 go-yq
diff --git a/.taskfiles/Workstation/Taskfile.yaml b/.taskfiles/Workstation/Taskfile.yaml
index 2d4624d0db2..0cf40f57779 100644
--- a/.taskfiles/Workstation/Taskfile.yaml
+++ b/.taskfiles/Workstation/Taskfile.yaml
@@ -20,6 +20,6 @@ tasks:
     preconditions:
       - sh: command -v paru
         msg: |
-          Paru is not installed. Using Arch Linux?
+          Paru is not installed. Using ArchLinux?
           Head over to https://github.com/Morganamilo/paru to get up and running.
       - { msg: "ArchPackages not found", sh: "test -f {{.ROOT_DIR}}/.taskfiles/Workstation/ArchPackages" }
diff --git a/README.md b/README.md
index 97f2fa1fa90..20122a55404 100644
--- a/README.md
+++ b/README.md
@@ -144,8 +144,13 @@ Once you have installed Debian on your nodes, there are six stages to getting a
 
 1. Install the most recent version of [task](https://taskfile.dev/), see the [installation docs](https://taskfile.dev/installation/) for other supported platforms.
 
+    📍 _If using **ArchLinux** the `task` command is `go-task` in your shell_
+
     ```sh
+    # Homebrew
     brew install go-task
+    # Arch / Paru
+    paru -S go-task-bin
     ```
 
 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.
@@ -153,23 +158,29 @@ Once you have installed Debian on your nodes, there are six stages to getting a
     📍 _After installing `direnv` be sure to **[hook it into your shell](https://direnv.net/docs/hook.html)** and after that is done run `direnv allow` while in your repos' directory._
 
     ```sh
+    # Homebrew
     brew install direnv
+    # or, Arch / Paru
+    paru -S direnv
     ```
 
-3. Setup a Python virual env and install Ansible by running the following task command.
+3. Install additional tools: [age](https://github.com/FiloSottile/age), [flux](https://toolkit.fluxcd.io/), [cloudflared](https://github.com/cloudflare/cloudflared), [kubectl](https://kubernetes.io/docs/tasks/tools/), [sops](https://github.com/getsops/sops)
 
-    📍 _This commands requires Python 3.10+ to be installed_
+   📍 _Not using Homebrew or ArchLinux? Make sure to look up how to install the latest version of each of these CLI tools and install them._
 
     ```sh
-    task ansible:deps
+    # Homebrew
+    task workstation:brew
+    # or, Arch / Paru
+    go-task workstation:paru
     ```
 
-4. Install the required tools: [age](https://github.com/FiloSottile/age), [flux](https://toolkit.fluxcd.io/), [cloudflared](https://github.com/cloudflare/cloudflared), [kubectl](https://kubernetes.io/docs/tasks/tools/), [sops](https://github.com/getsops/sops)
+4. Setup a Python virual env and install Ansible by running the following task command.
 
-   📍 _Not using brew? Make sure to look up how to install the latest version of each of these CLI tools yourself._
+    📍 _This commands requires Python 3.10+ to be installed._
 
     ```sh
-    task workstation:brew
+    task ansible:deps
     ```
 
 ### 🔧 Stage 3: Do bootstrap configuration
@@ -300,17 +311,12 @@ Once you have installed Debian on your nodes, there are six stages to getting a
 
 3. Install Kubernetes depending on the distribution you chose
 
-    * Install k3s
-
-      ```sh
-      task ansible:run playbook=cluster-installation
-      ```
-
-    * Install k0s
-
-      ```sh
-      task k0s:apply
-      ```
+    ```sh
+    # Install k3s
+    task ansible:run playbook=cluster-installation
+    # or, install k0s
+    task k0s:apply
+    ```
 
 4. Verify the nodes are online
 
@@ -444,17 +450,12 @@ By default Flux will periodically check your git repository for changes. In orde
 
 There might be a situation where you want to destroy your Kubernetes cluster. This will completely clean the OS of all traces of the Kubernetes distribution you chose and then reboot the nodes.
 
-* Nuke k3s
-
-    ```sh
-    task ansible:run playbook=cluster-nuke
-    ```
-
-* Nuke k0s
-
-    ```sh
-    task k0s:reset
-    ```
+```sh
+# Nuke k3s
+task ansible:run playbook=cluster-nuke
+# or, Nuke k0s
+task k0s:reset
+```
 
 ### 🤖 Renovate
 

From d54b1804b14bb6fcdc2bf02abd6f6d5dd33c1eba Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 10:33:45 -0500
Subject: [PATCH 12/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index a15fd481e08..dca62c7004e 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -11,8 +11,20 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  e2e:
-    name: e2e
+  e2e-paru:
+    name: e2e-paru
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Test Arch dependencies
+        uses: docker://greyltc/archlinux-aur:paru
+        with:
+          args: bash -c 'paru -Syyu --noconfirm && paru -S --noconfirm --needed $(cat .taskfiles/Workstation/Packages/ArchPackages.txt)'
+
+  e2e-configure:
+    name: e2e-configure
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

From 1e6e20ebf9d44d292f63810f181621a6aea595bb Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 10:34:50 -0500
Subject: [PATCH 13/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index dca62c7004e..c0716ea2a82 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -21,7 +21,7 @@ jobs:
       - name: Test Arch dependencies
         uses: docker://greyltc/archlinux-aur:paru
         with:
-          args: bash -c 'paru -Syyu --noconfirm && paru -S --noconfirm --needed $(cat .taskfiles/Workstation/Packages/ArchPackages.txt)'
+          args: bash -c 'paru -Syyu --noconfirm'
 
   e2e-configure:
     name: e2e-configure

From 03257acbf3b07ec5130b2de1632057bdcefe3ac8 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 10:51:26 -0500
Subject: [PATCH 14/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index c0716ea2a82..e56e4e21c6b 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -21,7 +21,10 @@ jobs:
       - name: Test Arch dependencies
         uses: docker://greyltc/archlinux-aur:paru
         with:
-          args: bash -c 'paru -Syyu --noconfirm'
+          command: >-
+            sudo -u ab -D~ bash -c '
+            paru -Syu --noconfirm --noprogressbar - < .taskfiles/Workstation/ArchPackages
+            '
 
   e2e-configure:
     name: e2e-configure

From d3458d031eab96c04b22e956b238ee0c7c5efa64 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 10:52:33 -0500
Subject: [PATCH 15/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index e56e4e21c6b..f744bafaa56 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -21,7 +21,7 @@ jobs:
       - name: Test Arch dependencies
         uses: docker://greyltc/archlinux-aur:paru
         with:
-          command: >-
+          args: >-
             sudo -u ab -D~ bash -c '
             paru -Syu --noconfirm --noprogressbar - < .taskfiles/Workstation/ArchPackages
             '

From 40093cccde300257e9c0d90adcdf486fe36c7f9a Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 10:56:25 -0500
Subject: [PATCH 16/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index f744bafaa56..611d3ba7dc6 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -14,17 +14,15 @@ jobs:
   e2e-paru:
     name: e2e-paru
     runs-on: ubuntu-latest
+    container: greyltc/archlinux-aur:paru
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Test Arch dependencies
-        uses: docker://greyltc/archlinux-aur:paru
-        with:
-          args: >-
-            sudo -u ab -D~ bash -c '
-            paru -Syu --noconfirm --noprogressbar - < .taskfiles/Workstation/ArchPackages
-            '
+        shell: bash
+        run: |
+          sudo -u ab -D~ bash -c 'paru -Syu --noconfirm --noprogressbar - < .taskfiles/Workstation/ArchPackages'
 
   e2e-configure:
     name: e2e-configure

From 5695e37c871f2f9ea70c57a68d9cb5a887d152c9 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 10:59:17 -0500
Subject: [PATCH 17/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 611d3ba7dc6..7f23c295ffc 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -14,7 +14,9 @@ jobs:
   e2e-paru:
     name: e2e-paru
     runs-on: ubuntu-latest
-    container: greyltc/archlinux-aur:paru
+    container:
+      image: greyltc/archlinux-aur:paru
+      options: --user root
     steps:
       - name: Checkout
         uses: actions/checkout@v4

From 9777fa3b0f9c8f3bdbc8a00045281512974cefc1 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:01:29 -0500
Subject: [PATCH 18/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 7f23c295ffc..47fa7c67e39 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -18,13 +18,20 @@ jobs:
       image: greyltc/archlinux-aur:paru
       options: --user root
     steps:
+      - name: investigate
+        run: |
+          pwd
+          whoami
+          ls -la
+          id -u
+
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Test Arch dependencies
         shell: bash
         run: |
-          sudo -u ab -D~ bash -c 'paru -Syu --noconfirm --noprogressbar - < .taskfiles/Workstation/ArchPackages'
+          sudo -u ab -D~ bash -c 'paru -Syu --noconfirm --noprogressbar - < ${GITHUB_WORKSPACE}/.taskfiles/Workstation/ArchPackages'
 
   e2e-configure:
     name: e2e-configure

From ef9d26f70805880e87ded3a405de03062a64882c Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:03:27 -0500
Subject: [PATCH 19/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 47fa7c67e39..77294225ef9 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -18,7 +18,7 @@ jobs:
       image: greyltc/archlinux-aur:paru
       options: --user root
     steps:
-      - name: investigate
+      - name: Investigate 1
         run: |
           pwd
           whoami
@@ -28,10 +28,19 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Investigate 2
+        run: |
+          pwd
+          whoami
+          ls -la
+          id -u
+
       - name: Test Arch dependencies
         shell: bash
-        run: |
-          sudo -u ab -D~ bash -c 'paru -Syu --noconfirm --noprogressbar - < ${GITHUB_WORKSPACE}/.taskfiles/Workstation/ArchPackages'
+        run: >-
+          sudo -u ab -D~ bash -c '
+          paru -Syu --noconfirm --noprogressbar - < ${GITHUB_WORKSPACE}/.taskfiles/Workstation/ArchPackages
+          '
 
   e2e-configure:
     name: e2e-configure

From 764e37335a9e0bbc9752b8a05e0b6e0284cdd461 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:06:15 -0500
Subject: [PATCH 20/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 77294225ef9..49dca68a2ef 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -37,9 +37,11 @@ jobs:
 
       - name: Test Arch dependencies
         shell: bash
+        working-directory: /__w/flux-cluster-template/flux-cluster-template
         run: >-
           sudo -u ab -D~ bash -c '
-          paru -Syu --noconfirm --noprogressbar - < ${GITHUB_WORKSPACE}/.taskfiles/Workstation/ArchPackages
+          paru -Syu --noconfirm --noprogressbar go-task;
+          go-task workstation:paru
           '
 
   e2e-configure:

From 1495d6c8798a17998e406b68ae09c7f3cdd2f022 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:09:53 -0500
Subject: [PATCH 21/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 49dca68a2ef..b9df9f8b95f 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -40,8 +40,7 @@ jobs:
         working-directory: /__w/flux-cluster-template/flux-cluster-template
         run: >-
           sudo -u ab -D~ bash -c '
-          paru -Syu --noconfirm --noprogressbar go-task;
-          go-task workstation:paru
+          paru -Syu --noconfirm --noprogressbar go-task && go-task --taskfile Taskfile.yaml workstation:paru
           '
 
   e2e-configure:

From 1702eadbdd38aabda2cf2a96ed958f7e7b7fdf3e Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:11:16 -0500
Subject: [PATCH 22/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index b9df9f8b95f..4cbc0edf513 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -37,10 +37,10 @@ jobs:
 
       - name: Test Arch dependencies
         shell: bash
-        working-directory: /__w/flux-cluster-template/flux-cluster-template
         run: >-
           sudo -u ab -D~ bash -c '
-          paru -Syu --noconfirm --noprogressbar go-task && go-task --taskfile Taskfile.yaml workstation:paru
+          paru -Syu --noconfirm --noprogressbar go-task;
+          go-task --taskfile /__w/flux-cluster-template/flux-cluster-template/Taskfile.yaml workstation:paru
           '
 
   e2e-configure:

From dc98b081c2acd4b1214a7355241df9fba206d506 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:13:56 -0500
Subject: [PATCH 23/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 4cbc0edf513..30fc5419e03 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -24,6 +24,7 @@ jobs:
           whoami
           ls -la
           id -u
+          echo $GITHUB_WORKSPACE
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -34,6 +35,7 @@ jobs:
           whoami
           ls -la
           id -u
+          echo $GITHUB_WORKSPACE
 
       - name: Test Arch dependencies
         shell: bash

From 7f2a3e9f503db212c0d4772aa02d1493bb4b81ee Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:16:57 -0500
Subject: [PATCH 24/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 30fc5419e03..8e57a32b7f1 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -41,8 +41,9 @@ jobs:
         shell: bash
         run: >-
           sudo -u ab -D~ bash -c '
+          cd $GITHUB_WORKSPACE;
           paru -Syu --noconfirm --noprogressbar go-task;
-          go-task --taskfile /__w/flux-cluster-template/flux-cluster-template/Taskfile.yaml workstation:paru
+          go-task workstation:paru
           '
 
   e2e-configure:

From 33777a111522b69570051a05fb8424ea94e77c19 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:18:19 -0500
Subject: [PATCH 25/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 8e57a32b7f1..43f408e5a3c 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -41,8 +41,9 @@ jobs:
         shell: bash
         run: >-
           sudo -u ab -D~ bash -c '
-          cd $GITHUB_WORKSPACE;
-          paru -Syu --noconfirm --noprogressbar go-task;
+          cd $GITHUB_WORKSPACE && \
+          echo $(pwd) && \
+          paru -Syu --noconfirm --noprogressbar go-task && \
           go-task workstation:paru
           '
 

From c4a57dff7a58aa0c7e947071ae42e68bbb9793a7 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:20:48 -0500
Subject: [PATCH 26/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 43f408e5a3c..81a2f6dae9a 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -40,10 +40,10 @@ jobs:
       - name: Test Arch dependencies
         shell: bash
         run: >-
-          sudo -u ab -D~ bash -c '
-          cd $GITHUB_WORKSPACE && \
-          echo $(pwd) && \
-          paru -Syu --noconfirm --noprogressbar go-task && \
+          sudo -E -u ab -D~ bash -c '
+          cd $GITHUB_WORKSPACE;
+          echo $(pwd);
+          paru -Syu --noconfirm --noprogressbar go-task;
           go-task workstation:paru
           '
 

From 7f0cd09d614608ce9af562b788640855cc18b77f Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:24:58 -0500
Subject: [PATCH 27/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml           | 1 -
 .taskfiles/Workstation/Taskfile.yaml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 81a2f6dae9a..1012454b843 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -42,7 +42,6 @@ jobs:
         run: >-
           sudo -E -u ab -D~ bash -c '
           cd $GITHUB_WORKSPACE;
-          echo $(pwd);
           paru -Syu --noconfirm --noprogressbar go-task;
           go-task workstation:paru
           '
diff --git a/.taskfiles/Workstation/Taskfile.yaml b/.taskfiles/Workstation/Taskfile.yaml
index 0cf40f57779..4f1b12c05cd 100644
--- a/.taskfiles/Workstation/Taskfile.yaml
+++ b/.taskfiles/Workstation/Taskfile.yaml
@@ -16,7 +16,7 @@ tasks:
 
   paru:
     desc: Install workstation dependencies with Paru
-    cmd: paru -S --needed --noconfirm - < {{.ROOT_DIR}}/.taskfiles/Workstation/ArchPackages
+    cmd: paru -Syu --noconfirm --noprogressbar - < {{.ROOT_DIR}}/.taskfiles/Workstation/ArchPackages
     preconditions:
       - sh: command -v paru
         msg: |

From 7454dcdb1947e4fa56c78e012a8242fd1dd5edca Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:27:56 -0500
Subject: [PATCH 28/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 1012454b843..d4267a87639 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -18,24 +18,14 @@ jobs:
       image: greyltc/archlinux-aur:paru
       options: --user root
     steps:
-      - name: Investigate 1
-        run: |
-          pwd
-          whoami
-          ls -la
-          id -u
-          echo $GITHUB_WORKSPACE
-
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Investigate 2
+      - name: Set Permissions
+        shell: bash
         run: |
-          pwd
-          whoami
-          ls -la
-          id -u
-          echo $GITHUB_WORKSPACE
+          sudo chown -R 973:973 $GITHUB_WORKSPACE
+          sudo chmod -R 777 $GITHUB_WORKSPACE
 
       - name: Test Arch dependencies
         shell: bash

From 5e225a3410fb255d1c3150d42089daf51749ce17 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:29:30 -0500
Subject: [PATCH 29/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index d4267a87639..8e02598e9bc 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -21,11 +21,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set Permissions
-        shell: bash
-        run: |
-          sudo chown -R 973:973 $GITHUB_WORKSPACE
-          sudo chmod -R 777 $GITHUB_WORKSPACE
+      # - name: Set Permissions
+      #   shell: bash
+      #   run: |
+      #     sudo chown -R 973:973 $GITHUB_WORKSPACE
+      #     sudo chmod -R 777 $GITHUB_WORKSPACE
 
       - name: Test Arch dependencies
         shell: bash
@@ -33,7 +33,7 @@ jobs:
           sudo -E -u ab -D~ bash -c '
           cd $GITHUB_WORKSPACE;
           paru -Syu --noconfirm --noprogressbar go-task;
-          go-task workstation:paru
+          paru -Syu --noconfirm --noprogressbar - < .taskfiles/Workstation/ArchPackages
           '
 
   e2e-configure:

From fe439f696e307682ca962419394c084cd7b4b3bd Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:31:51 -0500
Subject: [PATCH 30/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 8e02598e9bc..1ee867b8993 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -33,7 +33,9 @@ jobs:
           sudo -E -u ab -D~ bash -c '
           cd $GITHUB_WORKSPACE;
           paru -Syu --noconfirm --noprogressbar go-task;
-          paru -Syu --noconfirm --noprogressbar - < .taskfiles/Workstation/ArchPackages
+          ls -la;
+          cat .taskfiles/Workstation/ArchPackages;
+          go-task workstation:paru
           '
 
   e2e-configure:

From 0528ddb54731aa8f18288920b164728f745588c3 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:37:51 -0500
Subject: [PATCH 31/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml           | 8 --------
 .taskfiles/Workstation/Taskfile.yaml | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 1ee867b8993..a3b227f2f2b 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -21,20 +21,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      # - name: Set Permissions
-      #   shell: bash
-      #   run: |
-      #     sudo chown -R 973:973 $GITHUB_WORKSPACE
-      #     sudo chmod -R 777 $GITHUB_WORKSPACE
-
       - name: Test Arch dependencies
         shell: bash
         run: >-
           sudo -E -u ab -D~ bash -c '
           cd $GITHUB_WORKSPACE;
           paru -Syu --noconfirm --noprogressbar go-task;
-          ls -la;
-          cat .taskfiles/Workstation/ArchPackages;
           go-task workstation:paru
           '
 
diff --git a/.taskfiles/Workstation/Taskfile.yaml b/.taskfiles/Workstation/Taskfile.yaml
index 4f1b12c05cd..2b211d9b344 100644
--- a/.taskfiles/Workstation/Taskfile.yaml
+++ b/.taskfiles/Workstation/Taskfile.yaml
@@ -16,7 +16,7 @@ tasks:
 
   paru:
     desc: Install workstation dependencies with Paru
-    cmd: paru -Syu --noconfirm --noprogressbar - < {{.ROOT_DIR}}/.taskfiles/Workstation/ArchPackages
+    cmd: paru -Syu --noconfirm --noprogressbar $(cat .taskfiles/Workstation/ArchPackages | xargs)
     preconditions:
       - sh: command -v paru
         msg: |

From 121740bc6939c62a707a5e5610dd21386528204b Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:38:58 -0500
Subject: [PATCH 32/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml           | 2 +-
 .taskfiles/Workstation/Taskfile.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index a3b227f2f2b..c1ad436e133 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -26,7 +26,7 @@ jobs:
         run: >-
           sudo -E -u ab -D~ bash -c '
           cd $GITHUB_WORKSPACE;
-          paru -Syu --noconfirm --noprogressbar go-task;
+          paru -Syu --noconfirm --noprogressbar go-task-bin;
           go-task workstation:paru
           '
 
diff --git a/.taskfiles/Workstation/Taskfile.yaml b/.taskfiles/Workstation/Taskfile.yaml
index 2b211d9b344..1d12abbde9c 100644
--- a/.taskfiles/Workstation/Taskfile.yaml
+++ b/.taskfiles/Workstation/Taskfile.yaml
@@ -16,7 +16,7 @@ tasks:
 
   paru:
     desc: Install workstation dependencies with Paru
-    cmd: paru -Syu --noconfirm --noprogressbar $(cat .taskfiles/Workstation/ArchPackages | xargs)
+    cmd: paru -Syu --noconfirm --noprogressbar $(cat {{.ROOT_DIR}}/.taskfiles/Workstation/ArchPackages | xargs)
     preconditions:
       - sh: command -v paru
         msg: |

From f1e2f295eeffe7b9fdcdfbbbd6f7f32cbec855f0 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:42:04 -0500
Subject: [PATCH 33/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml          | 2 +-
 .taskfiles/Workstation/ArchPackages | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index c1ad436e133..a3b227f2f2b 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -26,7 +26,7 @@ jobs:
         run: >-
           sudo -E -u ab -D~ bash -c '
           cd $GITHUB_WORKSPACE;
-          paru -Syu --noconfirm --noprogressbar go-task-bin;
+          paru -Syu --noconfirm --noprogressbar go-task;
           go-task workstation:paru
           '
 
diff --git a/.taskfiles/Workstation/ArchPackages b/.taskfiles/Workstation/ArchPackages
index d2f301efd52..e23ff97d76a 100644
--- a/.taskfiles/Workstation/ArchPackages
+++ b/.taskfiles/Workstation/ArchPackages
@@ -14,5 +14,5 @@ kustomize
 moreutils
 sops
 stern-bin
-go-task-bin
+go-task
 go-yq

From feb822a263339cdfcc60f28890ec8f4e94b64908 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:47:09 -0500
Subject: [PATCH 34/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index a3b227f2f2b..3d274f519ee 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -21,6 +21,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set Permissions
+        shell: bash
+        run: sudo chown -R 973:973 $GITHUB_WORKSPACE
+
       - name: Test Arch dependencies
         shell: bash
         run: >-

From 6b4b8c80170b6f76c98510a63a45bdad00c43448 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:48:20 -0500
Subject: [PATCH 35/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 3d274f519ee..d4267a87639 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -23,7 +23,9 @@ jobs:
 
       - name: Set Permissions
         shell: bash
-        run: sudo chown -R 973:973 $GITHUB_WORKSPACE
+        run: |
+          sudo chown -R 973:973 $GITHUB_WORKSPACE
+          sudo chmod -R 777 $GITHUB_WORKSPACE
 
       - name: Test Arch dependencies
         shell: bash

From 1ebe07ec5c286d130fb1c5329e59edf25c57f69a Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:50:28 -0500
Subject: [PATCH 36/39] chore: can I test paru

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index d4267a87639..402efac47a0 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -21,16 +21,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set Permissions
-        shell: bash
-        run: |
-          sudo chown -R 973:973 $GITHUB_WORKSPACE
-          sudo chmod -R 777 $GITHUB_WORKSPACE
+      # - name: Set Permissions
+      #   shell: bash
+      #   run: |
+      #     sudo chown -R 973:973 $GITHUB_WORKSPACE
+      #     sudo chmod -R 777 $GITHUB_WORKSPACE
 
       - name: Test Arch dependencies
         shell: bash
         run: >-
-          sudo -E -u ab -D~ bash -c '
+          sudo -l -E -u ab -D~ bash -c '
           cd $GITHUB_WORKSPACE;
           paru -Syu --noconfirm --noprogressbar go-task;
           go-task workstation:paru

From 5a3868432505eaca66a6a2fe036a3e351f76360e Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:56:28 -0500
Subject: [PATCH 37/39] chore: can I test ya

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml           | 8 ++++----
 .taskfiles/Workstation/Taskfile.yaml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 402efac47a0..ed0a416bbec 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -15,7 +15,7 @@ jobs:
     name: e2e-paru
     runs-on: ubuntu-latest
     container:
-      image: greyltc/archlinux-aur:paru
+      image: greyltc/archlinux-aur:yay
       options: --user root
     steps:
       - name: Checkout
@@ -30,10 +30,10 @@ jobs:
       - name: Test Arch dependencies
         shell: bash
         run: >-
-          sudo -l -E -u ab -D~ bash -c '
+          sudo -E -u ab -D~ bash -c '
           cd $GITHUB_WORKSPACE;
-          paru -Syu --noconfirm --noprogressbar go-task;
-          go-task workstation:paru
+          yay -Syu --noconfirm --noprogressbar go-task;
+          go-task workstation:yay
           '
 
   e2e-configure:
diff --git a/.taskfiles/Workstation/Taskfile.yaml b/.taskfiles/Workstation/Taskfile.yaml
index 1d12abbde9c..2f99dcac7c9 100644
--- a/.taskfiles/Workstation/Taskfile.yaml
+++ b/.taskfiles/Workstation/Taskfile.yaml
@@ -14,12 +14,12 @@ tasks:
           Head over to https://brew.sh to get up and running.
       - { msg: "Brewfile not found", sh: "test -f {{.ROOT_DIR}}/.taskfiles/Workstation/Brewfile" }
 
-  paru:
+  yay:
     desc: Install workstation dependencies with Paru
-    cmd: paru -Syu --noconfirm --noprogressbar $(cat {{.ROOT_DIR}}/.taskfiles/Workstation/ArchPackages | xargs)
+    cmd: yay -Syu --needed --noconfirm --noprogressbar $(cat {{.ROOT_DIR}}/.taskfiles/Workstation/ArchPackages | xargs)
     preconditions:
       - sh: command -v paru
         msg: |
-          Paru is not installed. Using ArchLinux?
-          Head over to https://github.com/Morganamilo/paru to get up and running.
+          Yay is not installed. Using ArchLinux?
+          Head over to https://github.com/Jguer/yay to get up and running.
       - { msg: "ArchPackages not found", sh: "test -f {{.ROOT_DIR}}/.taskfiles/Workstation/ArchPackages" }

From 7bb76a245c6f01c2d655527d0c2ef409f37e36a1 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 11:57:42 -0500
Subject: [PATCH 38/39] chore: can I test yay

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .taskfiles/Workstation/Taskfile.yaml |  2 +-
 README.md                            | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.taskfiles/Workstation/Taskfile.yaml b/.taskfiles/Workstation/Taskfile.yaml
index 2f99dcac7c9..751605c621c 100644
--- a/.taskfiles/Workstation/Taskfile.yaml
+++ b/.taskfiles/Workstation/Taskfile.yaml
@@ -18,7 +18,7 @@ tasks:
     desc: Install workstation dependencies with Paru
     cmd: yay -Syu --needed --noconfirm --noprogressbar $(cat {{.ROOT_DIR}}/.taskfiles/Workstation/ArchPackages | xargs)
     preconditions:
-      - sh: command -v paru
+      - sh: command -v yay
         msg: |
           Yay is not installed. Using ArchLinux?
           Head over to https://github.com/Jguer/yay to get up and running.
diff --git a/README.md b/README.md
index 20122a55404..b5465870b62 100644
--- a/README.md
+++ b/README.md
@@ -149,8 +149,8 @@ Once you have installed Debian on your nodes, there are six stages to getting a
     ```sh
     # Homebrew
     brew install go-task
-    # Arch / Paru
-    paru -S go-task-bin
+    # Arch / Yay
+    yay -S go-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.
@@ -160,8 +160,8 @@ Once you have installed Debian on your nodes, there are six stages to getting a
     ```sh
     # Homebrew
     brew install direnv
-    # or, Arch / Paru
-    paru -S direnv
+    # or, Arch / Yay
+    yay -S direnv
     ```
 
 3. Install additional tools: [age](https://github.com/FiloSottile/age), [flux](https://toolkit.fluxcd.io/), [cloudflared](https://github.com/cloudflare/cloudflared), [kubectl](https://kubernetes.io/docs/tasks/tools/), [sops](https://github.com/getsops/sops)
@@ -172,7 +172,7 @@ Once you have installed Debian on your nodes, there are six stages to getting a
     # Homebrew
     task workstation:brew
     # or, Arch / Paru
-    go-task workstation:paru
+    go-task workstation:yay
     ```
 
 4. Setup a Python virual env and install Ansible by running the following task command.

From e2571151218b5934239025dfac89ce526e9ac2b6 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 13 Jan 2024 12:00:45 -0500
Subject: [PATCH 39/39] chore: remove kubecolor

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/workflows/e2e.yaml          | 12 +++---------
 .taskfiles/Workstation/ArchPackages |  1 -
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index ed0a416bbec..57557007d6b 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -11,8 +11,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  e2e-paru:
-    name: e2e-paru
+  e2e-yay:
+    name: e2e-yay
     runs-on: ubuntu-latest
     container:
       image: greyltc/archlinux-aur:yay
@@ -21,18 +21,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      # - name: Set Permissions
-      #   shell: bash
-      #   run: |
-      #     sudo chown -R 973:973 $GITHUB_WORKSPACE
-      #     sudo chmod -R 777 $GITHUB_WORKSPACE
-
       - name: Test Arch dependencies
         shell: bash
         run: >-
           sudo -E -u ab -D~ bash -c '
           cd $GITHUB_WORKSPACE;
-          yay -Syu --noconfirm --noprogressbar go-task;
+          yay -Syu --needed --noconfirm --noprogressbar go-task;
           go-task workstation:yay
           '
 
diff --git a/.taskfiles/Workstation/ArchPackages b/.taskfiles/Workstation/ArchPackages
index e23ff97d76a..11e5d5d5ff1 100644
--- a/.taskfiles/Workstation/ArchPackages
+++ b/.taskfiles/Workstation/ArchPackages
@@ -8,7 +8,6 @@ jq
 k0sctl-bin
 k9s
 kubeconform
-kubecolor
 kubectl-bin
 kustomize
 moreutils