From 2acb445d6bdfcdcd32f4390b436c4da751ccf4b2 Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 18:31:22 +0100
Subject: [PATCH 01/22] See what errors we get

---
 .github/workflows/ci.yaml   | 42 ++++++++++++++++++++++++++++++-------
 tests/ansible.cfg           |  2 ++
 tests/inventory             |  2 ++
 tests/uninstall-homebrew.sh | 13 ++++++++++++
 4 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 tests/ansible.cfg
 create mode 100644 tests/inventory
 create mode 100644 tests/uninstall-homebrew.sh

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5b806f1..c5ca868 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,15 +1,43 @@
 ---
-name: Code quality
+name: CI
 
 on:
   push:
 
 jobs:
-  lint-ansible:
-    name: Ansible Lint
-    runs-on: ubuntu-latest
+  integration:
+    name: Integration
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - macos-12
+
     steps:
-      - uses: actions/checkout@v3
+      - name: Check out the codebase.
+        uses: actions/checkout@v3
+
+      - name: Uninstall GitHub Actions' built-in Homebrew.
+        run: tests/uninstall-homebrew.sh
+
+      - name: Uninstall GitHub Actions' built-in browser installs.
+        run: |
+          sudo rm -rf /Applications/Firefox.app
+          sudo rm -rf /Applications/Google\ Chrome.app
+
+      - name: Install test dependencies.
+        run: sudo pip3 install ansible
+
+      - name: Set up the test environment.
+        run: |
+          cp tests/ansible.cfg ./ansible.cfg
+          cp tests/inventory ./inventory
+          ansible-galaxy install -r requirements.yml
+
+      - name: Test the playbook's syntax.
+        run: ansible-playbook macOS.yml --syntax-check
 
-      - name: Set up Ansible
-        uses: ansible-community/ansible-lint-action@main
+      - name: Test the playbook.
+        run: ansible-playbook macOS.yml
+        env:
+          ANSIBLE_FORCE_COLOR: '1'
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
new file mode 100644
index 0000000..f8fc6cd
--- /dev/null
+++ b/tests/ansible.cfg
@@ -0,0 +1,2 @@
+[defaults]
+inventory = inventory
diff --git a/tests/inventory b/tests/inventory
new file mode 100644
index 0000000..13cfabe
--- /dev/null
+++ b/tests/inventory
@@ -0,0 +1,2 @@
+[local]
+localhost ansible_connection=local
diff --git a/tests/uninstall-homebrew.sh b/tests/uninstall-homebrew.sh
new file mode 100644
index 0000000..d6d4c96
--- /dev/null
+++ b/tests/uninstall-homebrew.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Uninstalls Homebrew using the official uninstall script.
+
+# Download and run the uninstall script.
+curl -sLO https://raw.githubusercontent.com/Homebrew/install/master/uninstall.sh
+chmod +x ./uninstall.sh
+sudo ./uninstall.sh --force
+
+# Clean up Homebrew directories.
+sudo rm -rf /usr/local/Homebrew
+sudo rm -rf /usr/local/Caskroom
+sudo rm -rf /usr/local/bin/brew

From 1cb004c35adcfbde523c27a17ef4e7c7b8260e5f Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 18:34:01 +0100
Subject: [PATCH 02/22] Update ci.yaml

---
 .github/workflows/ci.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c5ca868..0a962cc 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -4,6 +4,9 @@ name: CI
 on:
   push:
 
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
 jobs:
   integration:
     name: Integration

From cef9cbacbf673e4b584fe267c71d9f22ea21005c Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 18:36:46 +0100
Subject: [PATCH 03/22] Try again

---
 ansible.cfg                        | 4 ++++
 tests/{inventory => inventory.ini} | 0
 2 files changed, 4 insertions(+)
 rename tests/{inventory => inventory.ini} (100%)

diff --git a/ansible.cfg b/ansible.cfg
index 201d698..8850366 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,5 +1,9 @@
 [defaults]
+nocows = True
+roles_path = ./roles:/etc/ansible/roles
 inventory = inventory.ini
+become = true
+stdout_callback = yaml
 
 [diff]
 always = true
diff --git a/tests/inventory b/tests/inventory.ini
similarity index 100%
rename from tests/inventory
rename to tests/inventory.ini

