Include user in prompt if not the normal user

fish/config.fish

@@ -23,6 +23,8 @@ set -g fish_color_valid_path normal
 set -g fish_color_vcs 43d696
 set -g fish_color_vcs_braces 29bc7d
 
+set -g fish_normal_user js
+
 test -n "$XDG_CONFIG_HOME"
 or set -x XDG_CONFIG_HOME $HOME/.config
 test -n "$XDG_CACHE_HOME"

fish/functions/fish_prompt.fish

@@ -21,7 +21,8 @@ function fish_prompt --description 'Write out the prompt'
                 (set_color $fish_color_vcs_braces)")"
     end
 
-    echo -n -s (set_color $fish_color_host) (prompt_hostname) ' ' \
+    echo -n -s (set_color $fish_color_host) (prompt_user) (prompt_hostname) \
-               (set_color $fish_color_cwd) (prompt_pwd) (string join '' $vcs) \
+               ' ' (set_color $fish_color_cwd) (prompt_pwd) \
-               (set_color $fish_color_suffix) $suffix (set_color normal) ' '
+               (string join '' $vcs) (set_color $fish_color_suffix) $suffix \
+               (set_color normal) ' '
 end

fish/functions/prompt_user.fish

@@ -0,0 +1,5 @@
+function prompt_user
+    if test (whoami) != "$fish_normal_user"
+        echo (whoami)"@"
+    end
+end

zshrc

@@ -14,6 +14,7 @@ local ls=""
 local ls_color="auto"
 local ls_on_cd="yes"
 local ls_on_init="no"
+local normal_user="js"
 
 if [ "$COLORTERM" = "24bit" -o "$COLORTERM" = "truecolor" \
     -o "$terminfo[colors]" = 16777216 ]; then
@@ -99,7 +100,11 @@ set_prompt() {
 		branch+="%F{$color_vcs_braces})"
 	fi
 
-	PS1="%F{$color_host}%m %F{$color_cwd}%c$branch"
+	if [ "$(whoami)" != "$normal_user" ]; then
+		local user="%n@"
+	fi
+
+	PS1="%F{$color_host}$user%m %F{$color_cwd}%c$branch"
 	PS1+="%F{$color_suffix}%(!.#.>)%f "
 	PS2="%B>%b "
 	RPS1="%(1j.%F{$color_jobs}%B%j%b%f.)%(?..%(1j. .)"