fish: Better colors

config/fish/functions/bmake.fish

@@ -1,7 +1,8 @@
 # pkgsrc does not like MAKEFLAGS being set
 function bmake
 	if string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
-		set -lx MAKEFLAGS
+		env MAKEFLAGS= bmake $argv
+	else
+		command bmake $argv
 	end
-	command bmake $argv
 end

config/fish/functions/fish_prompt.fish

@@ -11,18 +11,19 @@ function fish_prompt --description 'Write out the prompt'
 			set suffix '#'
 		case '*'
 			set color_cwd $fish_color_cwd
-			set suffix '$'
+			set suffix '>'
 	end
 
 	set -l branch (git symbolic-ref HEAD 2>/dev/null)
 	set branch (string replace -r "^refs/heads/" "" $branch)
 	set -l vcs
 	if test -n "$branch" -a "$branch" != "master"
-		set vcs "($branch)"
+		set vcs (set_color $fish_color_vcs_braces)"(" \
+		    (set_color $fish_color_vcs)"$branch" \
+		    (set_color $fish_color_vcs_braces)")"
 	end
 
-	echo -n -s (set_color $fish_color_host) (prompt_hostname) ':' \
-	    (set_color $color_cwd) (prompt_pwd) \
-	    (set_color $fish_color_vcs) "$vcs" \
+	echo -n -s (set_color $fish_color_host) (prompt_hostname) ' ' \
+	    (set_color $color_cwd) (prompt_pwd) (string join "" $vcs) \
 	    (set_color $fish_color_suffix) "$suffix "
 end

config/fish/functions/gpgssh.fish

@@ -1,4 +1,4 @@
 function gpgssh
-	set -x SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
+	set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
 	ssh $argv
 end