From 3b73353790675809cfac12fc7d1335f901194f87 Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 18:40:35 +0100
Subject: [PATCH 04/22] Try an earlier mac version

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0a962cc..361653c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - macos-12
+          - macos-10.15
 
     steps:
       - name: Check out the codebase.

From c9cbcd8a9c5849c0a4a37486a7ef6fa267848ddc Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 18:42:27 +0100
Subject: [PATCH 05/22] Try this

---
 .github/workflows/ci.yaml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 361653c..d515c40 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,20 +14,12 @@ jobs:
     strategy:
       matrix:
         os:
-          - macos-10.15
+          - macos-12
 
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v3
 
-      - name: Uninstall GitHub Actions' built-in Homebrew.
-        run: tests/uninstall-homebrew.sh
-
-      - name: Uninstall GitHub Actions' built-in browser installs.
-        run: |
-          sudo rm -rf /Applications/Firefox.app
-          sudo rm -rf /Applications/Google\ Chrome.app
-
       - name: Install test dependencies.
         run: sudo pip3 install ansible
 

From 24d3305df05ebd6689de4468cfbb72092e3845ae Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 18:45:12 +0100
Subject: [PATCH 06/22] Try again

---
 .github/workflows/ci.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d515c40..f221286 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,6 +19,8 @@ jobs:
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v3
+        with:
+            ref: add-integration-test
 
       - name: Install test dependencies.
         run: sudo pip3 install ansible

From 9c583395a1bac88dc511fce2794087f32c0996f6 Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 18:52:08 +0100
Subject: [PATCH 07/22] Try again

---
 .github/workflows/ci.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f221286..018f25e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -17,10 +17,14 @@ jobs:
           - macos-12
 
     steps:
-      - name: Check out the codebase.
         uses: actions/checkout@v3
+
+      - uses: actions/cache@v3
         with:
-            ref: add-integration-test
+          path: ~/Library/Caches/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
 
       - name: Install test dependencies.
         run: sudo pip3 install ansible

From 12e6daeaaab65805b7966ce6611fcc78bb3faebf Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 18:52:55 +0100
Subject: [PATCH 08/22] Fix typo

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 018f25e..660fb39 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -17,7 +17,7 @@ jobs:
           - macos-12
 
     steps:
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
       - uses: actions/cache@v3
         with:

From 6d0ab3d451add39cfd882f0b9a511947dde0ec8c Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 18:54:55 +0100
Subject: [PATCH 09/22] Try again

---
 .github/workflows/ci.yaml | 3 +--
 tests/inventory.ini       | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 tests/inventory.ini

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 660fb39..14a76be 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -27,12 +27,11 @@ jobs:
             ${{ runner.os }}-pip-
 
       - name: Install test dependencies.
-        run: sudo pip3 install ansible
+        run: pip3 install ansible
 
       - name: Set up the test environment.
         run: |
           cp tests/ansible.cfg ./ansible.cfg
-          cp tests/inventory ./inventory
           ansible-galaxy install -r requirements.yml
 
       - name: Test the playbook's syntax.
diff --git a/tests/inventory.ini b/tests/inventory.ini
deleted file mode 100644
index 13cfabe..0000000
--- a/tests/inventory.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[local]
-localhost ansible_connection=local

From 070afd61ab1eee027733b1cb2c6fb7423a55c050 Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 18:57:49 +0100
Subject: [PATCH 10/22] Try again

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 14a76be..059c93e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -32,7 +32,7 @@ jobs:
       - name: Set up the test environment.
         run: |
           cp tests/ansible.cfg ./ansible.cfg
-          ansible-galaxy install -r requirements.yml
+          ansible-galaxy install -r requirements.yaml
 
       - name: Test the playbook's syntax.
         run: ansible-playbook macOS.yml --syntax-check

From 2cdfe10cffdd3af170b5764a9d4a1dcd87368548 Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 19:07:51 +0100
Subject: [PATCH 11/22] Fix typo

---
 .github/workflows/ci.yaml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 059c93e..a2e81de 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,14 +19,21 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Get pip cache dir
+        id: pip-cache
+        run: |
+          echo "::set-output name=dir::$(pip cache dir)"
+
       - uses: actions/cache@v3
+        id: cache
         with:
-          path: ~/Library/Caches/pip
+          path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 
       - name: Install test dependencies.
+        if: steps.cache.outputs.cache-hit != 'true'
         run: pip3 install ansible
 
       - name: Set up the test environment.
