configs  Check-in [c22a3e608c]

Overview
Comment: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.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: c22a3e608c7dc935584f8431be0f5be125b3edf46fe665948514dac27f4ac632
User & Date: js 2020-01-22 21:38:13
Context
2020-01-24
03:21
fish: Set a nicer title check-in: 1c4afa3fc9 user: js tags: trunk
2020-01-22
21:38
fish: Slightly change command and operator color check-in: c22a3e608c user: js tags: trunk
20:44
fish: Restore color after prompt check-in: efaabe0fb7 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to config/fish/fish_variables.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
# This file contains fish universal variable definitions.
# VERSION: 3.0
SETUVAR EDITOR:vim
SETUVAR --export LS_COLORS:di\x3d34\x3aow\x3d44\x3b37\x3atw\x3d44\x3b37\x3ast\x3d44\x3b37\x3aex\x3d31\x3asu\x3d7\x3b31\x3asg\x3d7\x3b31\x3aln\x3d33\x3aor\x3d7\x3b33\x3api\x3d32\x3ado\x3d32\x3abd\x3d35\x3acd\x3d35\x3aso\x3d32\x3a\x2a\x2ebz2\x3d36\x3a\x2a\x2edmg\x3d36\x3a\x2a\x2egz\x3d36\x3a\x2a\x2egpg\x3d36\x3a\x2a\x2erar\x3d36\x3a\x2a\x2etar\x3d36\x3a\x2a\x2etbz2\x3d36\x3a\x2a\x2etgz\x3d36\x3a\x2a\x2exz\x3d36\x3a\x2a\x2ezip\x3d36\x3a\x2a\x2eorig\x3d90\x3a\x2a\x7e\x3d90
SETUVAR --export MAKEFLAGS:\x2dj\x2016
SETUVAR __fish_init_2_39_8:\x1d
SETUVAR __fish_init_2_3_0:\x1d
SETUVAR __fish_init_3_x:\x1d
SETUVAR _fish_abbr_gpg:gpg2
SETUVAR _fish_abbr_vi:vim
SETUVAR fish_color_autosuggestion:4e4e4e
SETUVAR fish_color_cancel:normal
SETUVAR fish_color_command:003cb3
SETUVAR fish_color_comment:6600cc
SETUVAR fish_color_cwd:209060
SETUVAR fish_color_end:730099
SETUVAR fish_color_error:ff0000
SETUVAR fish_color_escape:00a6b2
SETUVAR fish_color_history_current:normal
SETUVAR fish_color_host:176945
SETUVAR fish_color_jobs:ffff00
SETUVAR fish_color_match:normal
SETUVAR fish_color_normal:normal
SETUVAR fish_color_operator:cc33ff
SETUVAR fish_color_param:3377ff
SETUVAR fish_color_quote:ff751a
SETUVAR fish_color_redirection:bf4080
SETUVAR fish_color_search_match:ffff00
SETUVAR fish_color_selection:c0c0c0
SETUVAR fish_color_suffix:29bc7d
SETUVAR fish_color_user:00ff00
SETUVAR fish_color_valid_path:normal












|










