From 8656d384624afa1e0aaf3319ed352a4efa64e017 Mon Sep 17 00:00:00 2001
From: Noah Masur <noah.masur@take2games.com>
Date: Mon, 23 Nov 2020 18:13:50 -0500
Subject: [PATCH 1/5] changing prompt

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

diff --git a/fish.configlink/functions/aliases.fish b/fish.configlink/functions/aliases.fish
index cbc4e6c..b55aadb 100644
--- a/fish.configlink/functions/aliases.fish
+++ b/fish.configlink/functions/aliases.fish
@@ -22,9 +22,11 @@ function aliases --description 'All aliases'
     abbr -a gl 'git log --graph --decorate --oneline -20'
     abbr -a gll 'git log --graph --decorate --oneline'
     abbr -a gco 'git checkout'
+    abbr -a gcom 'git checkout master'
     abbr -a gcob 'git checkout -b'
     abbr -a gb 'git branch'
     abbr -a grh 'git reset --hard'
+    abbr -a gm 'git merge'
     abbr -a ghb 'gh repo view -w'
 
     # Vim
diff --git a/starship/starship.toml.configlink b/starship/starship.toml.configlink
index 9dc15ce..b99dd74 100644
--- a/starship/starship.toml.configlink
+++ b/starship/starship.toml.configlink
@@ -2,6 +2,8 @@
 add_newline = false
 format = """\
   $directory\
+  $git_branch\
+  $git_commit \
   $character\
   """
 
@@ -13,8 +15,11 @@ truncate_to_repo = true
 truncation_length = 100
 
 [git_branch]
-truncation_length = 1
-truncation_symbol = ""
+format = "[$symbol$branch]($style)"
+
+[git_commit]
+commit_has_length = 7
+format = "[\\($hash\\)]($style)"
 
 [git_status]
 format = '([\[$all_status$ahead_behind\]]($style) )'

From fabb4056edfc88a6002db996a6901b7863c2e488 Mon Sep 17 00:00:00 2001
From: Noah Masur <noah.masur@take2games.com>
Date: Mon, 23 Nov 2020 18:25:25 -0500
Subject: [PATCH 2/5] git prompts for modifications

---
 starship/starship.toml.configlink | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/starship/starship.toml.configlink b/starship/starship.toml.configlink
index b99dd74..c376cfc 100644
--- a/starship/starship.toml.configlink
+++ b/starship/starship.toml.configlink
@@ -3,7 +3,8 @@ add_newline = false
 format = """\
   $directory\
   $git_branch\
-  $git_commit \
+  $git_commit\
+  $git_status\
   $character\
   """
 
@@ -15,14 +16,15 @@ truncate_to_repo = true
 truncation_length = 100
 
 [git_branch]
-format = "[$symbol$branch]($style)"
+format = "[$symbol$branch]($style) "
 
 [git_commit]
-commit_has_length = 7
-format = "[\\($hash\\)]($style)"
+format = "[$hash]($style) "
+disabled = false
 
 [git_status]
-format = '([\[$all_status$ahead_behind\]]($style) )'
+format = "[$all_status$ahead_behind]($style) "
+style = "red"
 # prefix = ""
 # suffix = ""
 

From a15bad05137efc03738f373087166032cbc88961 Mon Sep 17 00:00:00 2001
From: Noah Masur <noah.masur@take2games.com>
Date: Mon, 23 Nov 2020 18:26:40 -0500
Subject: [PATCH 3/5] change spacing

---
 starship/starship.toml.configlink | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/starship/starship.toml.configlink b/starship/starship.toml.configlink
index c376cfc..826da09 100644
--- a/starship/starship.toml.configlink
+++ b/starship/starship.toml.configlink
@@ -1,6 +1,7 @@
 # Don't print a new line at the start of the prompt
 add_newline = false
 format = """\
+  $cmd_duration\
   $directory\
   $git_branch\
   $git_commit\
@@ -11,12 +12,17 @@ format = """\
 [character]
 symbol = "❯"
 
+[cmd_duration]
+min_time = 3_000
+show_notifications = true
+min_time_to_notify = 30_000
+
 [directory]
 truncate_to_repo = true
 truncation_length = 100
 
 [git_branch]
-format = "[$symbol$branch]($style) "
+format = "[$symbol$branch]($style)"
 
 [git_commit]
 format = "[$hash]($style) "
@@ -24,9 +30,17 @@ disabled = false
 
 [git_status]
 format = "[$all_status$ahead_behind]($style) "
+conflicted = " ="
+ahead = " ⇡"
+behind = " ⇣"
+diverged = " ⇕"
+untracked = " ?"
+stashed = " $"
+modified = " !"
+staged = " +"
+renamed = " »"
+deleted = " ✘"
 style = "red"
-# prefix = ""
-# suffix = ""
 
 [python]
 symbol = ""

From 8941ad203dd53d5827041883e77f7ef7bcb23e04 Mon Sep 17 00:00:00 2001
From: Noah Masur <noah.masur@take2games.com>
Date: Mon, 23 Nov 2020 18:41:10 -0500
Subject: [PATCH 4/5] remove cmd_duration for starship, unnecessary

---
 starship/starship.toml.configlink | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/starship/starship.toml.configlink b/starship/starship.toml.configlink
index 826da09..5be8b31 100644
--- a/starship/starship.toml.configlink
+++ b/starship/starship.toml.configlink
@@ -1,7 +1,6 @@
 # Don't print a new line at the start of the prompt
 add_newline = false
 format = """\
-  $cmd_duration\
   $directory\
   $git_branch\
   $git_commit\
@@ -16,6 +15,7 @@ symbol = "❯"
 min_time = 3_000
 show_notifications = true
 min_time_to_notify = 30_000
+format = "[$duration]($style) "
 
 [directory]
 truncate_to_repo = true

From cc2c9767b78b75160bbf6b810331026f87cb1afd Mon Sep 17 00:00:00 2001
From: Noah Masur <noah.masur@take2games.com>
Date: Mon, 23 Nov 2020 18:47:30 -0500
Subject: [PATCH 5/5] change symbols

---
 starship/starship.toml.configlink | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/starship/starship.toml.configlink b/starship/starship.toml.configlink
index 5be8b31..ee22832 100644
--- a/starship/starship.toml.configlink
+++ b/starship/starship.toml.configlink
@@ -34,9 +34,9 @@ conflicted = " ="
 ahead = " ⇡"
 behind = " ⇣"
 diverged = " ⇕"
-untracked = " ?"
-stashed = " $"
-modified = " !"
+untracked = " ⋄"
+stashed = " ⩮"
+modified = " ∽"
 staged = " +"
 renamed = " »"
 deleted = " ✘"