diff --git a/starship.toml b/starship.toml
index 7e57e6a..0a6a32b 100644
--- a/starship.toml
+++ b/starship.toml
@@ -4,14 +4,13 @@ add_newline = false
 continuation_prompt = "[▸▹ ](dimmed white)"
 
 format = """($nix_shell$container$fill$git_metrics\n)$cmd_duration\
-$hostname\
 $localip\
 $shlvl\
 $shell\
 $env_var\
 $jobs\
 $sudo\
-$username\
+$username$hostname\
 $character"""
 
 right_format = """
@@ -112,9 +111,14 @@ disabled = false
 [username]
 style_user = "bright-yellow bold italic"
 style_root = "purple bold italic"
-format = "[⭘ $user]($style) "
+format = "[⭘ ](bold dimmed green)[$user]($style)"
 disabled = false
-show_always = false
+show_always = true
+
+[hostname]
+ssh_only = false
+format = '[@$hostname ]($style)'
+style = "bold dimmed green"
 
 [directory]
 home_symbol = "⌂"