From d8d253d2fce30a3971ffafb44b864a431b7ef0bc Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Mon, 4 Dec 2023 20:10:40 +0100
Subject: [PATCH 1/4] Starfish subcommand timeout of 2s instead of 500ms

---
 .config/starship.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.config/starship.toml b/.config/starship.toml
index fda17d8..22acfde 100644
--- a/.config/starship.toml
+++ b/.config/starship.toml
@@ -30,6 +30,9 @@ $time\
 $cmd_duration\
 """
 
+# Timeout for commands executed by starship (ms)
+command_timeout = 2000
+
 # Disable the blank line at the start of the prompt
 # add_newline = false
 

From d0f0d70675740d89a999a2b8c301b00f3d1c006c Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Mon, 4 Dec 2023 20:20:37 +0100
Subject: [PATCH 2/4] Git status tryouts, looking pretty OK now

---
 .config/starship.toml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.config/starship.toml b/.config/starship.toml
index 22acfde..e1c6f63 100644
--- a/.config/starship.toml
+++ b/.config/starship.toml
@@ -105,8 +105,19 @@ truncation_length = 30
 format = '[ $symbol $branch ]($style)'
 
 [git_status]
-style = "bg:#FCA17D"
-format = '[$all_status$ahead_behind ]($style)'
+#    
+# style = "bg:#FCA17D"
+style = "bg:#fb7d4b"
+# style = "bg:#fb7d4b fg:#ff0000"
+# style = "fg:#000000 bg:#FCA17D"
+# style = "fg:#ff0000 bg:#FCA17D"
+# staged = ''
+# modified = ''
+# untracked = '?'
+# format = '[$all_status$ahead_behind ]($style)'
+# format = '[$all_status$ahead_behind]($style)[ ](bg:#FCA17D)'
+# format = '[$all_status$ahead_behind]($style)[ ](bg:#FCA17D)'
+format = '[](bg:#fb7d4b fg:#FCA17D)[$all_status$ahead_behind]($style)[](bg:#FCA17D fg:#fb7d4b)'
 
 [golang]
 symbol = " "

From 17955520c2ba06ec21710eab8836bc11417bb39b Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Mon, 4 Dec 2023 20:27:51 +0100
Subject: [PATCH 3/4] Reverted styling to eliminate always-visible triangle;
 added numbers

---
 .config/starship.toml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.config/starship.toml b/.config/starship.toml
index e1c6f63..2c05601 100644
--- a/.config/starship.toml
+++ b/.config/starship.toml
@@ -105,9 +105,12 @@ truncation_length = 30
 format = '[ $symbol $branch ]($style)'
 
 [git_status]
+ahead = '⇡${count}'
+diverged = '⇕⇡${ahead_count}⇣${behind_count}'
+behind = '⇣${count}'
 #    
-# style = "bg:#FCA17D"
-style = "bg:#fb7d4b"
+style = "bg:#FCA17D"
+# style = "bg:#fb7d4b"
 # style = "bg:#fb7d4b fg:#ff0000"
 # style = "fg:#000000 bg:#FCA17D"
 # style = "fg:#ff0000 bg:#FCA17D"
@@ -115,9 +118,10 @@ style = "bg:#fb7d4b"
 # modified = ''
 # untracked = '?'
 # format = '[$all_status$ahead_behind ]($style)'
+format = '[$all_status$ahead_behind]($style)'
 # format = '[$all_status$ahead_behind]($style)[ ](bg:#FCA17D)'
 # format = '[$all_status$ahead_behind]($style)[ ](bg:#FCA17D)'
-format = '[](bg:#fb7d4b fg:#FCA17D)[$all_status$ahead_behind]($style)[](bg:#FCA17D fg:#fb7d4b)'
+# format = '[](bg:#fb7d4b fg:#FCA17D)[$all_status$ahead_behind]($style)[](bg:#FCA17D fg:#fb7d4b)'
 
 [golang]
 symbol = " "

From c6b97e2595df674a35f07a27077a3d820684728a Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 6 Dec 2023 13:11:08 +0100
Subject: [PATCH 4/4] curl sh command to install/update starship

---
 .config/fish/config.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index b432409..c933333 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -167,4 +167,5 @@ function jl
 end
 
 # Initialise starship theme
+# curl -sS https://starship.rs/install.sh|sh
 starship init fish | source