fish: Slightly change command and operator color

This is the exact same color in Apple Terminal, but improves legibility
in Gnome Terminal.

Also silences stderr from which.

config/fish/functions/fgrep.fish

@@ -1,5 +1,5 @@
 function fgrep
-	if which ggrep >/dev/null
+	if which ggrep >/dev/null ^&1
 		command ggrep -F --color=auto $argv
 	else
 		command fgrep --color=auto $argv

config/fish/functions/grep.fish

@@ -1,5 +1,5 @@
 function grep
-	if which ggrep >/dev/null
+	if which ggrep >/dev/null ^&1
 		command ggrep --color=auto $argv
 	else
 		command grep --color=auto $argv

config/fish/functions/ls.fish

@@ -1,5 +1,5 @@
 function ls --description 'List contents of directory'
-	if which gls >/dev/null
+	if which gls >/dev/null ^&1
 		command gls --color=auto $argv
 	else
 		command ls --color=auto $argv

config/fish/functions/make.fish

@@ -1,6 +1,7 @@
 # Automatically use bmake instead of make when using pkgsrc
 function make
-	if which bmake >/dev/null && string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
+	if which bmake >/dev/null ^&1 && \
+	    string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
 		# pkgsrc does not like MAKEFLAGS including -j
 		env MAKEFLAGS= bmake $argv
 	else

config/fish/functions/pkg_rolling-replace.fish

@@ -0,0 +1,4 @@
+function pkg_rolling-replace
+	set -lx MAKEFLAGS
+	command pkg_rolling-replace $argv
+end

config/fish/functions/pw.fish

@@ -1,8 +1,8 @@
 function pw
 	set -l clipboard
-	if which pbcopy >/dev/null
+	if which pbcopy >/dev/null ^&1
 		set clipboard pbcopy
-	else if which xclip >/dev/null
+	else if which xclip >/dev/null ^&1
 		set clipboard xclip
 	else
 		echo "No clipboard handler found!"