@@ -35,9 +42,9 @@ jobs:
           ansible-galaxy install -r requirements.yaml
 
       - name: Test the playbook's syntax.
-        run: ansible-playbook macOS.yml --syntax-check
+        run: ansible-playbook macOS.yaml --syntax-check
 
       - name: Test the playbook.
-        run: ansible-playbook macOS.yml
+        run: ansible-playbook macOS.yaml
         env:
           ANSIBLE_FORCE_COLOR: '1'

From e3741a8c79ead431054e2597e2e976eb0776e8a9 Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 19:11:29 +0100
Subject: [PATCH 12/22] Fix inventory

---
 .github/workflows/ci.yaml | 19 ++++---------------
 tests/ansible.cfg         |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a2e81de..45800eb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,22 +19,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Get pip cache dir
-        id: pip-cache
-        run: |
-          echo "::set-output name=dir::$(pip cache dir)"
-
-      - uses: actions/cache@v3
-        id: cache
+      - uses: actions/setup-python@v4
         with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
-      - name: Install test dependencies.
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: pip3 install ansible
+          python-version: '3.10'
+          cache: 'pip'
+      - run: pip install ansible
 
       - name: Set up the test environment.
         run: |
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
index f8fc6cd..1da4684 100644
--- a/tests/ansible.cfg
+++ b/tests/ansible.cfg
@@ -1,2 +1,2 @@
 [defaults]
-inventory = inventory
+inventory = inventory.ini

From 4790cacef49d256ed40ab982a22ce86419db005d Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 19:14:03 +0100
Subject: [PATCH 13/22] Try again

---
 .github/workflows/ci.yaml | 2 +-
 requirements.txt          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 requirements.txt

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 45800eb..7db0e74 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -23,7 +23,7 @@ jobs:
         with:
           python-version: '3.10'
           cache: 'pip'
-      - run: pip install ansible
+      - run: pip install -r requirements.txt
 
       - name: Set up the test environment.
         run: |
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..90d4055
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+ansible

From 9160732e7e521f252067dddc254913472218ee7c Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sat, 20 Aug 2022 21:17:52 +0100
Subject: [PATCH 14/22] Remove unused file

---
 tests/uninstall-homebrew.sh | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 tests/uninstall-homebrew.sh

diff --git a/tests/uninstall-homebrew.sh b/tests/uninstall-homebrew.sh
deleted file mode 100644
index d6d4c96..0000000
--- a/tests/uninstall-homebrew.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# Uninstalls Homebrew using the official uninstall script.
-
-# Download and run the uninstall script.
-curl -sLO https://raw.githubusercontent.com/Homebrew/install/master/uninstall.sh
-chmod +x ./uninstall.sh
-sudo ./uninstall.sh --force
-
-# Clean up Homebrew directories.
-sudo rm -rf /usr/local/Homebrew
-sudo rm -rf /usr/local/Caskroom
-sudo rm -rf /usr/local/bin/brew

From 5d2a43e60db1ecc512e6966a74414f616f1bc047 Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sun, 21 Aug 2022 16:56:00 +0100
Subject: [PATCH 15/22] Specify repo for asdf-golang

---
 dotfiles/roles/asdf/tasks/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/roles/asdf/tasks/main.yaml b/dotfiles/roles/asdf/tasks/main.yaml
index 6078e85..7acb775 100644
--- a/dotfiles/roles/asdf/tasks/main.yaml
+++ b/dotfiles/roles/asdf/tasks/main.yaml
@@ -5,7 +5,7 @@
   failed_when:
     - asdf_add_golang.rc != 0
     - '"already added" not in asdf_add_golang.stderr'
-  ansible.builtin.command: 'asdf plugin add golang'
+  ansible.builtin.command: 'asdf plugin add golang https://github.com/kennyp/asdf-golang.git'
 
 - name: asdf - Install latest Go version
   register: asdf_golang_installed

From 524ef0650fb0f5f9c6caee13d2795be9fa97bad7 Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sun, 21 Aug 2022 17:03:23 +0100
Subject: [PATCH 16/22] Remove openjdk, add tldr

---
 macOS.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macOS.yaml b/macOS.yaml
index c0c472f..312bb5d 100644
--- a/macOS.yaml
+++ b/macOS.yaml
@@ -14,8 +14,8 @@
       - tmux
       - watch
       - cowsay
+      - tldr
       - asdf