|
|







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
# This file contains fish universal variable definitions.
# VERSION: 3.0
SETUVAR EDITOR:vim
SETUVAR --export LS_COLORS:di\x3d34\x3aow\x3d44\x3b37\x3atw\x3d44\x3b37\x3ast\x3d44\x3b37\x3aex\x3d31\x3asu\x3d7\x3b31\x3asg\x3d7\x3b31\x3aln\x3d33\x3aor\x3d7\x3b33\x3api\x3d32\x3ado\x3d32\x3abd\x3d35\x3acd\x3d35\x3aso\x3d32\x3a\x2a\x2ebz2\x3d36\x3a\x2a\x2edmg\x3d36\x3a\x2a\x2egz\x3d36\x3a\x2a\x2egpg\x3d36\x3a\x2a\x2erar\x3d36\x3a\x2a\x2etar\x3d36\x3a\x2a\x2etbz2\x3d36\x3a\x2a\x2etgz\x3d36\x3a\x2a\x2exz\x3d36\x3a\x2a\x2ezip\x3d36\x3a\x2a\x2eorig\x3d90\x3a\x2a\x7e\x3d90
SETUVAR --export MAKEFLAGS:\x2dj\x2016
SETUVAR __fish_init_2_39_8:\x1d
SETUVAR __fish_init_2_3_0:\x1d
SETUVAR __fish_init_3_x:\x1d
SETUVAR _fish_abbr_gpg:gpg2
SETUVAR _fish_abbr_vi:vim
SETUVAR fish_color_autosuggestion:4e4e4e
SETUVAR fish_color_cancel:normal
SETUVAR fish_color_command:205cb3
SETUVAR fish_color_comment:6600cc
SETUVAR fish_color_cwd:209060
SETUVAR fish_color_end:730099
SETUVAR fish_color_error:ff0000
SETUVAR fish_color_escape:00a6b2
SETUVAR fish_color_history_current:normal
SETUVAR fish_color_host:176945
SETUVAR fish_color_jobs:ffff00
SETUVAR fish_color_match:normal
SETUVAR fish_color_normal:normal
SETUVAR fish_color_operator:cc6fdf
SETUVAR fish_color_param:3377cf
SETUVAR fish_color_quote:ff751a
SETUVAR fish_color_redirection:bf4080
SETUVAR fish_color_search_match:ffff00
SETUVAR fish_color_selection:c0c0c0
SETUVAR fish_color_suffix:29bc7d
SETUVAR fish_color_user:00ff00
SETUVAR fish_color_valid_path:normal

Changes to config/fish/functions/fgrep.fish.

1
2
3
4
5
6
7
function fgrep
	if which ggrep >/dev/null
		command ggrep -F --color=auto $argv
	else
		command fgrep --color=auto $argv
	end
end

|





1
2
3
4
5
6
7
function fgrep
	if which ggrep >/dev/null ^&1
		command ggrep -F --color=auto $argv
	else
		command fgrep --color=auto $argv
	end
end

Changes to config/fish/functions/grep.fish.

1
2
3
4
5
6
7
function grep
	if which ggrep >/dev/null
		command ggrep --color=auto $argv
	else
		command grep --color=auto $argv
	end
end

|





1
2
3
4
5
6
7
function grep
	if which ggrep >/dev/null ^&1
		command ggrep --color=auto $argv
	else
		command grep --color=auto $argv
	end
end

Changes to config/fish/functions/ls.fish.

1
2
3
4
5
6
7
function ls --description 'List contents of directory'
	if which gls >/dev/null
		command gls --color=auto $argv
	else
		command ls --color=auto $argv
	end
end

|





1
2
3
4
5
6
7
function ls --description 'List contents of directory'
	if which gls >/dev/null ^&1
		command gls --color=auto $argv
	else
		command ls --color=auto $argv
	end
end

Changes to config/fish/functions/make.fish.

1
2

3
4
5
6
7
8
9
# Automatically use bmake instead of make when using pkgsrc
function make

	if which bmake >/dev/null && string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
		# pkgsrc does not like MAKEFLAGS including -j
		env MAKEFLAGS= bmake $argv
	else
		command make $argv
	end
end


>
|






1
2
3
4
5
6
7
8
9
10
# Automatically use bmake instead of make when using pkgsrc
function make
	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
		command make $argv
	end
end

Added config/fish/functions/pkg_rolling-replace.fish.









>
>
>
>
1
2
3
4
function pkg_rolling-replace
	set -lx MAKEFLAGS
	command pkg_rolling-replace $argv
end

Changes to config/fish/functions/pw.fish.

1
2
3
4
5
6
7
8
9
10
11
12
function pw
	set -l clipboard
	if which pbcopy >/dev/null
		set clipboard pbcopy
	else if which xclip >/dev/null
		set clipboard xclip
	else
		echo "No clipboard handler found!"
		return 1
	end

	cryptopassphrase -k ~/.scrypt-pwgen.key $argv | tr -d '\n' | $clipboard


|

|







1
2
3
4
5
6
7
8
9
10
11
12
function pw
	set -l clipboard
	if which pbcopy >/dev/null ^&1
		set clipboard pbcopy
	else if which xclip >/dev/null ^&1
		set clipboard xclip
	else
		echo "No clipboard handler found!"
		return 1
	end

	cryptopassphrase -k ~/.scrypt-pwgen.key $argv | tr -d '\n' | $clipboard