1
1
Fork 0

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.
This commit is contained in:
Jonathan Schleifer 2020-01-22 21:38:12 +00:00
parent 7a0ff40deb
commit e66fcd297f
7 changed files with 14 additions and 9 deletions

View file

@ -10,7 +10,7 @@ SETUVAR _fish_abbr_gpg:gpg2
SETUVAR _fish_abbr_vi:vim SETUVAR _fish_abbr_vi:vim
SETUVAR fish_color_autosuggestion:4e4e4e SETUVAR fish_color_autosuggestion:4e4e4e
SETUVAR fish_color_cancel:normal SETUVAR fish_color_cancel:normal
SETUVAR fish_color_command:003cb3 SETUVAR fish_color_command:205cb3
SETUVAR fish_color_comment:6600cc SETUVAR fish_color_comment:6600cc
SETUVAR fish_color_cwd:209060 SETUVAR fish_color_cwd:209060
SETUVAR fish_color_end:730099 SETUVAR fish_color_end:730099
@ -21,8 +21,8 @@ SETUVAR fish_color_host:176945
SETUVAR fish_color_jobs:ffff00 SETUVAR fish_color_jobs:ffff00
SETUVAR fish_color_match:normal SETUVAR fish_color_match:normal
SETUVAR fish_color_normal:normal SETUVAR fish_color_normal:normal
SETUVAR fish_color_operator:cc33ff SETUVAR fish_color_operator:cc6fdf
SETUVAR fish_color_param:3377ff SETUVAR fish_color_param:3377cf
SETUVAR fish_color_quote:ff751a SETUVAR fish_color_quote:ff751a
SETUVAR fish_color_redirection:bf4080 SETUVAR fish_color_redirection:bf4080
SETUVAR fish_color_search_match:ffff00 SETUVAR fish_color_search_match:ffff00

View file

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

View file

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

View file

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

View file

@ -1,6 +1,7 @@
# Automatically use bmake instead of make when using pkgsrc # Automatically use bmake instead of make when using pkgsrc
function make 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 # pkgsrc does not like MAKEFLAGS including -j
env MAKEFLAGS= bmake $argv env MAKEFLAGS= bmake $argv
else else

View file

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

View file

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