configs  Check-in [714fa0f964]

Overview
Comment:fish: Better colors
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 714fa0f964fcf30362b4f857bfced4590d1fab8478b81b122466acb037642dd5
User & Date: js 2020-01-21 21:32:32
Context
2020-01-21
23:04
fish: Better prompt for root check-in: dc711ef8ab user: js tags: trunk
21:32
fish: Better colors check-in: 714fa0f964 user: js tags: trunk
00:15
gpg.conf: Set s2k-digest-algo to SHA512 check-in: 6ea954fde6 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
33

34
35
36
37
38
39
40

# 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:5f87d7
SETUVAR fish_color_comment:ff8787
SETUVAR fish_color_cwd:c0b090
SETUVAR fish_color_cwd_root:800000
SETUVAR fish_color_end:afffd7
SETUVAR fish_color_error:ff6060
SETUVAR fish_color_escape:00a6b2
SETUVAR fish_color_history_current:normal
SETUVAR fish_color_host:a08080
SETUVAR fish_color_jobs:ffff60
SETUVAR fish_color_match:normal
SETUVAR fish_color_normal:normal
SETUVAR fish_color_operator:8fdf3f
SETUVAR fish_color_param:87afd7
SETUVAR fish_color_quote:ffaf5f
SETUVAR fish_color_redirection:f090d0
SETUVAR fish_color_search_match:ffff00
SETUVAR fish_color_selection:c0c0c0
SETUVAR fish_color_suffix:ffffe0
SETUVAR fish_color_user:00ff00
SETUVAR fish_color_valid_path:normal

SETUVAR fish_color_vcs:cfffb0
SETUVAR fish_greeting:
SETUVAR fish_key_bindings:hybrid_bindings
SETUVAR fish_pager_color_completion:normal
SETUVAR fish_pager_color_description:B3A06D\x1eyellow
SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan













|
|
|

|
|


|
|


|
|
|
|


|


>
|







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
33
34
35
36
37
38
39
40
41

# 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_cwd_root:800000
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:6ddfad
SETUVAR fish_color_user:00ff00
SETUVAR fish_color_valid_path:normal
SETUVAR fish_color_vcs:43d696
SETUVAR fish_color_vcs_braces:29bc7d
SETUVAR fish_greeting:
SETUVAR fish_key_bindings:hybrid_bindings
SETUVAR fish_pager_color_completion:normal
SETUVAR fish_pager_color_description:B3A06D\x1eyellow
SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan

Changes to config/fish/functions/bmake.fish. 

1
2
3
4
5
6

7

# pkgsrc does not like MAKEFLAGS being set
function bmake
	if string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
		set -lx MAKEFLAGS
	end
	command bmake $argv

end




|
|
|
>


1
2
3
4
5
6
7
8

# pkgsrc does not like MAKEFLAGS being set
function bmake
	if string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
		env MAKEFLAGS= bmake $argv
	else
		command bmake $argv
	end
end

Changes to config/fish/functions/fish_prompt.fish. 

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

function fish_prompt --description 'Write out the prompt'
	set -l color_cwd
	set -l suffix
	switch "$USER"
		case root toor
			if set -q fish_color_cwd_root
				set color_cwd $fish_color_cwd_root
			else
				set color_cwd $fish_color_cwd
			end
			set suffix '#'
		case '*'
			set color_cwd $fish_color_cwd
			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)"


	end

	echo -n -s (set_color $fish_color_host) (prompt_hostname) ':' \
	    (set_color $color_cwd) (prompt_pwd) \
	    (set_color $fish_color_vcs) "$vcs" \
	    (set_color $fish_color_suffix) "$suffix "
end














|






|
>
>


|
|
<



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

function fish_prompt --description 'Write out the prompt'
	set -l color_cwd
	set -l suffix
	switch "$USER"
		case root toor
			if set -q fish_color_cwd_root
				set color_cwd $fish_color_cwd_root
			else
				set color_cwd $fish_color_cwd
			end
			set suffix '#'
		case '*'
			set color_cwd $fish_color_cwd
			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 (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) (string join "" $vcs) \

	    (set_color $fish_color_suffix) "$suffix "
end

Changes to config/fish/functions/gpgssh.fish. 

1
2
3
4

function gpgssh
	set -x SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
	ssh $argv
end


|



1
2
3
4

function gpgssh
	set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
	ssh $argv
end