Skip to content

Commit 07e2f62

Browse files
jonasmalacofilhojonasmalacofilho
committed
fish: update/pin all plugins and switch to ayu as well
1 parent a70e608 commit 07e2f62

58 files changed

Lines changed: 640 additions & 469 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎fish/completions/tide.fish‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
complete tide --no-files
22

3-
set -l subcommands bug-report configure
3+
set -l subcommands bug-report configure reload
44

55
complete tide -x -n __fish_use_subcommand -a bug-report -d "Print info for use in bug reports"
66
complete tide -x -n __fish_use_subcommand -a configure -d "Run the configuration wizard"
7+
complete tide -x -n __fish_use_subcommand -a reload -d "Reload tide configuration"
78

89
complete tide -x -n "not __fish_seen_subcommand_from $subcommands" -s h -l help -d "Print help message"
910
complete tide -x -n "not __fish_seen_subcommand_from $subcommands" -s v -l version -d "Print tide version"

‎fish/conf.d/_tide_init.fish‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ function _tide_init_install --on-event _tide_init_install
1111
if contains ilancosman/tide (string lower $_fisher_plugins)
1212
set_color bryellow
1313
echo "ilancosman/tide is a development branch. Please install from a release tag:"
14-
echo -ns "fisher install ilancosman/tide@v5" | fish_indent --ansi
14+
_tide_fish_colorize "fisher install ilancosman/tide@v6"
1515
sleep 3
1616
end
1717

1818
switch (read --prompt-str="Configure tide prompt? [Y/n] " | string lower)
1919
case y ye yes ''
2020
tide configure
2121
case '*'
22-
echo -s \n 'Run ' (echo -ns "tide configure" | fish_indent --ansi) ' to customize your prompt.'
22+
echo -s \n 'Run ' (_tide_fish_colorize "tide configure") ' to customize your prompt.'
2323
end
2424
end
2525
end
@@ -29,9 +29,12 @@ function _tide_init_update --on-event _tide_init_update
2929
if contains ilancosman/tide (string lower $_fisher_plugins)
3030
set_color bryellow
3131
echo "ilancosman/tide is a development branch. Please install from a release tag:"
32-
echo -ns "fisher install ilancosman/tide@v5" | fish_indent --ansi
32+
_tide_fish_colorize "fisher install ilancosman/tide@v6"
3333
sleep 3
3434
end
35+
36+
# Set (disable) the new jobs variable
37+
set -q tide_jobs_number_threshold || set -U tide_jobs_number_threshold 1000
3538
end
3639

3740
function _tide_init_uninstall --on-event _tide_init_uninstall

‎fish/fish_plugins‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
fischerling/plugin-wd
2-
oh-my-fish/plugin-pbcopy
3-
ilancosman/tide@v5
1+
fischerling/plugin-wd@ac46fb36724fa17d97965f9829ae29c61ec1e109
2+
oh-my-fish/plugin-pbcopy@e8d78bb01f66246f7996a4012655b8ddbad777c2
3+
ilancosman/tide@a34b0c2809f665e854d6813dd4b052c1b32a32b4

‎fish/functions/_tide_detect_os.fish‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ function _tide_detect_os_linux_cases -a file key
6969
printf %s\n$defaultColor # Doesn't really have a logo, and the colors are too close to PWD blue anyway
7070
case ubuntu
7171
printf %s\n  E95420 D4D4D4 # https://design.ubuntu.com/brand/
72+
case void
73+
printf %s\n  FFFFFF 478061 # from https://alpha.de.repo.voidlinux.org/logos/void.svg
7274
case '*'
7375
return 1
7476
end

‎fish/functions/_tide_fish_colorize.fish‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
function _tide_fish_colorize
2+
if command -q fish_indent
3+
echo -ns "$argv" | fish_indent --ansi
4+
else
5+
echo -ns "$argv"
6+
end
7+
end

‎fish/functions/_tide_item_chruby.fish‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎fish/functions/_tide_item_context.fish‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
function _tide_item_context
22
if set -q SSH_TTY
3-
set -lx tide_context_color $tide_context_color_ssh
4-
test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER ||
5-
h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts])
3+
set -fx tide_context_color $tide_context_color_ssh
64
else if test "$EUID" = 0
7-
set -lx tide_context_color $tide_context_color_root
8-
test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER ||
9-
h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts])
5+
set -fx tide_context_color $tide_context_color_root
106
else if test "$tide_context_always_display" = true
11-
set -lx tide_context_color $tide_context_color_default
12-
test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER ||
13-
h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts])
7+
set -fx tide_context_color $tide_context_color_default
8+
else
9+
return
1410
end
11+
12+
string match -qr "^(?<h>(\.?[^\.]*){0,$tide_context_hostname_parts})" @$hostname
13+
_tide_print_item context $USER$h
1514
end

‎fish/functions/_tide_item_crystal.fish‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
function _tide_item_crystal
2-
path is $_tide_parent_dirs/shard.yml &&
3-
_tide_print_item crystal $tide_crystal_icon' ' (crystal --version | string match -r "[\d.]+")[1]
2+
if path is $_tide_parent_dirs/shard.yml
3+
crystal --version | string match -qr "(?<v>[\d.]+)"
4+
_tide_print_item crystal $tide_crystal_icon' ' $v
5+
end
46
end

‎fish/functions/_tide_item_direnv.fish‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
function _tide_item_direnv
22
set -q DIRENV_DIR || return
3-
direnv status | string match -q 'Found RC allowed false' \
4-
&& set -lx tide_direnv_color $tide_direnv_color_denied \
5-
&& set -lx tide_direnv_bg_color $tide_direnv_bg_color_denied
3+
direnv status | string match -q 'Found RC allowed false' &&
4+
set -lx tide_direnv_color $tide_direnv_color_denied &&
5+
set -lx tide_direnv_bg_color $tide_direnv_bg_color_denied
66
_tide_print_item direnv $tide_direnv_icon
77
end

‎fish/functions/_tide_item_gcloud.fish‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
function _tide_item_gcloud
22
set -q CLOUDSDK_CONFIG || set -l CLOUDSDK_CONFIG ~/.config/gcloud
3-
path is $CLOUDSDK_CONFIG/active_config \
4-
&& read -l config <$CLOUDSDK_CONFIG/active_config \
5-
&& path is $CLOUDSDK_CONFIG/configurations/config_$config \
6-
&& string match -qr '^\s*project\s*=\s*(?<project>.*)' <$CLOUDSDK_CONFIG/configurations/config_$config \
7-
&& _tide_print_item gcloud $tide_gcloud_icon' ' $project
3+
path is $CLOUDSDK_CONFIG/active_config &&
4+
read -l config <$CLOUDSDK_CONFIG/active_config &&
5+
path is $CLOUDSDK_CONFIG/configurations/config_$config &&
6+
string match -qr '^\s*project\s*=\s*(?<project>.*)' <$CLOUDSDK_CONFIG/configurations/config_$config &&
7+
_tide_print_item gcloud $tide_gcloud_icon' ' $project
88
end

0 commit comments

Comments
 (0)