From 8849d094d454eff495dca118208c313e626f101b Mon Sep 17 00:00:00 2001
From: Fred Klassen <fklassen@appneta.com>
Date: Wed, 8 Feb 2023 09:34:06 -0800
Subject: [PATCH] autojump out, fasd in

---
 README-MY-SETUP.md           |  6 +++---
 templates/starship.toml      | 27 +++++++++++----------------
 templates/zshrc.zsh-template |  9 ++++-----
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/README-MY-SETUP.md b/README-MY-SETUP.md
index 7c6b162ba..8d4c42020 100644
--- a/README-MY-SETUP.md
+++ b/README-MY-SETUP.md
@@ -24,10 +24,10 @@ macOS
     ```
 
   * Configure iTerm2 to use one of the nerd fonts (I like hack)
-  * needed for `oh-my-zsh` module `autojump`
+  * needed for `oh-my-zsh` module `fasd`
 
     ```shell
-    brew install autojump
+    brew install fasd
     brew install terminal-notifier
     brew install thefuck
     ```
@@ -46,7 +46,7 @@ Linux
 * install some terminal tools
 
   ```(shell)
-  sudo apt install exa autojump thefuck tmux
+  sudo apt install exa fasd thefuck tmux
   ```
 
 * install [Tilex](https://gnunn1.github.io/tilix-web/)
diff --git a/templates/starship.toml b/templates/starship.toml
index 4bb0b9e45..d2068dc7c 100644
--- a/templates/starship.toml
+++ b/templates/starship.toml
@@ -4,15 +4,10 @@
 # Inserts a blank line between shell prompts
 add_newline = true
 
-# Use custom format
-#format = '''
-#[┌───────────────────>](bold green)
-#[│](bold green)$directory$rust$package
-#[└─>](bold green) '''
-
 # Replace the '❯' symbol in the prompt with '➜'
-[character] # The name of the module we are configuring is 'character'
-success_symbol = '[➜](bold green)' # The 'success_symbol' segment is being set to '➜' with the color 'bold green'
+[character]
+success_symbol = '[➜](bold green)'
+error_symbol = '[➜](bold red)'
 
 # Disable the package module, hiding it from the prompt completely
 [package]
@@ -23,14 +18,14 @@ command_timeout = 1500
 
 [git_status]
 conflicted = "⚔️ "
-ahead = "🏎️ 💨 ×${count}"
-behind = "🐢 ×${count}"
-diverged = "🔱 🏎️ 💨 ×${ahead_count} 🐢 ×${behind_count}"
-untracked = "🛤️  ×${count}"
+ahead = "🏎️ 💨 ×${count} "
+behind = "🐢 ×${count} "
+diverged = "🔱 🏎️ 💨 ×${ahead_count} 🐢 ×${behind_count} "
+untracked = "🛤️  ×${count} "
 stashed = "📦 "
-modified = "📝 ×${count}"
-staged = "🗃️  ×${count}"
-renamed = "📛 ×${count}"
-deleted = "🗑️  ×${count}"
+modified = "📝 ×${count} "
+staged = "🗃️  ×${count} "
+renamed = "📛 ×${count} "
+deleted = "🗑️  ×${count} "
 style = "bright-white"
 format = "$all_status$ahead_behind"
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 5a0578e5f..a03212e84 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -26,7 +26,7 @@ ZSH_THEME="gnzh"
 # Uncomment one of the following lines to change the auto-update behavior
 # zstyle ':omz:update' mode disabled  # disable automatic updates
 # zstyle ':omz:update' mode auto      # update automatically without asking
-# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
+zstyle ':omz:update' mode reminder  # just remind me to update when it's time
 
 # Uncomment the following line to change how often to auto-update (in days).
 # zstyle ':omz:update' frequency 13
@@ -35,7 +35,7 @@ ZSH_THEME="gnzh"
 DISABLE_MAGIC_FUNCTIONS="true"
 
 # Uncomment the following line to disable colors in ls.
-# DISABLE_LS_COLORS="true"
+DISABLE_LS_COLORS="true"
 
 # Uncomment the following line to disable auto-setting terminal title.
 # DISABLE_AUTO_TITLE="true"
@@ -52,7 +52,7 @@ COMPLETION_WAITING_DOTS="true"
 # Uncomment the following line if you want to disable marking untracked files
 # under VCS as dirty. This makes repository status check for large repositories
 # much, much faster.
-DISABLE_UNTRACKED_FILES_DIRTY="true"
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
 
 # Uncomment the following line if you want to change the command execution time
 # stamp shown in the history command output.
@@ -74,7 +74,6 @@ plugins=(
     alias-finder
     aliases
     aws
-    autojump
     colored-man-pages
     command-not-found
     common-aliases
@@ -86,6 +85,7 @@ plugins=(
     docker
     emoji
     extract
+    fasd
     fd
     git
     jfrog
@@ -96,7 +96,6 @@ plugins=(
     vscode
     zsh-autosuggestions
     zsh-interactive-cd
-    zsh-navigation-tools
 )
 
 zstyle :omz:plugins:ssh-agent agent-forwarding yes