-      - openjdk
       - kubectl
       - helm
 

From afedfe59bc5d81f2d8db1ac080e05d61ea2b678e Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sun, 21 Aug 2022 17:05:29 +0100
Subject: [PATCH 17/22] Update default config

---
 ansible.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible.cfg b/ansible.cfg
index 8850366..1c990b6 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -2,8 +2,8 @@
 nocows = True
 roles_path = ./roles:/etc/ansible/roles
 inventory = inventory.ini
-become = true
 stdout_callback = yaml
+bin_ansible_callbacks = True
 
 [diff]
 always = true

From af5b33fba40b0f1dd9599e144c0fa4f5d99dc9f2 Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sun, 21 Aug 2022 17:37:29 +0100
Subject: [PATCH 18/22] Use Starship instead of powerlevel10k for mac

---
 dotfiles/roles/zsh/tasks/main.yaml | 7 +++++--
 macOS.yaml                         | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dotfiles/roles/zsh/tasks/main.yaml b/dotfiles/roles/zsh/tasks/main.yaml
index 7fe9d1e..a03dd3a 100644
--- a/dotfiles/roles/zsh/tasks/main.yaml
+++ b/dotfiles/roles/zsh/tasks/main.yaml
@@ -14,5 +14,8 @@
     name: "{{ ansible_user_id }}"
     shell: /bin/zsh
 
-- import_tasks: tasks/oh-my-zsh.yaml
-- import_tasks: tasks/powerlevel10k.yaml
+- ansible.builtin.import_tasks: tasks/oh-my-zsh.yaml
+
+- name: Setup powerlevel10k on Ubuntu
+  ansible.builtin.import_tasks: tasks/powerlevel10k.yaml
+  when: ansible_os_family == 'Debian'
diff --git a/macOS.yaml b/macOS.yaml
index 312bb5d..44590c2 100644
--- a/macOS.yaml
+++ b/macOS.yaml
@@ -6,6 +6,7 @@
     homebrew_installed_packages:
       - coreutils
       - zsh
+      - starship
       - ssh-copy-id
       - git
       - pv
@@ -15,6 +16,10 @@
       - watch
       - cowsay
       - tldr
+      - direnv
+      - exa
+      - bat
+      - fzf
       - asdf
       - kubectl
       - helm

From 62188de428342c104e6873ae8f827f2feb195fdf Mon Sep 17 00:00:00 2001
From: James Brookes <jpebrookes@gmail.com>
Date: Sun, 21 Aug 2022 17:46:11 +0100
Subject: [PATCH 19/22] Update zshrc to use Starship

---
 dotfiles/roles/zsh/files/.zshrc | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/dotfiles/roles/zsh/files/.zshrc b/dotfiles/roles/zsh/files/.zshrc
index 16e004b..cefa8a9 100644
--- a/dotfiles/roles/zsh/files/.zshrc
+++ b/dotfiles/roles/zsh/files/.zshrc
@@ -1,10 +1,3 @@
-# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
-# Initialization code that may require console input (password prompts, [y/n]
-# confirmations, etc.) must go above this block; everything else may go below.
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
 zstyle :omz:plugins:ssh-agent identities id_ed25519
 
 export GOPATH=$HOME/go
@@ -17,7 +10,7 @@ export ZSH="$HOME/.oh-my-zsh"
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="powerlevel10k/powerlevel10k"
+# ZSH_THEME="powerlevel10k/powerlevel10k"
 
 # Set list of themes to pick from when loading at random
 # Setting this variable when ZSH_THEME=random will cause zsh to load
@@ -79,7 +72,7 @@ ENABLE_CORRECTION="true"
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git zsh-autosuggestions dirhistory sudo ssh-agent direnv asdf copyfile golang colored-man-pages)
+plugins=(colored-man-pages command-not-found copyfile direnv dirhistory docker git golang ssh-agent sudo zsh-autosuggestions)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -114,5 +107,4 @@ alias la="exa -la --icons"
 alias lsa="exa -la --icons"
 alias lsd='exa -aD'
 
-# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
-[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+eval $(starship init zsh)

From 35bc12678300c87cd2e2b9fa058a7fcd3298a9e4 Mon Sep 17 00:00:00 2001
From: James Brookes <james.brookes@stfc.ac.uk>
Date: Sun, 21 Aug 2022 20:47:57 +0100
Subject: [PATCH 20/22] Add a new font

---
 dotfiles/roles/git/tasks/main.yaml | 3 ++-
 macOS.yaml                         | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dotfiles/roles/git/tasks/main.yaml b/dotfiles/roles/git/tasks/main.yaml
index 4a84ff1..60290bf 100644
--- a/dotfiles/roles/git/tasks/main.yaml
+++ b/dotfiles/roles/git/tasks/main.yaml
@@ -1,6 +1,7 @@
 ---
 - name: Git - Ensure Git is installed
   become: true
+  when: ansible_os_family == 'Debian'
   ansible.builtin.package:
     name: git
     state: present
@@ -9,5 +10,5 @@
   ansible.builtin.copy:
     src: .gitconfig
     dest: "{{ ansible_user_dir }}/.gitconfig"
-    mode: '0644'
+    mode: "0644"
     force: false
diff --git a/macOS.yaml b/macOS.yaml
index 44590c2..55178cf 100644
--- a/macOS.yaml
+++ b/macOS.yaml
@@ -20,6 +20,7 @@
       - exa
       - bat
       - fzf
+      - nano
       - asdf
       - kubectl
       - helm
@@ -41,6 +42,7 @@
       - keepingyouawake
       - visual-studio-code
       - docker
+      - font-fira-code-nerd-font
       - font-anonymice-nerd-font
       - insomnia
       - bitwarden
@@ -57,3 +59,4 @@
     - role: geerlingguy.mac.homebrew
     - role: jamesbrookes.dotfiles.zsh
     - role: jamesbrookes.dotfiles.asdf
+    - role: jamesbrookes.dotfiles.git

From a461a8af21aac0b64324003b2d21f6d0f5b3410a Mon Sep 17 00:00:00 2001
From: James Brookes <james.brookes@stfc.ac.uk>
Date: Sun, 21 Aug 2022 21:02:14 +0100
Subject: [PATCH 21/22] Some more changes

---
 dotfiles/roles/git/files/.gitconfig | 2 ++
 dotfiles/roles/zsh/files/.zshrc     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dotfiles/roles/git/files/.gitconfig b/dotfiles/roles/git/files/.gitconfig
index 177b868..6bae20e 100644
--- a/dotfiles/roles/git/files/.gitconfig
+++ b/dotfiles/roles/git/files/.gitconfig
@@ -1,3 +1,5 @@
+[color]
+    ui = auto
 [user]
     name = James Brookes
     email = jpebrookes@gmail.com
diff --git a/dotfiles/roles/zsh/files/.zshrc b/dotfiles/roles/zsh/files/.zshrc
index cefa8a9..10811e1 100644
--- a/dotfiles/roles/zsh/files/.zshrc
+++ b/dotfiles/roles/zsh/files/.zshrc
@@ -1,7 +1,8 @@
 zstyle :omz:plugins:ssh-agent identities id_ed25519
 
 export GOPATH=$HOME/go
-export PATH=$PATH:$HOME/.local/bin:$HOME/bin:/usr/local/go/bin:$GOPATH/bin:/opt/homebrew/bin
+export PATH=$PATH:$HOME/.local/bin:$HOME/bin:/usr/local/go/bin:$GOPATH/bin
+export EDITOR="nano"
 
 # Path to your oh-my-zsh installation.
 export ZSH="$HOME/.oh-my-zsh"

From e6d420a470f67dc4aca1765807535b503c1a6db3 Mon Sep 17 00:00:00 2001
From: James Brookes <james.brookes@stfc.ac.uk>
Date: Sun, 21 Aug 2022 21:21:24 +0100
Subject: [PATCH 22/22] Re-add missing plugin

---
 dotfiles/roles/zsh/files/.zshrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/roles/zsh/files/.zshrc b/dotfiles/roles/zsh/files/.zshrc
index 10811e1..42de3cd 100644
--- a/dotfiles/roles/zsh/files/.zshrc
+++ b/dotfiles/roles/zsh/files/.zshrc
@@ -73,7 +73,7 @@ ENABLE_CORRECTION="true"
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(colored-man-pages command-not-found copyfile direnv dirhistory docker git golang ssh-agent sudo zsh-autosuggestions)
+plugins=(asdf colored-man-pages command-not-found copyfile direnv dirhistory docker git golang ssh-agent sudo zsh-autosuggestions)
 
 source $ZSH/oh-my-zsh.sh