diff --git a/dotfiles/starship.toml b/dotfiles/starship.toml
index 3597f1f..383e9c7 100644
--- a/dotfiles/starship.toml
+++ b/dotfiles/starship.toml
@@ -1,28 +1,33 @@
 add_newline = false
 
-prompt_order = [
-    "username",
-    "hostname",
-    "kubernetes",
-    "directory",
-    "git_branch",
-    "git_commit",
-    "git_state",
-    "git_status",
-    "nix_shell",
-    "cmd_duration",
-    "custom",
-    "line_break",
-    "jobs",
-    "battery",
-    "character",
-]
+format = """
+$username\
+$hostname\
+$kubernetes\
+$directory\
+$git_branch\
+$git_commit\
+$git_state\
+$git_status\
+$nix_shell\
+$cmd_duration\
+$custom\
+$line_break\
+$jobs\
+$battery\
+$character\
+"""
 
 [username]
 show_always = true
+format = "[$user]($style)@"
 
 [hostname]
 ssh_only = false
+format = "[$hostname]($style) "
+
+[git_branch]
+format = "[$symbol$branch]($style)"
 
 [character]
 use_symbol_for_status = false