diff --git a/.tmux.conf b/.tmux.conf
index 0c8f0ad..264f2ea 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -21,13 +21,14 @@ set -g @nova-status-style-active-bg "#89c0d0"
 set -g @nova-status-style-active-fg "#2e3540"
 set -g @nova-status-style-double-bg "#2d3540"
 
-set -g @nova-pane "#I#{?pane_in_mode,  #{pane_mode},}  #W"
-
 set -g @nova-segment-mode "#{?client_prefix,Ω,ω}"
 set -g @nova-segment-mode-colors "#78a2c1 #2e3440"
 
-set -g @nova-segment-whoami "#(whoami)@#h"
-set -g @nova-segment-whoami-colors "#78a2c1 #2e3440"
+set -g @nova-segment-whoami '#(gitmux "#{pane_current_path}")'
+set -g @nova-segment-whoami-colors "#2d3540 #2e3440"
+
+
+set -g @nova-pane "#I#{?pane_in_mode,  #{pane_mode},}  #W"
 
 set -g @nova-rows 0
 set -g @nova-segments-0-left "mode"
@@ -76,6 +77,3 @@ bind -n C-k select-pane -D
 
 # Enable mouse
 set -g mouse on
-
-# Git on status bar
-set -g status-right '#(gitmux "#{pane_current_path}")'