Modified config/fish/functions/fgrep.fish
from [f114a20ecb]
to [f3b40d9221].
1
2
3
4
5
6
7
|
1
2
3
4
5
6
7
|
-
-
-
-
-
+
+
+
+
+
|
function fgrep
if type -q ggrep
command ggrep -F --color=auto $argv
else
command fgrep --color=auto $argv
end
if type -q ggrep
command ggrep -F --color=auto $argv
else
command fgrep --color=auto $argv
end
end
|
Modified config/fish/functions/fish_prompt.fish
from [9d2d156587]
to [9b3d902cb4].
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
|
function fish_prompt --description 'Write out the prompt'
set -l suffix
switch "$USER"
case root toor
set suffix (set_color $fish_color_cwd_root)'#'
case '*'
set suffix '>'
end
set -l suffix
switch "$USER"
case root toor
set suffix (set_color $fish_color_cwd_root)'#'
case '*'
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
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 $fish_color_cwd) (prompt_pwd) (string join '' $vcs) \
(set_color $fish_color_suffix) $suffix (set_color normal) ' '
echo -n -s (set_color $fish_color_host) (prompt_hostname) ' ' \
(set_color $fish_color_cwd) (prompt_pwd) (string join '' $vcs) \
(set_color $fish_color_suffix) $suffix (set_color normal) ' '
end
|
Modified config/fish/functions/fish_right_prompt.fish
from [b9d40de7cb]
to [c3b1ccadfe].
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
|
function fish_right_prompt
set -l code $status
set -l jobs (jobs | wc -l)
set -l prompt
set -l code $status
set -l jobs (jobs | wc -l)
set -l prompt
test $jobs -gt 0
and set -a prompt (set_color $fish_color_jobs)$jobs
test $jobs -gt 0
and set -a prompt (set_color $fish_color_jobs)$jobs
test $code -gt 0
and set -a prompt (set_color $fish_color_status)$code
test $code -gt 0
and set -a prompt (set_color $fish_color_status)$code
echo $prompt
echo $prompt
set_color normal
set_color normal
end
|
Modified config/fish/functions/fish_title.fish
from [6f6b7e4d33]
to [d77fc27e41].
1
2
3
|
1
2
3
|
-
+
|
function fish_title
echo (status current-command) · (prompt_pwd) · (prompt_hostname)
echo (status current-command) · (prompt_pwd) · (prompt_hostname)
end
|
Modified config/fish/functions/gpg-sftp.fish
from [dabe1c465d]
to [f93bf4a3f1].
1
2
3
4
|
1
2
3
4
|
-
-
+
+
|
function gpg-sftp
set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
sftp $argv
set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
sftp $argv
end
|
Modified config/fish/functions/gpg-ssh-add.fish
from [8d872804bf]
to [0c5b286b1c].
1
2
3
4
|
1
2
3
4
|
-
-
+
+
|
function gpg-ssh-add
set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
ssh-add $argv
set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
ssh-add $argv
end
|
Modified config/fish/functions/gpg-ssh.fish
from [fe9a819afe]
to [58300131b1].
1
2
3
4
|
1
2
3
4
|
-
-
+
+
|
function gpg-ssh
set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
ssh $argv
set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
ssh $argv
end
|
Modified config/fish/functions/grep.fish
from [2009a4dbf8]
to [6aa6b9caa3].
1
2
3
4
5
6
7
|
1
2
3
4
5
6
7
|
-
-
-
-
-
+
+
+
+
+
|
function grep
if type -q ggrep
command ggrep --color=auto $argv
else
command grep --color=auto $argv
end
if type -q ggrep
command ggrep --color=auto $argv
else
command grep --color=auto $argv
end
end
|
Modified config/fish/functions/ixio.fish
from [dfb5b4ed84]
to [ef11242662].
1
2
3
|
1
2
3
|
-
+
|
function ixio
curl -F 'f:1=<-' ix.io
curl -F 'f:1=<-' ix.io
end
|
Modified config/fish/functions/ls.fish
from [98d8040878]
to [9c1f68ea69].
1
2
3
4
5
6
7
|
1
2
3
4
5
6
7
|
-
-
-
-
-
+
+
+
+
+
|
function ls --description 'List contents of directory'
if type -q gls
command gls --color=auto $argv
else
command ls --color=auto $argv
end
if type -q gls
command gls --color=auto $argv
else
command ls --color=auto $argv
end
end
|
Modified config/fish/functions/make.fish
from [eff67be8e7]
to [db39a92d5b].
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
|
# Automatically use bmake instead of make when using pkgsrc, if necessary
function make
if string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
# pkgsrc does not like MAKEFLAGS including -j
set -lx MAKEFLAGS
if string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
# pkgsrc does not like MAKEFLAGS including -j
set -lx MAKEFLAGS
if type -q bmake
command bmake $argv
else
command make $argv
end
else
command make $argv
end
if type -q bmake
command bmake $argv
else
command make $argv
end
else
command make $argv
end
end
|
Modified config/fish/functions/mpv.fish
from [e6ed60675a]
to [da400c015e].
1
2
3
4
5
|
1
2
3
4
5
|
-
-
+
+
|
# To work around mpv not liking locales that use , as a decimal separator
function mpv
set -x LC_ALL C
command mpv $argv
set -lx LC_ALL C
command mpv $argv
end
|
Modified config/fish/functions/pkg_chk.fish
from [0bce235ea1]
to [8f8508d4a0].
1
2
3
4
|
1
2
3
4
|
-
-
+
+
|
function pkg_chk
set -lx MAKEFLAGS
command pkg_chk $argv
set -lx MAKEFLAGS
command pkg_chk $argv
end
|
Modified config/fish/functions/pkg_rolling-replace.fish
from [595e496098]
to [cd3fbe3fd9].
1
2
3
4
|
1
2
3
4
|
-
-
+
+
|
function pkg_rolling-replace
set -lx MAKEFLAGS
command pkg_rolling-replace $argv
set -lx MAKEFLAGS
command pkg_rolling-replace $argv
end
|
Modified config/fish/functions/prompt_pwd.fish
from [5e26245763]
to [be6aa8e75b].
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
|
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
-
+
|
function prompt_pwd --description 'Print the current working directory'
set -l options 'h/help'
argparse -n prompt_pwd --max-args=0 $options -- $argv
or return
set -l options 'h/help'
argparse -n prompt_pwd --max-args=0 $options -- $argv
or return
if set -q _flag_help
__fish_print_help prompt_pwd
return 0
end
if set -q _flag_help
__fish_print_help prompt_pwd
return 0
end
# Replace $HOME with "~"
set realhome ~
set -l tmp (string replace -r '^'"$realhome"'($|/)' '~$1' $PWD)
# Replace $HOME with "~"
set realhome ~
set -l tmp (basename (string replace -r '^'"$realhome"'($|/)' '~$1' $PWD))
set tmp (basename $tmp)
test $PWD = "/$tmp"
and set tmp $PWD
test $PWD = "/$tmp"
and set tmp $PWD
echo $tmp
echo $tmp
end
|
Modified config/fish/functions/pw.fish
from [8140148617]
to [d82ba2ca27].
1
2
3
4
5
6
7
8
9
10
11
12
13
|
1
2
3
4
5
6
7
8
9
10
11
12
13
|
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
|
function pw
set -l clipboard
if type -q pbcopy
set clipboard pbcopy
else if type -q xclip
set clipboard xclip
else
echo "No clipboard handler found!"
return 1
end
set -l clipboard
if type -q pbcopy
set clipboard pbcopy
else if type -q xclip
set clipboard xclip
else
echo "No clipboard handler found!"
return 1
end
cryptopassphrase -k ~/.scrypt-pwgen.key $argv | tr -d '\n' | $clipboard
cryptopassphrase -k ~/.scrypt-pwgen.key $argv | tr -d '\n' | $clipboard
end
|
Added config/fish/functions/pws.fish version [0888de4a7d].
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
function pws
set -l clipboard
if type -q pbcopy
set clipboard pbcopy
else if type -q xclip
set clipboard xclip
else
echo "No clipboard handler found!"
return 1
end
cryptopassphrase -k ~/.scrypt-pwgen-server.key $argv \
| tr -d '\n' | $clipboard
end
|
| | | | | | | | | | | | |
Modified config/fish/functions/url2pkg.fish
from [a0d509573a]
to [176b668a6a].
1
2
3
4
5
|
1
2
3
4
5
|
-
-
+
+
|
# pkgsrc does not like MAKEFLAGS being set
function url2pkg
set -lx MAKEFLAGS
command url2pkg $argv
set -lx MAKEFLAGS
command url2pkg $argv
end
|