From 732ad7666b536ebf46e70cc9902514fdcc883976 Mon Sep 17 00:00:00 2001
From: Noah Masur <noah.masur@take2games.com>
Date: Mon, 23 Nov 2020 23:05:02 -0500
Subject: [PATCH] fix starship git hash

---
 fish.configlink/functions/aliases.fish |  2 +-
 starship/starship.toml.configlink      | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/fish.configlink/functions/aliases.fish b/fish.configlink/functions/aliases.fish
index ee75b30..06e792b 100644
--- a/fish.configlink/functions/aliases.fish
+++ b/fish.configlink/functions/aliases.fish
@@ -19,8 +19,8 @@ function aliases --description 'All aliases'
     abbr -a gds 'git diff --staged'
     abbr -a ga 'git add'
     abbr -a gaa 'git add -A'
+    abbr -a gac 'git commit -am'
     abbr -a gc 'git commit -m'
-    abbr -a gcm 'git commit -am'
     abbr -a gca 'git commit --amend'
     abbr -a gu 'git pull'
     abbr -a gp 'git push'
diff --git a/starship/starship.toml.configlink b/starship/starship.toml.configlink
index ee22832..9ddddb5 100644
--- a/starship/starship.toml.configlink
+++ b/starship/starship.toml.configlink
@@ -25,21 +25,21 @@ truncation_length = 100
 format = "[$symbol$branch]($style)"
 
 [git_commit]
-format = "[$hash]($style) "
-disabled = false
+format = "( @ [$hash]($style) )"
+only_detached = false
 
 [git_status]
-format = "[$all_status$ahead_behind]($style) "
-conflicted = " ="
-ahead = " ⇡"
-behind = " ⇣"
-diverged = " ⇕"
-untracked = " ⋄"
+format = "([$all_status$ahead_behind]($style) )"
+conflicted = "="
+ahead = "⇡"
+behind = "⇣"
+diverged = "⇕"
+untracked = "⋄"
 stashed = " ⩮"
-modified = " ∽"
-staged = " +"
-renamed = " »"
-deleted = " ✘"
+modified = "∽"
+staged = "+"
+renamed = "»"
+deleted = "✘"
 style = "red"
 
 [python]