diff --git a/fake_home/.config/starship.toml b/fake_home/.config/starship.toml
index 9d1fa2c..2138f06 100644
--- a/fake_home/.config/starship.toml
+++ b/fake_home/.config/starship.toml
@@ -1,5 +1,6 @@
 add_newline = true
 format = """
+$git_status\
 ${custom.username}\
 $hostname\
 $shlvl\
@@ -9,7 +10,6 @@ $git_branch\
 $git_commit\
 $git_state\
 $git_metrics\
-$git_status\
 $hg_branch\
 $vcsh\
 $java\
@@ -109,3 +109,21 @@ format = 'via [$symbol($version) (◎ $tfm )]($style)'
 command = 'echo "[$(whoami | sed "s/vaillancourt//")]"'
 when = true
 style = 'bold red'
+
+[hostname]
+ssh_symbol = '🌐'
+format = '[$ssh_symbol](bold blue) [$hostname](bold dimmed green) '
+
+[git_status]
+conflicted = "=conflicted "
+ahead = "⇡ahead "
+behind = "⇣behind "
+diverged = "⇕diverged "
+untracked = "?untracked "
+stashed = "\\$stashed "
+modified = "!modified "
+staged = "[++($count)](green)"
+renamed = "»renamed "
+deleted = "✘deleted "
+format = "[$all_status]($style)\n"
+style = 'red dimmed'