git images

README-MY-SETUP.md

@@ -117,12 +117,6 @@ Common Install Steps
       ```
 
 * install [Starship](https://starship.rs)
-  * run installer
-
-    ```(shell)
-    curl -sS https://starship.rs/install.sh | sh
-    ```
-
   * take a copy Starship config file
 
     ```(shell)
@@ -131,6 +125,12 @@ Common Install Steps
     ln -s ~/.oh-my-zsh/templates/starship.toml
     ```
 
+  * run installer
+
+    ```(shell)
+    curl -sS https://starship.rs/install.sh | sh
+    ```
+
 * install [fzf](https://github.com/junegunn/fzf#installation) for [zsh-interactive-cd](https://github.com/fklassen/ohmyzsh/tree/master/plugins/zsh-interactive-cd) support
 * Start a terminal session
 
@@ -163,6 +163,6 @@ There are a few things that can make things even better
 * install Mosh replacement [Eternal Terminal](https://eternalterminal.dev/)
 * on macOS
   * install macVIM via `brew install macvim`
-  * install some colour themes for iTerm2 that you can choose from
+  * if you don't like Gruv Box, you may want to install some colour themes for iTerm2
     * [iTerm2 snazzy](https://github.com/sindresorhus/iterm2-snazzy)
     * [GitHub VS Code Theme for iTerm](https://github.com/cdalvaro/github-vscode-theme-iterm)

templates/starship.toml

@@ -19,4 +19,18 @@ success_symbol = '[➜](bold green)' # The 'success_symbol' segment is being set
 disabled = true
 
 # increase command timeout from default 500 milliseconds
-command_timeout = 1500
+command_timeout = 1500
+
+[git_status]
+conflicted = "⚔️ "
+ahead = "🏎️ 💨 ×${count}"
+behind = "🐢 ×${count}"
+diverged = "🔱 🏎️ 💨 ×${ahead_count} 🐢 ×${behind_count}"
+untracked = "🛤️  ×${count}"
+stashed = "📦 "
+modified = "📝 ×${count}"
+staged = "🗃️  ×${count}"
+renamed = "📛 ×${count}"
+deleted = "🗑️  ×${count}"
+style = "bright-white"
+format = "$all_status$ahead_behind"

templates/zshrc.zsh-template

@@ -143,3 +143,6 @@ fi
 if [ -f "$HOME/.config/starship.toml" ]; then
     eval "$(starship init zsh)"
 fi
+
+# opt out of et telemetry data upload
+ET_NO_TELEMETRY=1