Skip to content

Commit d06bddd

Browse files
authored
Merge pull request #281 from djensenius/fish-stuff
Fish fixes
2 parents aef01dd + 56f67ba commit d06bddd

6 files changed

Lines changed: 66 additions & 1 deletion

File tree

fish/completions/docker.fish

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Applications/OrbStack.app/Contents/MacOS/../Resources/completions/fish/docker.fish

fish/completions/kubectl.fish

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Applications/OrbStack.app/Contents/MacOS/../Resources/completions/fish/kubectl.fish

fish/completions/orbctl.fish

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Applications/OrbStack.app/Contents/MacOS/../Resources/completions/fish/orbctl.fish
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# This file was created by fish when upgrading to version 4.3, to migrate
2+
# the 'fish_key_bindings' variable from its old default scope (universal)
3+
# to its new default scope (global). We recommend you delete this file
4+
# and configure key bindings in ~/.config/fish/config.fish if needed.
5+
6+
# set --global fish_key_bindings fish_default_key_bindings
7+
8+
# Prior to version 4.3, fish shipped an event handler that runs
9+
# `set --universal fish_key_bindings fish_default_key_bindings`
10+
# whenever the fish_key_bindings variable is erased.
11+
# This means that as long as any fish < 4.3 is still running on this system,
12+
# we cannot complete the migration.
13+
# As a workaround, erase the universal variable at every shell startup.
14+
set --erase --universal fish_key_bindings

fish/conf.d/fish_frozen_theme.fish

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# This file was created by fish when upgrading to version 4.3, to migrate
2+
# theme variables from universal to global scope.
3+
# Don't edit this file, as it will be written by the web-config tool (`fish_config`).
4+
# To customize your theme, delete this file and see
5+
# help interactive#syntax-highlighting
6+
# or
7+
# man fish-interactive | less +/^SYNTAX.HIGHLIGHTING
8+
# for appropriate commands to add to ~/.config/fish/config.fish instead.
9+
# See also the release notes for fish 4.3.0 (run `help relnotes`).
10+
11+
set --global fish_color_autosuggestion 6c7086
12+
set --global fish_color_cancel f38ba8
13+
set --global fish_color_command 89b4fa
14+
set --global fish_color_comment 7f849c
15+
set --global fish_color_cwd f9e2af
16+
set --global fish_color_cwd_root red
17+
set --global fish_color_end fab387
18+
set --global fish_color_error f38ba8
19+
set --global fish_color_escape eba0ac
20+
set --global fish_color_gray 6c7086
21+
set --global fish_color_history_current --bold
22+
set --global fish_color_host 89b4fa
23+
set --global fish_color_host_remote a6e3a1
24+
set --global fish_color_keyword f38ba8
25+
set --global fish_color_match --background=brblue
26+
set --global fish_color_normal cdd6f4
27+
set --global fish_color_operator f5c2e7
28+
set --global fish_color_option a6e3a1
29+
set --global fish_color_param f2cdcd
30+
set --global fish_color_quote a6e3a1
31+
set --global fish_color_redirection f5c2e7
32+
set --global fish_color_search_match --background=313244
33+
set --global fish_color_selection --background=313244
34+
set --global fish_color_status f38ba8
35+
set --global fish_color_user 94e2d5
36+
set --global fish_color_valid_path --underline
37+
set --global fish_pager_color_background
38+
set --global fish_pager_color_completion cdd6f4
39+
set --global fish_pager_color_description 6c7086
40+
set --global fish_pager_color_prefix f5c2e7
41+
set --global fish_pager_color_progress 6c7086
42+
set --global fish_pager_color_secondary_background
43+
set --global fish_pager_color_secondary_completion
44+
set --global fish_pager_color_secondary_description
45+
set --global fish_pager_color_secondary_prefix
46+
set --global fish_pager_color_selected_background
47+
set --global fish_pager_color_selected_completion
48+
set --global fish_pager_color_selected_description
49+
set --global fish_pager_color_selected_prefix

fish/fish_variables

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ SETUVAR fish_color_selection:\x2d\x2dbackground\x3d313244
2727
SETUVAR fish_color_status:f38ba8
2828
SETUVAR fish_color_user:94e2d5
2929
SETUVAR fish_color_valid_path:\x2d\x2dunderline
30-
SETUVAR fish_key_bindings:fish_default_key_bindings
3130
SETUVAR fish_pager_color_background:\x1d
3231
SETUVAR fish_pager_color_completion:cdd6f4
3332
SETUVAR fish_pager_color_description:6c7086

0 commit comments

Comments
 (0)