From 817d65d0d766c16bc0d62b98c6202c0eb616391e Mon Sep 17 00:00:00 2001
From: Nico <nico@astolfo.org>
Date: Sun, 5 Oct 2025 03:32:30 +1100
Subject: [PATCH 1/2] fish: use matugen

---
 stow/.config/fish/.gitignore             |  1 +
 stow/.config/fish/config.fish            |  2 ++
 stow/.config/matugen/config.toml         |  3 +++
 stow/.config/matugen/templates/pure.fish | 15 +++++++++++++++
 4 files changed, 21 insertions(+)
 create mode 100644 stow/.config/matugen/templates/pure.fish

diff --git a/stow/.config/fish/.gitignore b/stow/.config/fish/.gitignore
index 23efee9..e4d0790 100644
--- a/stow/.config/fish/.gitignore
+++ b/stow/.config/fish/.gitignore
@@ -1 +1,2 @@
 fish_variables
+pure_prompt_colours
diff --git a/stow/.config/fish/config.fish b/stow/.config/fish/config.fish
index ce7d797..2155f8a 100644
--- a/stow/.config/fish/config.fish
+++ b/stow/.config/fish/config.fish
@@ -18,6 +18,8 @@ if status is-interactive
     end
   end
 
+  cat ~/.config/fish/pure_colours.fish | source
+
   set pure_enable_single_line_prompt true
   set HOMEBREW_AUTO_UPDATE_SECS 86400
   zoxide init fish | source
diff --git a/stow/.config/matugen/config.toml b/stow/.config/matugen/config.toml
index 1f9aaeb..954ba55 100644
--- a/stow/.config/matugen/config.toml
+++ b/stow/.config/matugen/config.toml
@@ -63,3 +63,6 @@ post_hook = 'sketchybar --reload'
 input_path = './templates/jankyborders.sh'
 output_path = '~/.cache/matugen-jankyborders.sh'
 post_hook = 'sh ~/.cache/matugen-jankyborders.sh'
+[templates.fish-pure]
+input_path = './templates/pure.fish'
+output_path = '~/.config/fish/pure_colours.fish'
diff --git a/stow/.config/matugen/templates/pure.fish b/stow/.config/matugen/templates/pure.fish
new file mode 100644
index 0000000..fc74d4b
--- /dev/null
+++ b/stow/.config/matugen/templates/pure.fish
@@ -0,0 +1,15 @@
+set pure_color_primary {{colors.primary.default.hex_stripped}}
+set pure_color_normal {{colors.on_primary.default.hex_stripped}}
+set pure_color_success {{colors.on_primary_container.default.hex_stripped}}
+set pure_color_warning {{colors.secondary_fixed_dim.default.hex_stripped}}
+
+set pure_color_info {{colors.secondary.default.hex_stripped}}
+set pure_color_danger {{colors.error.default.hex_stripped}}
+set pure_color_mute {{colors.surface_bright.default.hex_stripped}}
+
+set pure_color_light {{colors.secondary.default.hex_stripped}}
+set pure_color_dark {{colors.secondary.default.hex_stripped}}
+
+set pure_color_git_unpushed_commits {{colors.tertiary.default.hex_stripped}}
+set pure_color_git_dirty {{colors.tertiary.default.hex_stripped}}
+set pure_color_git_stash {{colors.tertiary.default.hex_stripped}}

From b1f5d44dd1b0af358bd3e074e3dd59ba12c79fa5 Mon Sep 17 00:00:00 2001
From: Nico <nico@astolfo.org>
Date: Sun, 5 Oct 2025 03:32:44 +1100
Subject: [PATCH 2/2] zsh: use matugen

---
 stow/.config/matugen/config.toml      |  5 +++++
 stow/.config/matugen/templates/zsh.sh |  3 +++
 stow/.zshrc                           | 26 ++++----------------------
 3 files changed, 12 insertions(+), 22 deletions(-)
 create mode 100644 stow/.config/matugen/templates/zsh.sh

diff --git a/stow/.config/matugen/config.toml b/stow/.config/matugen/config.toml
index 954ba55..bf90507 100644
--- a/stow/.config/matugen/config.toml
+++ b/stow/.config/matugen/config.toml
@@ -63,6 +63,11 @@ post_hook = 'sketchybar --reload'
 input_path = './templates/jankyborders.sh'
 output_path = '~/.cache/matugen-jankyborders.sh'
 post_hook = 'sh ~/.cache/matugen-jankyborders.sh'
+
+[templates.zsh]
+input_path = './templates/zsh.sh'
+output_path = '~/.cache/zsh_colours.sh'
+
 [templates.fish-pure]
 input_path = './templates/pure.fish'
 output_path = '~/.config/fish/pure_colours.fish'
diff --git a/stow/.config/matugen/templates/zsh.sh b/stow/.config/matugen/templates/zsh.sh
new file mode 100644
index 0000000..2f4372b
--- /dev/null
+++ b/stow/.config/matugen/templates/zsh.sh
@@ -0,0 +1,3 @@
+PRIMARY_COLOUR="{#{{colors.primary.default.hex_stripped}}}"
+SECONDARY_COLOUR="{#{{colors.secondary.default.hex_stripped}}}"
+TEXT_COLOUR="{#{{colors.on_primary.default.hex_stripped}}}"
diff --git a/stow/.zshrc b/stow/.zshrc
index bcae414..cb24e72 100644
--- a/stow/.zshrc
+++ b/stow/.zshrc
@@ -23,34 +23,16 @@ fi
 # set prompt colours
 HOSTNAME="$(hostname)"
 
-if [ "$HOSTNAME" = "kita" ]; then
-  PRIMARY_COLOUR="{red}"
-  SECONDARY_COLOUR="{yellow}"
-  TEXT_COLOUR="{black}"
-
-elif [ "$HOSTNAME" = "bocchi" ]; then
-  PRIMARY_COLOUR="{magenta}"
-  SECONDARY_COLOUR="{white}"
-  TEXT_COLOUR="{black}"
-
-elif [ "$HOSTNAME" = "ryo" ]; then
-  PRIMARY_COLOUR="{cyan}"
-  SECONDARY_COLOUR="{blue}"
-  TEXT_COLOUR="{black}"
-
-elif [ "$HOSTNAME" = "nijika" ]; then
-  PRIMARY_COLOUR="{yellow}"
-  SECONDARY_COLOUR="{green}"
-  TEXT_COLOUR="{black}"
-
+if [ -f ~/.cache/zsh_colours.sh ]; then
+  source ~/.cache/zsh_colours.sh
 else
   PRIMARY_COLOUR="{blue}"
   SECONDARY_COLOUR="{red}"
   TEXT_COLOUR="{black}"
 fi
 
-PROMPT="%K$PRIMARY_COLOUR%F$TEXT_COLOUR %~ %K$SECONDARY_COLOUR $OSICON %k%F{white} "
-RPROMPT="%F{7}$HOSTNAME"
+PROMPT="%F$PRIMARY_COLOUR%~ %F$SECONDARY_COLOUR$OSICON %k%F$TEXT_COLOUR "
+RPROMPT=""
 
 bindkey -e