From 0babbccd195743895a1a43e81fe1dfb860afb82c Mon Sep 17 00:00:00 2001 From: askiiart Date: Mon, 20 Nov 2023 11:20:55 -0600 Subject: [PATCH] Update sway menu & lid close --- fish/completions/tide.fish | 3 +- fish/conf.d/_tide_init.fish | 6 +- fish/conf.d/custom.fish | 14 ++- fish/fish_plugins | 3 +- fish/fish_variables | 10 +- fish/functions/_tide_detect_os.fish | 2 + fish/functions/_tide_fish_colorize.fish | 7 ++ fish/functions/_tide_item_chruby.fish | 3 - fish/functions/_tide_item_context.fish | 17 ++- fish/functions/_tide_item_crystal.fish | 6 +- fish/functions/_tide_item_git.fish | 13 ++- fish/functions/_tide_item_go.fish | 6 +- fish/functions/_tide_item_java.fish | 6 +- fish/functions/_tide_item_node.fish | 6 +- fish/functions/_tide_item_php.fish | 6 +- fish/functions/_tide_item_pulumi.fish | 18 ++-- fish/functions/_tide_item_python.fish | 20 ++++ fish/functions/_tide_item_ruby.fish | 6 ++ fish/functions/_tide_item_rustc.fish | 6 +- fish/functions/_tide_item_virtual_env.fish | 11 -- fish/functions/_tide_pwd.fish | 8 +- .../_tide_remove_unusable_items.fish | 6 +- fish/functions/_tide_sub_bug-report.fish | 2 +- fish/functions/_tide_sub_configure.fish | 101 ++++++++++++++---- fish/functions/_tide_sub_reload.fish | 3 + fish/functions/fish_prompt.fish | 79 +++++++++++++- fish/functions/tide.fish | 3 +- .../tide/configure/choices/all/finish.fish | 29 +++-- .../tide/configure/choices/all/icons.fish | 6 +- .../configure/choices/all/prompt_colors.fish | 6 +- .../choices/all/prompt_connection.fish | 19 ++-- .../prompt_connection_andor_frame_color.fish | 22 ++-- .../configure/choices/all/prompt_spacing.fish | 9 +- .../tide/configure/choices/all/show_time.fish | 16 +-- .../tide/configure/choices/all/style.fish | 35 ++---- .../tide/configure/choices/all/transient.fish | 22 ++++ .../choices/classic/classic_prompt_color.fish | 10 +- .../classic/classic_prompt_separators.fish | 34 +++--- .../choices/lean/lean_prompt_height.fish | 6 +- .../powerline/powerline_prompt_frame.fish | 46 -------- .../powerline/powerline_prompt_heads.fish | 36 +++---- .../powerline/powerline_prompt_height.fish | 30 ------ .../powerline/powerline_prompt_style.fish | 51 +++++++++ .../powerline/powerline_prompt_tails.fish | 42 +++----- .../powerline_right_prompt_frame.fish | 20 ++++ .../rainbow/rainbow_prompt_separators.fish | 10 +- .../tide/configure/configs/classic.fish | 50 ++------- .../configure/configs/classic_16color.fish | 8 +- .../tide/configure/configs/lean.fish | 50 ++------- .../tide/configure/configs/lean_16color.fish | 8 +- .../tide/configure/configs/rainbow.fish | 50 ++------- .../configure/configs/rainbow_16color.fish | 8 +- .../functions/_fake_tide_item_character.fish | 7 +- fish/functions/tide/configure/icons.fish | 39 +++++++ i3/config.d/catppuccin-mocha.conf | 33 ++++++ sway/config | 11 +- sway/lid-close.sh | 4 +- universal-shellrc.txt | 2 - vscode/extensions.txt | 3 +- vscode/keybindings.json | 11 ++ vscode/settings.json | 2 +- 61 files changed, 635 insertions(+), 471 deletions(-) create mode 100644 fish/functions/_tide_fish_colorize.fish delete mode 100644 fish/functions/_tide_item_chruby.fish create mode 100644 fish/functions/_tide_item_python.fish create mode 100644 fish/functions/_tide_item_ruby.fish delete mode 100644 fish/functions/_tide_item_virtual_env.fish create mode 100644 fish/functions/_tide_sub_reload.fish create mode 100644 fish/functions/tide/configure/choices/all/transient.fish delete mode 100644 fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish delete mode 100644 fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish create mode 100644 fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish create mode 100644 fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish create mode 100644 fish/functions/tide/configure/icons.fish create mode 100644 i3/config.d/catppuccin-mocha.conf mode change 100644 => 100755 sway/lid-close.sh create mode 100644 vscode/keybindings.json diff --git a/fish/completions/tide.fish b/fish/completions/tide.fish index 2d3784d..1ba1960 100644 --- a/fish/completions/tide.fish +++ b/fish/completions/tide.fish @@ -1,9 +1,10 @@ complete tide --no-files -set -l subcommands bug-report configure +set -l subcommands bug-report configure reload complete tide -x -n __fish_use_subcommand -a bug-report -d "Print info for use in bug reports" complete tide -x -n __fish_use_subcommand -a configure -d "Run the configuration wizard" +complete tide -x -n __fish_use_subcommand -a reload -d "Reload tide configuration" complete tide -x -n "not __fish_seen_subcommand_from $subcommands" -s h -l help -d "Print help message" complete tide -x -n "not __fish_seen_subcommand_from $subcommands" -s v -l version -d "Print tide version" diff --git a/fish/conf.d/_tide_init.fish b/fish/conf.d/_tide_init.fish index 939f17c..5d01510 100644 --- a/fish/conf.d/_tide_init.fish +++ b/fish/conf.d/_tide_init.fish @@ -11,7 +11,7 @@ function _tide_init_install --on-event _tide_init_install if contains ilancosman/tide (string lower $_fisher_plugins) set_color bryellow echo "ilancosman/tide is a development branch. Please install from a release tag:" - echo -ns "fisher install ilancosman/tide@v5" | fish_indent --ansi + _tide_fish_colorize "fisher install ilancosman/tide@v6" sleep 3 end @@ -19,7 +19,7 @@ function _tide_init_install --on-event _tide_init_install case y ye yes '' tide configure case '*' - echo -s \n 'Run ' (echo -ns "tide configure" | fish_indent --ansi) ' to customize your prompt.' + echo -s \n 'Run ' (_tide_fish_colorize "tide configure") ' to customize your prompt.' end end end @@ -29,7 +29,7 @@ function _tide_init_update --on-event _tide_init_update if contains ilancosman/tide (string lower $_fisher_plugins) set_color bryellow echo "ilancosman/tide is a development branch. Please install from a release tag:" - echo -ns "fisher install ilancosman/tide@v5" | fish_indent --ansi + _tide_fish_colorize "fisher install ilancosman/tide@v6" sleep 3 end end diff --git a/fish/conf.d/custom.fish b/fish/conf.d/custom.fish index f223c1e..ca3a0be 100644 --- a/fish/conf.d/custom.fish +++ b/fish/conf.d/custom.fish @@ -1,5 +1,9 @@ -fish_add_path .cargo/bin/ -set -x GPG_TTY (tty) -set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket) -set -x EDITOR nvim -set -x DOCKER_HOST unix:///run/user/1000/docker.sock +if status is-interactive + fish_add_path .cargo/bin/ + set -x GPG_TTY (tty) + set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket) + set -x EDITOR nvim + set -x DOCKER_HOST unix:///run/user/1000/docker.sock + gpgconf --launch gpg-agent + gpg-connect-agent updatestartuptty /bye +end \ No newline at end of file diff --git a/fish/fish_plugins b/fish/fish_plugins index 073936e..eeb9cbf 100644 --- a/fish/fish_plugins +++ b/fish/fish_plugins @@ -1,2 +1 @@ -jorgebucaran/fisher -ilancosman/tide@v5 +ilancosman/tide@v6 diff --git a/fish/fish_variables b/fish/fish_variables index 4d7d614..da59dbb 100644 --- a/fish/fish_variables +++ b/fish/fish_variables @@ -12,11 +12,14 @@ SETUVAR _tide_prompt_1165:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3 SETUVAR _tide_prompt_1249:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2021\x3a23\x3a48\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m SETUVAR _tide_prompt_1315:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b215\x3b0\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2718\x20INT\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b135\x3b135\x3b95m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf252\x204m\x2017s\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2018\x3a23\x3a11\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m SETUVAR _tide_prompt_1439:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2020\x3a49\x3a11\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m -SETUVAR _tide_prompt_16521:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\uf1d3\x20\x1b\x5b37m\x40\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m15f30ef\x1b\x5b38\x3b2\x3b255\x3b0\x3b0m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\x1b\x5b38\x3b2\x3b255\x3b0\x3b0m\x1b\x5b38\x3b2\x3b215\x3b175\x3b0m\x1b\x5b38\x3b2\x3b215\x3b175\x3b0m\x20\x2113\x1b\x5b38\x3b2\x3b0\x3b175\x3b255m\x20\x3f4\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2000\x3a33\x3a32\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m -SETUVAR _tide_prompt_16661:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b135\x3b135\x3b95m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf252\x209s\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2000\x3a22\x3a44\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m +SETUVAR _tide_prompt_14414:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2011\x3a18\x3a03\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m +SETUVAR _tide_prompt_15156:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\uf1d3\x20\x1b\x5b37m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0mmain\x1b\x5b38\x3b2\x3b255\x3b0\x3b0m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\x20\x2a1\x1b\x5b38\x3b2\x3b255\x3b0\x3b0m\x1b\x5b38\x3b2\x3b215\x3b175\x3b0m\x1b\x5b38\x3b2\x3b215\x3b175\x3b0m\x1b\x5b38\x3b2\x3b0\x3b175\x3b255m\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2011\x3a18\x3a12\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m SETUVAR _tide_prompt_174972:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b135\x3b135\x3b95m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf252\x2012s\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2018\x3a13\x3a29\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m +SETUVAR _tide_prompt_2174:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2008\x3a20\x3a32\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m SETUVAR _tide_prompt_2210:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2021\x3a23\x3a48\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m SETUVAR _tide_prompt_2298:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b135\x3b135\x3b95m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf252\x2046s\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2018\x3a23\x3a11\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m +SETUVAR _tide_prompt_3025:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b135\x3b135\x3b95m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf252\x2022s\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2009\x3a27\x3a15\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m +SETUVAR _tide_prompt_3393:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b135\x3b135\x3b95m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf252\x2019s\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2009\x3a45\x3a47\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m SETUVAR _tide_prompt_43033:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2020\x3a40\x3a38\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m SETUVAR _tide_prompt_5971:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b135\x3b135\x3b95m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf252\x205s\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2021\x3a46\x3a35\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m SETUVAR _tide_prompt_6415:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b215\x3b0\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2718\x201\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b135\x3b135\x3b95m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf252\x2010s\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2021\x3a49\x3a45\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m @@ -24,10 +27,13 @@ SETUVAR _tide_prompt_65309:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x SETUVAR _tide_prompt_694:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b135\x3b135\x3b95m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf252\x2011s\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2021\x3a13\x3a08\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m SETUVAR _tide_prompt_72705:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b135\x3b135\x3b95m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf252\x204s\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2023\x3a26\x3a55\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m SETUVAR _tide_prompt_739:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2021\x3a45\x3a10\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m +SETUVAR _tide_prompt_768:\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m\x1b\x5b37m\x1b\x5b40m\x20\uf303\x20\x1b\x5b90m\u2502\x1b\x5b40m\x20\x40PWD\x40\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m\ue0b0\x1e\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m\ue0b2\x1b\x5b33m\x1b\x5b40m\x20\u2714\x20\x1b\x5b90m\u2502\x1b\x5b90m\x1b\x5b40m\x2009\x3a48\x3a19\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m +SETUVAR _tide_prompt_774:\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m\x1b\x5b37m\x1b\x5b40m\x20\uf303\x20\x1b\x5b90m\u2502\x1b\x5b40m\x20\x40PWD\x40\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m\ue0b0\x1e\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m\ue0b2\x1b\x5b33m\x1b\x5b40m\x20\u2714\x20\x1b\x5b90m\u2502\x1b\x5b90m\x1b\x5b40m\x2008\x3a43\x3a41\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m SETUVAR _tide_prompt_79251:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\uf1d3\x20\x1b\x5b37m\x40\x1b\x5b38\x3b2\x3b95\x3b215\x3b0ma8b612c\x1b\x5b38\x3b2\x3b255\x3b0\x3b0m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\x1b\x5b38\x3b2\x3b255\x3b0\x3b0m\x1b\x5b38\x3b2\x3b215\x3b175\x3b0m\x1b\x5b38\x3b2\x3b215\x3b175\x3b0m\x20\x213\x1b\x5b38\x3b2\x3b0\x3b175\x3b255m\x20\x3f2\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2023\x3a29\x3a19\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m SETUVAR _tide_prompt_851:\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m\x1b\x5b37m\x1b\x5b40m\x20\uf303\x20\x1b\x5b90m\u2502\x1b\x5b40m\x20\x40PWD\x40\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m\ue0b0\x1e\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m\ue0b2\x1b\x5b31m\x1b\x5b40m\x20\u2718\x20127\x20\x1b\x5b90m\u2502\x1b\x5b90m\x1b\x5b40m\x2018\x3a18\x3a20\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m SETUVAR _tide_prompt_9039:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2023\x3a40\x3a22\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m SETUVAR _tide_prompt_9469:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b38\x3b2\x3b238\x3b238\x3b238m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\uf303\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b175\x3b0m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\u2714\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\u2502\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2017\x3a40\x3a18\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m +SETUVAR _tide_prompt_964:\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m\x1b\x5b37m\x1b\x5b40m\x20\uf303\x20\x1b\x5b90m\u2502\x1b\x5b40m\x20\x40PWD\x40\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m\ue0b0\x1e\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m\ue0b2\x1b\x5b31m\x1b\x5b40m\x20\u2718\x201\x20\x1b\x5b90m\u2502\x1b\x5b90m\x1b\x5b40m\x2001\x3a34\x3a05\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b30m SETUVAR _tide_right_items:status\x1ecmd_duration\x1econtext\x1ejobs\x1epython\x1etime SETUVAR fish_color_autosuggestion:555\x1ebrblack SETUVAR fish_color_cancel:\x2dr diff --git a/fish/functions/_tide_detect_os.fish b/fish/functions/_tide_detect_os.fish index 5a3263f..cf38388 100644 --- a/fish/functions/_tide_detect_os.fish +++ b/fish/functions/_tide_detect_os.fish @@ -69,6 +69,8 @@ function _tide_detect_os_linux_cases -a file key printf %s\n  $defaultColor # Doesn't really have a logo, and the colors are too close to PWD blue anyway case ubuntu printf %s\n  E95420 D4D4D4 # https://design.ubuntu.com/brand/ + case void + printf %s\n  FFFFFF 478061 # from https://alpha.de.repo.voidlinux.org/logos/void.svg case '*' return 1 end diff --git a/fish/functions/_tide_fish_colorize.fish b/fish/functions/_tide_fish_colorize.fish new file mode 100644 index 0000000..f79b188 --- /dev/null +++ b/fish/functions/_tide_fish_colorize.fish @@ -0,0 +1,7 @@ +function _tide_fish_colorize + if command -q fish_indent + echo -ns "$argv" | fish_indent --ansi + else + echo -ns "$argv" + end +end diff --git a/fish/functions/_tide_item_chruby.fish b/fish/functions/_tide_item_chruby.fish deleted file mode 100644 index 02d5fbd..0000000 --- a/fish/functions/_tide_item_chruby.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_chruby - test -n "$RUBY_VERSION" && _tide_print_item chruby $tide_chruby_icon' ' $RUBY_VERSION -end diff --git a/fish/functions/_tide_item_context.fish b/fish/functions/_tide_item_context.fish index 575c438..cbdf420 100644 --- a/fish/functions/_tide_item_context.fish +++ b/fish/functions/_tide_item_context.fish @@ -1,15 +1,14 @@ function _tide_item_context if set -q SSH_TTY - set -lx tide_context_color $tide_context_color_ssh - test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER || - h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts]) + set -fx tide_context_color $tide_context_color_ssh else if test "$EUID" = 0 - set -lx tide_context_color $tide_context_color_root - test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER || - h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts]) + set -fx tide_context_color $tide_context_color_root else if test "$tide_context_always_display" = true - set -lx tide_context_color $tide_context_color_default - test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER || - h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts]) + set -fx tide_context_color $tide_context_color_default + else + return end + + string match -qr "^(?(\.?[^\.]*){0,$tide_context_hostname_parts})" @$hostname + _tide_print_item context $USER$h end diff --git a/fish/functions/_tide_item_crystal.fish b/fish/functions/_tide_item_crystal.fish index cec9752..620dde4 100644 --- a/fish/functions/_tide_item_crystal.fish +++ b/fish/functions/_tide_item_crystal.fish @@ -1,4 +1,6 @@ function _tide_item_crystal - path is $_tide_parent_dirs/shard.yml && - _tide_print_item crystal $tide_crystal_icon' ' (crystal --version | string match -r "[\d.]+")[1] + if path is $_tide_parent_dirs/shard.yml + crystal --version | string match -qr "(?[\d.]+)" + _tide_print_item crystal $tide_crystal_icon' ' $v + end end diff --git a/fish/functions/_tide_item_git.fish b/fish/functions/_tide_item_git.fish index c419695..3154acc 100644 --- a/fish/functions/_tide_item_git.fish +++ b/fish/functions/_tide_item_git.fish @@ -14,12 +14,17 @@ function _tide_item_git # Operation if test -d $gdir/rebase-merge - read -f step <$gdir/rebase-merge/msgnum - read -f total_steps <$gdir/rebase-merge/end + # Turn ANY into ALL, via double negation + if not path is -v $gdir/rebase-merge/{msgnum,end} + read -f step <$gdir/rebase-merge/msgnum + read -f total_steps <$gdir/rebase-merge/end + end test -f $gdir/rebase-merge/interactive && set -f operation rebase-i || set -f operation rebase-m else if test -d $gdir/rebase-apply - read -f step <$gdir/rebase-apply/next - read -f total_steps <$gdir/rebase-apply/last + if not path is -v $gdir/rebase-apply/{next,last} + read -f step <$gdir/rebase-apply/next + read -f total_steps <$gdir/rebase-apply/last + end if test -f $gdir/rebase-apply/rebasing set -f operation rebase else if test -f $gdir/rebase-apply/applying diff --git a/fish/functions/_tide_item_go.fish b/fish/functions/_tide_item_go.fish index 7c5919f..b9aacae 100644 --- a/fish/functions/_tide_item_go.fish +++ b/fish/functions/_tide_item_go.fish @@ -1,4 +1,6 @@ function _tide_item_go - path is $_tide_parent_dirs/go.mod && - _tide_print_item go $tide_go_icon' ' (go version | string match -r "[\d.]+") + if path is $_tide_parent_dirs/go.mod + go version | string match -qr "(?[\d.]+)" + _tide_print_item go $tide_go_icon' ' $v + end end diff --git a/fish/functions/_tide_item_java.fish b/fish/functions/_tide_item_java.fish index 6105acc..804ec05 100644 --- a/fish/functions/_tide_item_java.fish +++ b/fish/functions/_tide_item_java.fish @@ -1,4 +1,6 @@ function _tide_item_java - path is $_tide_parent_dirs/pom.xml && - _tide_print_item java $tide_java_icon' ' (java -version &| string match -r "[\d.]+")[1] + if path is $_tide_parent_dirs/pom.xml + java -version &| string match -qr "(?[\d.]+)" + _tide_print_item java $tide_java_icon' ' $v + end end diff --git a/fish/functions/_tide_item_node.fish b/fish/functions/_tide_item_node.fish index 0588051..fc57832 100644 --- a/fish/functions/_tide_item_node.fish +++ b/fish/functions/_tide_item_node.fish @@ -1,4 +1,6 @@ function _tide_item_node - path is $_tide_parent_dirs/package.json && - _tide_print_item node $tide_node_icon' ' (node --version | string trim --chars=v) + if path is $_tide_parent_dirs/package.json + node --version | string match -qr "v(?.*)" + _tide_print_item node $tide_node_icon' ' $v + end end diff --git a/fish/functions/_tide_item_php.fish b/fish/functions/_tide_item_php.fish index abc104e..c8d28d9 100644 --- a/fish/functions/_tide_item_php.fish +++ b/fish/functions/_tide_item_php.fish @@ -1,4 +1,6 @@ function _tide_item_php - path is $_tide_parent_dirs/composer.json && - _tide_print_item php $tide_php_icon' ' (php --version | string match -r 'PHP ([\d.]+)')[2] + if path is $_tide_parent_dirs/composer.json + php --version | string match -qr "(?[\d.]+)" + _tide_print_item php $tide_php_icon' ' $v + end end diff --git a/fish/functions/_tide_item_pulumi.fish b/fish/functions/_tide_item_pulumi.fish index 9f5e2db..6302a7e 100644 --- a/fish/functions/_tide_item_pulumi.fish +++ b/fish/functions/_tide_item_pulumi.fish @@ -1,19 +1,19 @@ function _tide_item_pulumi if path filter $_tide_parent_dirs/Pulumi.yaml | read -l yaml_path if command -q sha1sum - echo -n "$yaml_path" | sha1sum | string sub -e40 | read -f path_hash + echo -n "$yaml_path" | sha1sum | string match -qr "(?.{40})" else if command -q shasum - echo -n "$yaml_path" | shasum | string sub -e40 | read -f path_hash + echo -n "$yaml_path" | shasum | string match -qr "(?.{40})" + else + return end - if test -n "$path_hash" - string match -rg 'name: *(.*)' <$yaml_path | read -l project_name - set -l workspace_file "$HOME/.pulumi/workspaces/$project_name-$path_hash-workspace.json" + string match -qr 'name: *(?.*)' <$yaml_path + set -l workspace_file "$HOME/.pulumi/workspaces/$project_name-$path_hash-workspace.json" - if test -e $workspace_file - string match -rg '"stack": *"(.*)"' <$workspace_file | read -l stack - _tide_print_item pulumi $tide_pulumi_icon' ' $stack - end + if test -e $workspace_file + string match -qr '"stack": *"(?.*)"' <$workspace_file + _tide_print_item pulumi $tide_pulumi_icon' ' $stack end end end diff --git a/fish/functions/_tide_item_python.fish b/fish/functions/_tide_item_python.fish new file mode 100644 index 0000000..2d9e52b --- /dev/null +++ b/fish/functions/_tide_item_python.fish @@ -0,0 +1,20 @@ +function _tide_item_python + if test -n "$VIRTUAL_ENV" + python --version | string match -qr "(?[\d.]+)" + + string match -qr "^.*/(?.*)/(?.*)" $VIRTUAL_ENV + # pipenv $VIRTUAL_ENV looks like /home/ilan/.local/share/virtualenvs/pipenv_project-EwRYuc3l + # Detect whether we are using pipenv by looking for 'virtualenvs'. If so, remove the hash at the end. + if test "$dir" = virtualenvs + string match -qr "(?.*)-.*" $base + _tide_print_item python $tide_python_icon' ' "$v ($base)" + else if contains -- "$base" virtualenv venv .venv env # avoid generic names + _tide_print_item python $tide_python_icon' ' "$v ($dir)" + else + _tide_print_item python $tide_python_icon' ' "$v ($base)" + end + else if path is .python-version Pipfile __init__.py pyproject.toml requirements.txt setup.py + python --version | string match -qr "(?[\d.]+)" + _tide_print_item python $tide_python_icon' ' $v + end +end diff --git a/fish/functions/_tide_item_ruby.fish b/fish/functions/_tide_item_ruby.fish new file mode 100644 index 0000000..bde84eb --- /dev/null +++ b/fish/functions/_tide_item_ruby.fish @@ -0,0 +1,6 @@ +function _tide_item_ruby + if path is $_tide_parent_dirs/{*.gemspec,Gemfile,Rakefile,.ruby-version} + ruby --version | string match -qr "(?[\d.]+)" + _tide_print_item ruby $tide_ruby_icon' ' $v + end +end diff --git a/fish/functions/_tide_item_rustc.fish b/fish/functions/_tide_item_rustc.fish index 2e71645..b46cd99 100644 --- a/fish/functions/_tide_item_rustc.fish +++ b/fish/functions/_tide_item_rustc.fish @@ -1,4 +1,6 @@ function _tide_item_rustc - path is $_tide_parent_dirs/Cargo.toml && - _tide_print_item rustc $tide_rustc_icon' ' (rustc --version | string split ' ')[2] + if path is $_tide_parent_dirs/Cargo.toml + rustc --version | string match -qr "(?[\d.]+)" + _tide_print_item rustc $tide_rustc_icon' ' $v + end end diff --git a/fish/functions/_tide_item_virtual_env.fish b/fish/functions/_tide_item_virtual_env.fish deleted file mode 100644 index 0f20cee..0000000 --- a/fish/functions/_tide_item_virtual_env.fish +++ /dev/null @@ -1,11 +0,0 @@ -function _tide_item_virtual_env - test -n "$VIRTUAL_ENV" && split_virtual_env=(string split / "$VIRTUAL_ENV") if test $split_virtual_env[-2] = virtualenvs - # pipenv $VIRTUAL_ENV looks like /home/ilan/.local/share/virtualenvs/pipenv_project-EwRYuc3l - # Detect whether we are using pipenv by looking for virtualenvs. If so, remove the hash at the end. - _tide_print_item virtual_env $tide_virtual_env_icon' ' (string split -r -m1 - "$split_virtual_env[-1]")[1] - else if contains -- $split_virtual_env[-1] virtualenv venv .venv env # avoid generic names - _tide_print_item virtual_env $tide_virtual_env_icon' ' $split_virtual_env[-2] - else - _tide_print_item virtual_env $tide_virtual_env_icon' ' $split_virtual_env[-1] - end -end diff --git a/fish/functions/_tide_pwd.fish b/fish/functions/_tide_pwd.fish index b2ea6ad..5447dd4 100644 --- a/fish/functions/_tide_pwd.fish +++ b/fish/functions/_tide_pwd.fish @@ -25,9 +25,13 @@ eval "function _tide_pwd if path is \$parent_dir/\$dir_section/\$tide_pwd_markers set split_output[\$i] \"$color_anchors\$dir_section$reset_to_color_dirs\" else if test \$_tide_pwd_len -gt \$dist_btwn_sides - set -l trunc string match -qr \"(?\..|.)\" \$dir_section - while v=\$parent_dir/\$trunc*/ set -q v[2] && string match -qr \"(?\$trunc.)\" \$dir_section + + set -l glob \$parent_dir/\$trunc*/ + set -e glob[(contains -i \$parent_dir/\$dir_section/ \$glob)] # This is faster than inverse string match + + while string match -qr \"^\$parent_dir/\$(string escape --style=regex \$trunc)\" \$glob && + string match -qr \"(?\$(string escape --style=regex \$trunc).)\" \$dir_section end test -n \"\$trunc\" && set split_output[\$i] \"$color_truncated\$trunc$reset_to_color_dirs\" && string join / \$split_output | string length -V | read _tide_pwd_len diff --git a/fish/functions/_tide_remove_unusable_items.fish b/fish/functions/_tide_remove_unusable_items.fish index a2e5698..5a42555 100644 --- a/fish/functions/_tide_remove_unusable_items.fish +++ b/fish/functions/_tide_remove_unusable_items.fish @@ -1,17 +1,17 @@ function _tide_remove_unusable_items # Remove tool-specific items for tools the machine doesn't have installed set -l removed_items - for item in aws chruby crystal direnv distrobox docker elixir gcloud git go java kubectl nix_shell node php pulumi rustc terraform toolbox virtual_env + for item in aws crystal direnv distrobox docker elixir gcloud git go java kubectl nix_shell node php pulumi python ruby rustc terraform toolbox contains $item $tide_left_prompt_items $tide_right_prompt_items || continue set -l cli_names $item switch $item case distrobox # there is no 'distrobox' command inside the container set cli_names distrobox-export # 'distrobox-export' and 'distrobox-host-exec' are available - case virtual_env - set cli_names python python3 case nix_shell set cli_names nix nix-shell + case python + set cli_names python python3 end type --query $cli_names || set -a removed_items $item end diff --git a/fish/functions/_tide_sub_bug-report.fish b/fish/functions/_tide_sub_bug-report.fish index 5f087c8..a8065c8 100644 --- a/fish/functions/_tide_sub_bug-report.fish +++ b/fish/functions/_tide_sub_bug-report.fish @@ -6,7 +6,7 @@ function _tide_sub_bug-report if set -q _flag_clean HOME=(mktemp -d) $fish_path --init-command "curl --silent \ https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | - source && fisher install ilancosman/tide@v5" + source && fisher install ilancosman/tide@v6" else if set -q _flag_verbose set --long | string match -r "^_?tide.*" | # Get only tide variables string match -r --invert "^_tide_prompt_var.*" # Remove _tide_prompt_var diff --git a/fish/functions/_tide_sub_configure.fish b/fish/functions/_tide_sub_configure.fish index cb87290..22faf3a 100644 --- a/fish/functions/_tide_sub_configure.fish +++ b/fish/functions/_tide_sub_configure.fish @@ -15,7 +15,16 @@ for file in (status dirname)/tide/configure/{choices, functions}/**.fish end function _tide_sub_configure - if test $COLUMNS -lt 55 -o $LINES -lt 21 + set -l choices (path basename (status dirname)/tide/configure/choices/**.fish | path change-extension '') + argparse auto $choices= -- $argv + + for var in (set -l --names | string match -e _flag) + set -x $var $$var + end + + if set -q _flag_auto + set -fx _flag_finish 'Overwrite your current tide config' + else if test $COLUMNS -lt 55 -o $LINES -lt 21 echo 'Terminal size too small; must be at least 55 x 21' return 1 end @@ -37,51 +46,86 @@ function _next_choice -a nextChoice end function _tide_title -a text + set -q _flag_auto && return + command -q clear && clear set_color -o string pad --width (math --scale=0 "$fake_columns/2" + (string length $text)/2) $text set_color normal + + set -g _tide_configure_first_option_after_title end function _tide_option -a symbol text - set -ga _tide_option_list $symbol + set -ga _tide_symbol_list $symbol + set -ga _tide_option_list $text - set_color -o - echo "($symbol) $text" - set_color normal + if not set -q _flag_auto + set -g _tide_configure_first_prompt_after_option + + set_color -o + set -e _tide_configure_first_option_after_title || echo + echo "($symbol) $text" + set_color normal + end end -function _tide_menu - set -l list_with_slashes (string join '/' $_tide_option_list) +function _tide_menu -a func + if set -q _flag_auto + set -l flag_var_name _flag_$func + set -g _tide_selected_option $$flag_var_name - echo '(r) Restart from the beginning' + if test -z "$_tide_selected_option" + echo "Missing input for choice '$func'" + _tide_exit_configure + else if not contains $_tide_selected_option $_tide_option_list + echo "Invalid input '$_tide_selected_option' for choice '$func'" + _tide_exit_configure + else + set -e _tide_symbol_list + set -e _tide_option_list + end + return + end + + argparse no-restart -- $argv # Add no-restart option for first menu + + echo + if not set -q _flag_no_restart + set -f r r + echo '(r) Restart from the beginning' + end echo '(q) Quit and do nothing'\n - while true - set_color -o - read --nchars 1 --prompt-str "Choice [$list_with_slashes/r/q] " input - set_color normal - + while read --nchars 1 --prompt-str \ + "$(set_color -o)Choice [$(string join '/' $_tide_symbol_list $r q)] $(set_color normal)" input switch $input case r + set -q _flag_no_restart && continue + set -e _tide_symbol_list set -e _tide_option_list _next_choice all/style break case q - set -e _tide_selected_option # Skip through all the _next_choices + _tide_exit_configure + set -e _tide_symbol_list set -e _tide_option_list command -q clear && clear break - case $_tide_option_list + case $_tide_symbol_list + set -g _tide_selected_option $_tide_option_list[(contains -i $input $_tide_symbol_list)] + test "$func" != finish && + set -a _tide_configure_current_options --$func=(string escape $_tide_selected_option) + set -e _tide_symbol_list set -e _tide_option_list - set -g _tide_selected_option $input break end end end -function _tide_display_prompt -a var_name var_value - test -n "$var_name" && set -g $var_name $var_value +function _tide_display_prompt + set -q _flag_auto && return + _fake_tide_cache_variables set -l prompt (_fake_tide_prompt) @@ -89,7 +133,24 @@ function _tide_display_prompt -a var_name var_value set -l right_prompt_string (string pad --width (math $fake_columns-$bottom_left_prompt_string_length) $prompt[1]) set -l prompt[-1] "$prompt[-1]$right_prompt_string" - string unescape $prompt[2..] + if set -q _configure_transient + if contains newline $fake_tide_left_prompt_items + string unescape $prompt[3..] + else + _fake_tide_item_character + echo + end + else + if not set -q _tide_configure_first_prompt_after_option + test "$fake_tide_prompt_add_newline_before" = true && echo + end + string unescape $prompt[2..] + end + + set -e _tide_configure_first_prompt_after_option set_color normal - echo +end + +function _tide_exit_configure + set -e _tide_selected_option # Skip through all switch and _next_choice end diff --git a/fish/functions/_tide_sub_reload.fish b/fish/functions/_tide_sub_reload.fish new file mode 100644 index 0000000..5a45fbd --- /dev/null +++ b/fish/functions/_tide_sub_reload.fish @@ -0,0 +1,3 @@ +function _tide_sub_reload + source (functions --details fish_prompt) +end diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish index 3e820c4..59f5a96 100644 --- a/fish/functions/fish_prompt.fish +++ b/fish/functions/fish_prompt.fish @@ -34,7 +34,36 @@ if contains newline $_tide_left_items # two line prompt initialization set -l bot_right_frame "$prompt_and_frame_color─╯" && set column_offset (math $column_offset-2) - eval " + if test "$tide_prompt_transient_enabled" = true + eval " +function fish_prompt + _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint + jobs -q && set -lx _tide_jobs + $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus +set _tide_parent_dirs \$_tide_parent_dirs +PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_2_line_prompt)\" & + builtin disown + + command kill \$_tide_last_pid 2>/dev/null + set -g _tide_last_pid \$last_pid + end + + if not set -q _tide_transient + math \$COLUMNS-(string length -V \"\$$prompt_var[1][1]\$$prompt_var[1][3]\")+$column_offset | read -lx dist_btwn_sides + + echo -n $add_newline'$top_left_frame'(string replace @PWD@ (_tide_pwd) \"\$$prompt_var[1][1]\")'$prompt_and_frame_color' + string repeat -Nm(math max 0, \$dist_btwn_sides-\$_tide_pwd_len) '$tide_prompt_icon_connection' + + echo \"\$$prompt_var[1][3]$top_right_frame\" + end + echo -n \e\[0J\"$bot_left_frame\$$prompt_var[1][2]$color_normal \" +end + +function fish_right_prompt + set -e _tide_transient || string unescape \"\$$prompt_var[1][4]$bot_right_frame$color_normal\" +end" + else + eval " function fish_prompt _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint jobs -q && set -lx _tide_jobs @@ -57,13 +86,43 @@ end function fish_right_prompt string unescape \"\$$prompt_var[1][4]$bot_right_frame$color_normal\" end" + end else # one line prompt initialization test "$tide_prompt_add_newline_before" = true && set -l add_newline '\0' math 5 -$tide_prompt_min_cols | read -l column_offset test $column_offset -ge 0 && set column_offset "+$column_offset" - eval " + if test "$tide_prompt_transient_enabled" = true + eval " +function fish_prompt + set -lx _tide_status \$status + _tide_pipestatus=\$pipestatus if not set -e _tide_repaint + jobs -q && set -lx _tide_jobs + $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus +set _tide_parent_dirs \$_tide_parent_dirs +PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_1_line_prompt)\" & + builtin disown + + command kill \$_tide_last_pid 2>/dev/null + set -g _tide_last_pid \$last_pid + end + + if set -q _tide_transient + echo -n \e\[0J + add_prefix= _tide_item_character + echo -n '$color_normal ' + else + math \$COLUMNS-(string length -V \"\$$prompt_var[1][1]\$$prompt_var[1][2]\")$column_offset | read -lx dist_btwn_sides + string replace @PWD@ (_tide_pwd) $add_newline \$$prompt_var[1][1]'$color_normal ' + end +end + +function fish_right_prompt + set -e _tide_transient || string unescape \"\$$prompt_var[1][2]$color_normal\" +end" + else + eval " function fish_prompt _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint jobs -q && set -lx _tide_jobs @@ -83,8 +142,24 @@ end function fish_right_prompt string unescape \"\$$prompt_var[1][2]$color_normal\" end" + end end eval "function _tide_on_fish_exit --on-event fish_exit set -e $prompt_var end" + +if test "$tide_prompt_transient_enabled" = true + function _tide_enter_transient + # If the commandline will be executed, or is empty + if commandline --is-valid || test -z "$(commandline)" + set -g _tide_transient + set -g _tide_repaint + commandline -f repaint + end + commandline -f execute + end + + bind \r _tide_enter_transient + bind -M insert \r _tide_enter_transient +end diff --git a/fish/functions/tide.fish b/fish/functions/tide.fish index 84bbbf1..1f9e46b 100644 --- a/fish/functions/tide.fish +++ b/fish/functions/tide.fish @@ -2,7 +2,7 @@ function tide --description 'Manage your Tide prompt' argparse --stop-nonopt v/version h/help -- $argv if set -q _flag_version - echo 'tide, version 5.6.0' + echo 'tide, version 6.0.1' else if set -q _flag_help _tide_help else if functions --query _tide_sub_$argv[1] @@ -23,5 +23,6 @@ function _tide_help '' \ 'Subcommands:' \ ' configure run interactive configuration wizard' \ + ' reload reload tide configuration' \ ' bug-report print info for use in bug reports' end diff --git a/fish/functions/tide/configure/choices/all/finish.fish b/fish/functions/tide/configure/choices/all/finish.fish index f60a128..f670b1e 100644 --- a/fish/functions/tide/configure/choices/all/finish.fish +++ b/fish/functions/tide/configure/choices/all/finish.fish @@ -1,21 +1,30 @@ function finish - set_color red - _tide_title 'Overwrite tide config?' - set_color normal + _tide_title Finish - _tide_option y Yes + echo + set_color red + _tide_option y 'Overwrite your current tide config' + set_color normal echo - _tide_menu + _tide_option p 'Exit and print the config you just generated' + echo + + _tide_menu (status function) switch $_tide_selected_option - case y + case 'Overwrite your current tide config' _tide_finish command -q clear && clear + set -q _flag_auto || _tide_print_configure_current_options + case 'Exit and print the config you just generated' + _tide_exit_configure + command -q clear && clear + _tide_print_configure_current_options end end function _tide_finish - set -e _tide_selected_option # Skip through all the _next_choices + _tide_exit_configure # Deal with prompt char/vi mode contains character $fake_tide_left_prompt_items || set -p fake_tide_left_prompt_items vi_mode @@ -29,5 +38,9 @@ function _tide_finish set -e $_tide_prompt_var 2>/dev/null # Re-initialize the prompt - source (functions --details fish_prompt) + tide reload +end + +function _tide_print_configure_current_options + _tide_fish_colorize "tide configure --auto $_tide_configure_current_options" end diff --git a/fish/functions/tide/configure/choices/all/icons.fish b/fish/functions/tide/configure/choices/all/icons.fish index e53bffa..be167bb 100644 --- a/fish/functions/tide/configure/choices/all/icons.fish +++ b/fish/functions/tide/configure/choices/all/icons.fish @@ -8,12 +8,12 @@ function icons _enable_icons _tide_display_prompt - _tide_menu + _tide_menu (status function) switch $_tide_selected_option - case 1 + case 'Few icons' _disable_icons end - _next_choice all/finish + _next_choice all/transient end function _enable_icons diff --git a/fish/functions/tide/configure/choices/all/prompt_colors.fish b/fish/functions/tide/configure/choices/all/prompt_colors.fish index 90b1a9d..247ef4e 100644 --- a/fish/functions/tide/configure/choices/all/prompt_colors.fish +++ b/fish/functions/tide/configure/choices/all/prompt_colors.fish @@ -9,9 +9,9 @@ function prompt_colors set -g _tide_16color true _tide_display_prompt - _tide_menu + _tide_menu (status function) switch $_tide_selected_option - case 1 + case 'True color' _load_config "$_tide_configure_style" set -e _tide_16color switch $_tide_configure_style @@ -20,7 +20,7 @@ function prompt_colors case classic _next_choice classic/classic_prompt_color end - case 2 + case '16 colors' _next_choice all/show_time end end diff --git a/fish/functions/tide/configure/choices/all/prompt_connection.fish b/fish/functions/tide/configure/choices/all/prompt_connection.fish index ae31ef3..ff76546 100644 --- a/fish/functions/tide/configure/choices/all/prompt_connection.fish +++ b/fish/functions/tide/configure/choices/all/prompt_connection.fish @@ -2,27 +2,30 @@ function prompt_connection _tide_title 'Prompt Connection' _tide_option 1 Disconnected - _tide_display_prompt fake_tide_prompt_icon_connection ' ' + set -g fake_tide_prompt_icon_connection ' ' + _tide_display_prompt _tide_option 2 Dotted - _tide_display_prompt fake_tide_prompt_icon_connection '·' + set -g fake_tide_prompt_icon_connection '·' + _tide_display_prompt _tide_option 3 Solid - _tide_display_prompt fake_tide_prompt_icon_connection '─' + set -g fake_tide_prompt_icon_connection '─' + _tide_display_prompt - _tide_menu + _tide_menu (status function) switch $_tide_selected_option - case 1 + case Disconnected set -g fake_tide_prompt_icon_connection ' ' - case 2 + case Dotted set -g fake_tide_prompt_icon_connection '·' - case 3 + case Solid set -g fake_tide_prompt_icon_connection '─' end switch $_tide_configure_style case lean _next_choice all/prompt_connection_andor_frame_color case classic rainbow - _next_choice powerline/powerline_prompt_frame + _next_choice powerline/powerline_right_prompt_frame end end diff --git a/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish b/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish index b8803b4..cefbf2c 100644 --- a/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish +++ b/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish @@ -10,26 +10,30 @@ function prompt_connection_andor_frame_color _tide_title "Connection & Frame Color" _tide_option 1 Lightest - _tide_display_prompt fake_tide_prompt_color_frame_and_connection 808080 + set -g fake_tide_prompt_color_frame_and_connection 808080 + _tide_display_prompt _tide_option 2 Light - _tide_display_prompt fake_tide_prompt_color_frame_and_connection 6C6C6C + set -g fake_tide_prompt_color_frame_and_connection 6C6C6C + _tide_display_prompt _tide_option 3 Dark - _tide_display_prompt fake_tide_prompt_color_frame_and_connection 585858 + set -g fake_tide_prompt_color_frame_and_connection 585858 + _tide_display_prompt _tide_option 4 Darkest - _tide_display_prompt fake_tide_prompt_color_frame_and_connection 444444 + set -g fake_tide_prompt_color_frame_and_connection 444444 + _tide_display_prompt - _tide_menu + _tide_menu (status function) switch $_tide_selected_option - case 1 + case Lightest set -g fake_tide_prompt_color_frame_and_connection 808080 - case 2 + case Light set -g fake_tide_prompt_color_frame_and_connection 6C6C6C - case 3 + case Dark set -g fake_tide_prompt_color_frame_and_connection 585858 - case 4 + case Darkest set -g fake_tide_prompt_color_frame_and_connection 444444 end _next_choice all/prompt_spacing diff --git a/fish/functions/tide/configure/choices/all/prompt_spacing.fish b/fish/functions/tide/configure/choices/all/prompt_spacing.fish index a5bb98b..f68be68 100644 --- a/fish/functions/tide/configure/choices/all/prompt_spacing.fish +++ b/fish/functions/tide/configure/choices/all/prompt_spacing.fish @@ -2,19 +2,20 @@ function prompt_spacing _tide_title 'Prompt Spacing' _tide_option 1 Compact + set -g fake_tide_prompt_add_newline_before false _tide_display_prompt - printf \e\[1A # Move cursor up 1 row _tide_display_prompt _tide_option 2 Sparse + set -g fake_tide_prompt_add_newline_before true _tide_display_prompt _tide_display_prompt - _tide_menu + _tide_menu (status function) switch $_tide_selected_option - case 1 + case Compact set -g fake_tide_prompt_add_newline_before false - case 2 + case Sparse set -g fake_tide_prompt_add_newline_before true end _next_choice all/icons diff --git a/fish/functions/tide/configure/choices/all/show_time.fish b/fish/functions/tide/configure/choices/all/show_time.fish index 8cf1843..b66c785 100644 --- a/fish/functions/tide/configure/choices/all/show_time.fish +++ b/fish/functions/tide/configure/choices/all/show_time.fish @@ -7,20 +7,22 @@ function show_time set -a fake_tide_right_prompt_items time _tide_option 2 '24-hour format' - _tide_display_prompt fake_tide_time_format %T + set -g fake_tide_time_format %T + _tide_display_prompt _tide_option 3 '12-hour format' - _tide_display_prompt fake_tide_time_format '%r' + set -g fake_tide_time_format %r + _tide_display_prompt - _tide_menu + _tide_menu (status function) switch $_tide_selected_option - case 1 + case No set -g fake_tide_time_format '' set -e fake_tide_right_prompt_items[-1] - case 2 + case '24-hour format' set -g fake_tide_time_format %T - case 3 - set -g fake_tide_time_format '%r' + case '12-hour format' + set -g fake_tide_time_format %r end switch $_tide_configure_style case lean diff --git a/fish/functions/tide/configure/choices/all/style.fish b/fish/functions/tide/configure/choices/all/style.fish index ae52bc5..fe9a58f 100644 --- a/fish/functions/tide/configure/choices/all/style.fish +++ b/fish/functions/tide/configure/choices/all/style.fish @@ -1,4 +1,6 @@ function style + set -g _tide_configure_current_options + _tide_title 'Prompt Style' _tide_option 1 Lean @@ -13,15 +15,15 @@ function style _load_config rainbow _tide_display_prompt - _tide_style_menu + _tide_menu (status function) --no-restart switch $_tide_selected_option - case 1 + case Lean _load_config lean set -g _tide_configure_style lean - case 2 + case Classic _load_config classic set -g _tide_configure_style classic - case 3 + case Rainbow _load_config rainbow set -g _tide_configure_style rainbow end @@ -29,29 +31,6 @@ function style end function _load_config -a name + string replace -r '^' 'set -g fake_' <(status dirname)/../../icons.fish | source string replace -r '^' 'set -g fake_' <(status dirname)/../../configs/$name.fish | source end - -function _tide_style_menu # Exactly like _tide_menu except that it doesn't have (r) option - set -l list_with_slashes (string join '/' $_tide_option_list) - - echo '(q) Quit and do nothing'\n - - while true - set_color -o - read --nchars 1 --prompt-str "Choice [$list_with_slashes/q] " input - set_color normal - - switch $input - case q - set -e _tide_selected_option # Skip through all the _next_choices - set -e _tide_option_list - command -q clear && clear - break - case $_tide_option_list - set -e _tide_option_list - set -g _tide_selected_option $input - break - end - end -end diff --git a/fish/functions/tide/configure/choices/all/transient.fish b/fish/functions/tide/configure/choices/all/transient.fish new file mode 100644 index 0000000..df2b6b6 --- /dev/null +++ b/fish/functions/tide/configure/choices/all/transient.fish @@ -0,0 +1,22 @@ +function transient + _tide_title 'Enable transient prompt?' + + _tide_option 1 No + _tide_display_prompt + _tide_display_prompt + _tide_display_prompt + + _tide_option 2 Yes + _configure_transient= _tide_display_prompt + _configure_transient= _tide_display_prompt + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case No + set fake_tide_prompt_transient_enabled false + case Yes + set fake_tide_prompt_transient_enabled true + end + _next_choice all/finish +end diff --git a/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish b/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish index 2189f36..77ceeaf 100644 --- a/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish +++ b/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish @@ -17,15 +17,15 @@ function classic_prompt_color _set_all_items_bg_color 1C1C1C _tide_display_prompt - _tide_menu + _tide_menu (status function) switch $_tide_selected_option - case 1 + case Lightest _set_all_items_bg_color 585858 - case 2 + case Light _set_all_items_bg_color 444444 - case 3 + case Dark _set_all_items_bg_color 303030 - case 4 + case Darkest _set_all_items_bg_color 1C1C1C end _next_choice all/show_time diff --git a/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish b/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish index 17b88e4..20af6cd 100644 --- a/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish +++ b/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish @@ -7,34 +7,34 @@ function classic_prompt_separators _tide_display_prompt _tide_option 2 Vertical - set -g fake_tide_left_prompt_separator_same_color '│' - set -g fake_tide_right_prompt_separator_same_color '│' + set -g fake_tide_left_prompt_separator_same_color │ + set -g fake_tide_right_prompt_separator_same_color │ _tide_display_prompt _tide_option 3 Slanted - set -g fake_tide_left_prompt_separator_same_color '╱' - set -g fake_tide_right_prompt_separator_same_color '╱' + set -g fake_tide_left_prompt_separator_same_color ╱ + set -g fake_tide_right_prompt_separator_same_color ╱ _tide_display_prompt _tide_option 4 Round - set -g fake_tide_left_prompt_separator_same_color '' - set -g fake_tide_right_prompt_separator_same_color '' + set -g fake_tide_left_prompt_separator_same_color  + set -g fake_tide_right_prompt_separator_same_color  _tide_display_prompt - _tide_menu + _tide_menu (status function) switch $_tide_selected_option - case 1 + case Angled set -g fake_tide_left_prompt_separator_same_color  set -g fake_tide_right_prompt_separator_same_color  - case 2 - set -g fake_tide_left_prompt_separator_same_color '│' - set -g fake_tide_right_prompt_separator_same_color '│' - case 3 - set -g fake_tide_left_prompt_separator_same_color '╱' - set -g fake_tide_right_prompt_separator_same_color '╱' - case 4 - set -g fake_tide_left_prompt_separator_same_color '' - set -g fake_tide_right_prompt_separator_same_color '' + case Vertical + set -g fake_tide_left_prompt_separator_same_color │ + set -g fake_tide_right_prompt_separator_same_color │ + case Slanted + set -g fake_tide_left_prompt_separator_same_color ╱ + set -g fake_tide_right_prompt_separator_same_color ╱ + case Round + set -g fake_tide_left_prompt_separator_same_color  + set -g fake_tide_right_prompt_separator_same_color  end _next_choice powerline/powerline_prompt_heads end diff --git a/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish b/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish index 4db04a8..2077241 100644 --- a/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish +++ b/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish @@ -11,13 +11,13 @@ function lean_prompt_height set -g fake_tide_left_prompt_suffix ' ' _tide_display_prompt - _tide_menu + _tide_menu (status function) switch $_tide_selected_option - case 1 + case 'One line' _tide_find_and_remove newline fake_tide_left_prompt_items set fake_tide_left_prompt_suffix '' _next_choice all/prompt_connection_andor_frame_color - case 2 + case 'Two lines' _tide_find_and_remove newline fake_tide_left_prompt_items set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items[1..-2] newline $fake_tide_left_prompt_items[-1] set -g fake_tide_left_prompt_suffix ' ' diff --git a/fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish b/fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish deleted file mode 100644 index 19b3588..0000000 --- a/fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish +++ /dev/null @@ -1,46 +0,0 @@ -function powerline_prompt_frame - _tide_title 'Prompt Frame' - - _tide_option 1 'No frame' - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled false - set -a fake_tide_left_prompt_items character - _tide_display_prompt - set -e fake_tide_left_prompt_items[-1] - - _tide_option 2 Left - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled false - _tide_display_prompt - - _tide_option 3 Right - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled true - set -a fake_tide_left_prompt_items character - _tide_display_prompt - set -e fake_tide_left_prompt_items[-1] - - _tide_option 4 Full - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled true - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled false - set -a fake_tide_left_prompt_items character - case 2 - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled false - case 3 - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled true - set -a fake_tide_left_prompt_items character - case 4 - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled true - end - _next_choice all/prompt_connection_andor_frame_color -end diff --git a/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish b/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish index ac187c9..0030cad 100644 --- a/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish +++ b/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish @@ -6,35 +6,27 @@ function powerline_prompt_heads set -g fake_tide_right_prompt_prefix  _tide_display_prompt - _tide_option 2 Blurred - set -g fake_tide_left_prompt_suffix '▓▒░' - set -g fake_tide_right_prompt_prefix '░▒▓' + _tide_option 2 Slanted + set -g fake_tide_left_prompt_suffix  + set -g fake_tide_right_prompt_prefix  _tide_display_prompt - _tide_option 3 Slanted - set -g fake_tide_left_prompt_suffix '' - set -g fake_tide_right_prompt_prefix '' + _tide_option 3 Round + set -g fake_tide_left_prompt_suffix  + set -g fake_tide_right_prompt_prefix  _tide_display_prompt - _tide_option 4 Round - set -g fake_tide_left_prompt_suffix '' - set -g fake_tide_right_prompt_prefix '' - _tide_display_prompt - - _tide_menu + _tide_menu (status function) switch $_tide_selected_option - case 1 + case Sharp set -g fake_tide_left_prompt_suffix  set -g fake_tide_right_prompt_prefix  - case 2 - set -g fake_tide_left_prompt_suffix '▓▒░' - set -g fake_tide_right_prompt_prefix '░▒▓' - case 3 - set -g fake_tide_left_prompt_suffix '' - set -g fake_tide_right_prompt_prefix '' - case 4 - set -g fake_tide_left_prompt_suffix '' - set -g fake_tide_right_prompt_prefix '' + case Slanted + set -g fake_tide_left_prompt_suffix  + set -g fake_tide_right_prompt_prefix  + case Round + set -g fake_tide_left_prompt_suffix  + set -g fake_tide_right_prompt_prefix  end _next_choice powerline/powerline_prompt_tails end diff --git a/fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish b/fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish deleted file mode 100644 index 83fef05..0000000 --- a/fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish +++ /dev/null @@ -1,30 +0,0 @@ -function powerline_prompt_height - _tide_title 'Prompt Height' - - _tide_option 1 'One line' - _tide_find_and_remove newline fake_tide_left_prompt_items - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled false - _tide_display_prompt - - _tide_option 2 'Two lines' - set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items newline - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled true - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - _tide_find_and_remove newline fake_tide_left_prompt_items - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled false - _next_choice all/prompt_connection_andor_frame_color - case 2 - _tide_find_and_remove newline fake_tide_left_prompt_items - set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items newline - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled true - _next_choice all/prompt_connection - end -end diff --git a/fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish b/fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish new file mode 100644 index 0000000..b374757 --- /dev/null +++ b/fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish @@ -0,0 +1,51 @@ +function powerline_prompt_style + _tide_title 'Powerline Prompt Style' + + _tide_option 1 'One line' + _tide_find_and_remove newline fake_tide_left_prompt_items + _tide_find_and_remove character fake_tide_left_prompt_items + set fake_tide_left_prompt_frame_enabled false + set fake_tide_right_prompt_frame_enabled false + _tide_display_prompt + + set -a fake_tide_left_prompt_items newline + + _tide_option 2 'Two lines, character' + set -a fake_tide_left_prompt_items character + set fake_tide_left_prompt_frame_enabled false + set fake_tide_right_prompt_frame_enabled false + _tide_display_prompt + + _tide_option 3 'Two lines, frame' + _tide_find_and_remove character fake_tide_left_prompt_items + set fake_tide_left_prompt_frame_enabled true + set fake_tide_right_prompt_frame_enabled true + _tide_display_prompt + + _tide_option 4 'Two lines, character and frame' + set -a fake_tide_left_prompt_items character + set fake_tide_left_prompt_frame_enabled true + set fake_tide_right_prompt_frame_enabled true + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case 'One line' + _tide_find_and_remove newline fake_tide_left_prompt_items + _tide_find_and_remove character fake_tide_left_prompt_items + set fake_tide_left_prompt_frame_enabled false + set fake_tide_right_prompt_frame_enabled false + _next_choice all/prompt_connection_andor_frame_color + case 'Two lines, character' + set fake_tide_left_prompt_frame_enabled false + set fake_tide_right_prompt_frame_enabled false + _next_choice all/prompt_connection + case 'Two lines, frame' + _tide_find_and_remove character fake_tide_left_prompt_items + set fake_tide_left_prompt_frame_enabled true + set fake_tide_right_prompt_frame_enabled true + _next_choice all/prompt_connection + case 'Two lines, character and frame' + _next_choice all/prompt_connection + end +end diff --git a/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish b/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish index 02f4609..6b1574b 100644 --- a/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish +++ b/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish @@ -6,43 +6,35 @@ function powerline_prompt_tails set -g fake_tide_right_prompt_suffix '' _tide_display_prompt - _tide_option 2 Blurred - set -g fake_tide_left_prompt_prefix '░▒▓' - set -g fake_tide_right_prompt_suffix '▓▒░' - _tide_display_prompt - - _tide_option 3 Sharp + _tide_option 2 Sharp set -g fake_tide_left_prompt_prefix  set -g fake_tide_right_prompt_suffix  _tide_display_prompt - _tide_option 4 Slanted - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' + _tide_option 3 Slanted + set -g fake_tide_left_prompt_prefix  + set -g fake_tide_right_prompt_suffix  _tide_display_prompt - _tide_option 5 Round - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' + _tide_option 4 Round + set -g fake_tide_left_prompt_prefix  + set -g fake_tide_right_prompt_suffix  _tide_display_prompt - _tide_menu + _tide_menu (status function) switch $_tide_selected_option - case 1 + case Flat set -g fake_tide_left_prompt_prefix '' set -g fake_tide_right_prompt_suffix '' - case 2 - set -g fake_tide_left_prompt_prefix '░▒▓' - set -g fake_tide_right_prompt_suffix '▓▒░' - case 3 + case Sharp set -g fake_tide_left_prompt_prefix  set -g fake_tide_right_prompt_suffix  - case 4 - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - case 5 - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' + case Slanted + set -g fake_tide_left_prompt_prefix  + set -g fake_tide_right_prompt_suffix  + case Round + set -g fake_tide_left_prompt_prefix  + set -g fake_tide_right_prompt_suffix  end - _next_choice powerline/powerline_prompt_height + _next_choice powerline/powerline_prompt_style end diff --git a/fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish b/fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish new file mode 100644 index 0000000..a2d0a5b --- /dev/null +++ b/fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish @@ -0,0 +1,20 @@ +function powerline_right_prompt_frame + _tide_title 'Right Prompt Frame' + + _tide_option 1 No + set fake_tide_right_prompt_frame_enabled false + _tide_display_prompt + + _tide_option 2 Yes + set fake_tide_right_prompt_frame_enabled true + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case No + set fake_tide_right_prompt_frame_enabled false + case Yes + set fake_tide_right_prompt_frame_enabled true + end + _next_choice all/prompt_connection_andor_frame_color +end diff --git a/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish b/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish index 29f6ccc..14b9319 100644 --- a/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish +++ b/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish @@ -21,18 +21,18 @@ function rainbow_prompt_separators set -g fake_tide_right_prompt_separator_diff_color '' _tide_display_prompt - _tide_menu + _tide_menu (status function) switch $_tide_selected_option - case 1 + case Angled set -g fake_tide_left_prompt_separator_diff_color  set -g fake_tide_right_prompt_separator_diff_color  - case 2 + case Vertical set -g fake_tide_left_prompt_separator_diff_color '' set -g fake_tide_right_prompt_separator_diff_color '' - case 3 + case Slanted set -g fake_tide_left_prompt_separator_diff_color '' set -g fake_tide_right_prompt_separator_diff_color '' - case 4 + case Round set -g fake_tide_left_prompt_separator_diff_color '' set -g fake_tide_right_prompt_separator_diff_color '' end diff --git a/fish/functions/tide/configure/configs/classic.fish b/fish/functions/tide/configure/configs/classic.fish index f844676..86d2298 100644 --- a/fish/functions/tide/configure/configs/classic.fish +++ b/fish/functions/tide/configure/configs/classic.fish @@ -1,19 +1,10 @@ tide_aws_bg_color 444444 tide_aws_color FF9900 -tide_aws_icon  tide_character_color $_tide_color_green tide_character_color_failure FF0000 -tide_character_icon ❯ -tide_character_vi_icon_default ❮ -tide_character_vi_icon_replace ▶ -tide_character_vi_icon_visual V -tide_chruby_bg_color 444444 -tide_chruby_color B31209 -tide_chruby_icon  tide_cmd_duration_bg_color 444444 tide_cmd_duration_color 87875F tide_cmd_duration_decimals 0 -tide_cmd_duration_icon tide_cmd_duration_threshold 3000 tide_context_always_display false tide_context_bg_color 444444 @@ -23,25 +14,19 @@ tide_context_color_ssh D7AF87 tide_context_hostname_parts 1 tide_crystal_bg_color 444444 tide_crystal_color FFFFFF -tide_crystal_icon ⬢ tide_direnv_bg_color 444444 tide_direnv_bg_color_denied 444444 tide_direnv_color $_tide_color_gold tide_direnv_color_denied FF0000 -tide_direnv_icon ▼ tide_distrobox_bg_color 444444 tide_distrobox_color FF00FF -tide_distrobox_icon ⬢ tide_docker_bg_color 444444 tide_docker_color 2496ED tide_docker_default_contexts default colima -tide_docker_icon  tide_elixir_bg_color 444444 tide_elixir_color 4E2A8E -tide_elixir_icon  tide_gcloud_bg_color 444444 tide_gcloud_color 4285F4 -tide_gcloud_icon  tide_git_bg_color 444444 tide_git_bg_color_unstable 444444 tide_git_bg_color_urgent 444444 @@ -53,21 +38,16 @@ tide_git_color_staged $_tide_color_gold tide_git_color_stash $_tide_color_green tide_git_color_untracked $_tide_color_light_blue tide_git_color_upstream $_tide_color_green -tide_git_icon tide_git_truncation_length 24 tide_git_truncation_strategy tide_go_bg_color 444444 tide_go_color 00ACD7 -tide_go_icon  tide_java_bg_color 444444 tide_java_color ED8B00 -tide_java_icon  tide_jobs_bg_color 444444 tide_jobs_color $_tide_color_dark_green -tide_jobs_icon  tide_kubectl_bg_color 444444 tide_kubectl_color 326CE5 -tide_kubectl_icon ⎈ tide_left_prompt_frame_enabled true tide_left_prompt_items pwd git newline tide_left_prompt_prefix '' @@ -76,64 +56,53 @@ tide_left_prompt_separator_same_color  tide_left_prompt_suffix  tide_nix_shell_bg_color 444444 tide_nix_shell_color 7EBAE4 -tide_nix_shell_icon  tide_node_bg_color 444444 tide_node_color 44883E -tide_node_icon ⬢ tide_os_bg_color 444444 tide_os_color EEEEEE -tide_os_icon $os_branding_icon tide_php_bg_color 444444 tide_php_color 617CBE -tide_php_icon  tide_private_mode_bg_color 444444 tide_private_mode_color FFFFFF -tide_private_mode_icon 﫸 tide_prompt_add_newline_before true tide_prompt_color_frame_and_connection 6C6C6C tide_prompt_color_separator_same_color 949494 -tide_prompt_icon_connection ' ' tide_prompt_min_cols 34 tide_prompt_pad_items true +tide_prompt_transient_enabled false tide_pulumi_bg_color 444444 tide_pulumi_color F7BF2A -tide_pulumi_icon '' tide_pwd_bg_color 444444 tide_pwd_color_anchors $_tide_color_light_blue tide_pwd_color_dirs $_tide_color_dark_blue tide_pwd_color_truncated_dirs 8787AF -tide_pwd_icon -tide_pwd_icon_home -tide_pwd_icon_unwritable  tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json +tide_python_bg_color 444444 +tide_python_color 00AFAF tide_right_prompt_frame_enabled true -tide_right_prompt_items status cmd_duration context jobs direnv node virtual_env rustc java php pulumi chruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir +tide_right_prompt_items status cmd_duration context jobs direnv node python rustc java php pulumi ruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir tide_right_prompt_prefix  tide_right_prompt_separator_diff_color  tide_right_prompt_separator_same_color  tide_right_prompt_suffix '' +tide_ruby_bg_color 444444 +tide_ruby_color B31209 tide_rustc_bg_color 444444 tide_rustc_color F74C00 -tide_rustc_icon  tide_shlvl_bg_color 444444 tide_shlvl_color d78700 -tide_shlvl_icon  tide_shlvl_threshold 1 tide_status_bg_color 444444 tide_status_bg_color_failure 444444 tide_status_color $_tide_color_dark_green tide_status_color_failure D70000 -tide_status_icon ✔ -tide_status_icon_failure ✘ tide_terraform_bg_color 444444 tide_terraform_color 844FBA -tide_terraform_icon tide_time_bg_color 444444 tide_time_color 5F8787 tide_time_format %T tide_toolbox_bg_color 444444 tide_toolbox_color 613583 -tide_toolbox_icon ⬢ tide_vi_mode_bg_color_default 444444 tide_vi_mode_bg_color_insert 444444 tide_vi_mode_bg_color_replace 444444 @@ -142,10 +111,3 @@ tide_vi_mode_color_default 949494 tide_vi_mode_color_insert 87AFAF tide_vi_mode_color_replace 87AF87 tide_vi_mode_color_visual FF8700 -tide_vi_mode_icon_default D -tide_vi_mode_icon_insert I -tide_vi_mode_icon_replace R -tide_vi_mode_icon_visual V -tide_virtual_env_bg_color 444444 -tide_virtual_env_color 00AFAF -tide_virtual_env_icon  diff --git a/fish/functions/tide/configure/configs/classic_16color.fish b/fish/functions/tide/configure/configs/classic_16color.fish index 6043117..932279a 100644 --- a/fish/functions/tide/configure/configs/classic_16color.fish +++ b/fish/functions/tide/configure/configs/classic_16color.fish @@ -2,8 +2,6 @@ tide_aws_bg_color black tide_aws_color yellow tide_character_color brgreen tide_character_color_failure brred -tide_chruby_bg_color black -tide_chruby_color red tide_cmd_duration_bg_color black tide_cmd_duration_color brblack tide_context_bg_color black @@ -61,6 +59,10 @@ tide_pwd_bg_color black tide_pwd_color_anchors brcyan tide_pwd_color_dirs cyan tide_pwd_color_truncated_dirs magenta +tide_python_bg_color black +tide_python_color cyan +tide_ruby_bg_color black +tide_ruby_color red tide_rustc_bg_color black tide_rustc_color red tide_shlvl_bg_color black @@ -83,5 +85,3 @@ tide_vi_mode_color_default white tide_vi_mode_color_insert cyan tide_vi_mode_color_replace green tide_vi_mode_color_visual yellow -tide_virtual_env_bg_color black -tide_virtual_env_color cyan diff --git a/fish/functions/tide/configure/configs/lean.fish b/fish/functions/tide/configure/configs/lean.fish index 853bde9..8208e6e 100644 --- a/fish/functions/tide/configure/configs/lean.fish +++ b/fish/functions/tide/configure/configs/lean.fish @@ -1,19 +1,10 @@ tide_aws_bg_color normal tide_aws_color FF9900 -tide_aws_icon  tide_character_color $_tide_color_green tide_character_color_failure FF0000 -tide_character_icon ❯ -tide_character_vi_icon_default ❮ -tide_character_vi_icon_replace ▶ -tide_character_vi_icon_visual V -tide_chruby_bg_color normal -tide_chruby_color B31209 -tide_chruby_icon  tide_cmd_duration_bg_color normal tide_cmd_duration_color 87875F tide_cmd_duration_decimals 0 -tide_cmd_duration_icon tide_cmd_duration_threshold 3000 tide_context_always_display false tide_context_bg_color normal @@ -23,25 +14,19 @@ tide_context_color_ssh D7AF87 tide_context_hostname_parts 1 tide_crystal_bg_color normal tide_crystal_color FFFFFF -tide_crystal_icon ⬢ tide_direnv_bg_color normal tide_direnv_bg_color_denied normal tide_direnv_color $_tide_color_gold tide_direnv_color_denied FF0000 -tide_direnv_icon ▼ tide_distrobox_bg_color normal tide_distrobox_color FF00FF -tide_distrobox_icon ⬢ tide_docker_bg_color normal tide_docker_color 2496ED tide_docker_default_contexts default colima -tide_docker_icon  tide_elixir_bg_color normal tide_elixir_color 4E2A8E -tide_elixir_icon  tide_gcloud_bg_color normal tide_gcloud_color 4285F4 -tide_gcloud_icon  tide_git_bg_color normal tide_git_bg_color_unstable normal tide_git_bg_color_urgent normal @@ -53,21 +38,16 @@ tide_git_color_staged $_tide_color_gold tide_git_color_stash $_tide_color_green tide_git_color_untracked $_tide_color_light_blue tide_git_color_upstream $_tide_color_green -tide_git_icon tide_git_truncation_length 24 tide_git_truncation_strategy tide_go_bg_color normal tide_go_color 00ACD7 -tide_go_icon  tide_java_bg_color normal tide_java_color ED8B00 -tide_java_icon  tide_jobs_bg_color normal tide_jobs_color $_tide_color_dark_green -tide_jobs_icon  tide_kubectl_bg_color normal tide_kubectl_color 326CE5 -tide_kubectl_icon ⎈ tide_left_prompt_frame_enabled false tide_left_prompt_items pwd git newline character tide_left_prompt_prefix '' @@ -76,64 +56,53 @@ tide_left_prompt_separator_same_color ' ' tide_left_prompt_suffix ' ' tide_nix_shell_bg_color normal tide_nix_shell_color 7EBAE4 -tide_nix_shell_icon  tide_node_bg_color normal tide_node_color 44883E -tide_node_icon ⬢ tide_os_bg_color normal tide_os_color normal -tide_os_icon $os_branding_icon tide_php_bg_color normal tide_php_color 617CBE -tide_php_icon  tide_private_mode_bg_color normal tide_private_mode_color FFFFFF -tide_private_mode_icon 﫸 tide_prompt_add_newline_before true tide_prompt_color_frame_and_connection 6C6C6C tide_prompt_color_separator_same_color 949494 -tide_prompt_icon_connection ' ' tide_prompt_min_cols 34 tide_prompt_pad_items false +tide_prompt_transient_enabled false tide_pulumi_bg_color normal tide_pulumi_color F7BF2A -tide_pulumi_icon '' tide_pwd_bg_color normal tide_pwd_color_anchors $_tide_color_light_blue tide_pwd_color_dirs $_tide_color_dark_blue tide_pwd_color_truncated_dirs 8787AF -tide_pwd_icon -tide_pwd_icon_home -tide_pwd_icon_unwritable  tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json +tide_python_bg_color normal +tide_python_color 00AFAF tide_right_prompt_frame_enabled false -tide_right_prompt_items status cmd_duration context jobs direnv node virtual_env rustc java php pulumi chruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir +tide_right_prompt_items status cmd_duration context jobs direnv node python rustc java php pulumi ruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir tide_right_prompt_prefix ' ' tide_right_prompt_separator_diff_color ' ' tide_right_prompt_separator_same_color ' ' tide_right_prompt_suffix '' +tide_ruby_bg_color normal +tide_ruby_color B31209 tide_rustc_bg_color normal tide_rustc_color F74C00 -tide_rustc_icon  tide_shlvl_bg_color normal tide_shlvl_color d78700 -tide_shlvl_icon  tide_shlvl_threshold 1 tide_status_bg_color normal tide_status_bg_color_failure normal tide_status_color $_tide_color_dark_green tide_status_color_failure D70000 -tide_status_icon ✔ -tide_status_icon_failure ✘ tide_terraform_bg_color normal tide_terraform_color 844FBA -tide_terraform_icon tide_time_bg_color normal tide_time_color 5F8787 tide_time_format %T tide_toolbox_bg_color normal tide_toolbox_color 613583 -tide_toolbox_icon ⬢ tide_vi_mode_bg_color_default normal tide_vi_mode_bg_color_insert normal tide_vi_mode_bg_color_replace normal @@ -142,10 +111,3 @@ tide_vi_mode_color_default 949494 tide_vi_mode_color_insert 87AFAF tide_vi_mode_color_replace 87AF87 tide_vi_mode_color_visual FF8700 -tide_vi_mode_icon_default D -tide_vi_mode_icon_insert I -tide_vi_mode_icon_replace R -tide_vi_mode_icon_visual V -tide_virtual_env_bg_color normal -tide_virtual_env_color 00AFAF -tide_virtual_env_icon  diff --git a/fish/functions/tide/configure/configs/lean_16color.fish b/fish/functions/tide/configure/configs/lean_16color.fish index 546868d..5a1f726 100644 --- a/fish/functions/tide/configure/configs/lean_16color.fish +++ b/fish/functions/tide/configure/configs/lean_16color.fish @@ -2,8 +2,6 @@ tide_aws_bg_color normal tide_aws_color yellow tide_character_color brgreen tide_character_color_failure brred -tide_chruby_bg_color normal -tide_chruby_color red tide_cmd_duration_bg_color normal tide_cmd_duration_color brblack tide_context_bg_color normal @@ -61,6 +59,10 @@ tide_pwd_bg_color normal tide_pwd_color_anchors brcyan tide_pwd_color_dirs cyan tide_pwd_color_truncated_dirs magenta +tide_python_bg_color normal +tide_python_color cyan +tide_ruby_bg_color normal +tide_ruby_color red tide_rustc_bg_color normal tide_rustc_color red tide_shlvl_bg_color normal @@ -83,5 +85,3 @@ tide_vi_mode_color_default white tide_vi_mode_color_insert cyan tide_vi_mode_color_replace green tide_vi_mode_color_visual yellow -tide_virtual_env_bg_color normal -tide_virtual_env_color cyan diff --git a/fish/functions/tide/configure/configs/rainbow.fish b/fish/functions/tide/configure/configs/rainbow.fish index 5087f36..241895c 100644 --- a/fish/functions/tide/configure/configs/rainbow.fish +++ b/fish/functions/tide/configure/configs/rainbow.fish @@ -1,19 +1,10 @@ tide_aws_bg_color FF9900 tide_aws_color 232F3E -tide_aws_icon  tide_character_color $_tide_color_green tide_character_color_failure FF0000 -tide_character_icon ❯ -tide_character_vi_icon_default ❮ -tide_character_vi_icon_replace ▶ -tide_character_vi_icon_visual V -tide_chruby_bg_color B31209 -tide_chruby_color 000000 -tide_chruby_icon  tide_cmd_duration_bg_color C4A000 tide_cmd_duration_color 000000 tide_cmd_duration_decimals 0 -tide_cmd_duration_icon tide_cmd_duration_threshold 3000 tide_context_always_display false tide_context_bg_color 444444 @@ -23,25 +14,19 @@ tide_context_color_ssh D7AF87 tide_context_hostname_parts 1 tide_crystal_bg_color FFFFFF tide_crystal_color 000000 -tide_crystal_icon ⬢ tide_direnv_bg_color $_tide_color_gold tide_direnv_bg_color_denied FF0000 tide_direnv_color 000000 tide_direnv_color_denied 000000 -tide_direnv_icon ▼ tide_distrobox_bg_color FF00FF tide_distrobox_color 000000 -tide_distrobox_icon ⬢ tide_docker_bg_color 2496ED tide_docker_color 000000 tide_docker_default_contexts default colima -tide_docker_icon  tide_elixir_bg_color 4E2A8E tide_elixir_color 000000 -tide_elixir_icon  tide_gcloud_bg_color 4285F4 tide_gcloud_color 000000 -tide_gcloud_icon  tide_git_bg_color 4E9A06 tide_git_bg_color_unstable C4A000 tide_git_bg_color_urgent CC0000 @@ -53,21 +38,16 @@ tide_git_color_staged 000000 tide_git_color_stash 000000 tide_git_color_untracked 000000 tide_git_color_upstream 000000 -tide_git_icon tide_git_truncation_length 24 tide_git_truncation_strategy tide_go_bg_color 00ACD7 tide_go_color 000000 -tide_go_icon  tide_java_bg_color ED8B00 tide_java_color 000000 -tide_java_icon  tide_jobs_bg_color 444444 tide_jobs_color 4E9A06 -tide_jobs_icon  tide_kubectl_bg_color 326CE5 tide_kubectl_color 000000 -tide_kubectl_icon ⎈ tide_left_prompt_frame_enabled true tide_left_prompt_items pwd git newline tide_left_prompt_prefix '' @@ -76,64 +56,53 @@ tide_left_prompt_separator_same_color  tide_left_prompt_suffix  tide_nix_shell_bg_color 7EBAE4 tide_nix_shell_color 000000 -tide_nix_shell_icon  tide_node_bg_color 44883E tide_node_color 000000 -tide_node_icon ⬢ tide_os_bg_color $os_branding_bg_color tide_os_color $os_branding_color -tide_os_icon $os_branding_icon tide_php_bg_color 617CBE tide_php_color 000000 -tide_php_icon  tide_private_mode_bg_color F1F3F4 tide_private_mode_color 000000 -tide_private_mode_icon 﫸 tide_prompt_add_newline_before true tide_prompt_color_frame_and_connection 6C6C6C tide_prompt_color_separator_same_color 949494 -tide_prompt_icon_connection ' ' tide_prompt_min_cols 34 tide_prompt_pad_items true +tide_prompt_transient_enabled false tide_pulumi_bg_color F7BF2A tide_pulumi_color 000000 -tide_pulumi_icon '' tide_pwd_bg_color 3465A4 tide_pwd_color_anchors E4E4E4 tide_pwd_color_dirs E4E4E4 tide_pwd_color_truncated_dirs BCBCBC -tide_pwd_icon -tide_pwd_icon_home -tide_pwd_icon_unwritable  tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json +tide_python_bg_color 444444 +tide_python_color 00AFAF tide_right_prompt_frame_enabled true -tide_right_prompt_items status cmd_duration context jobs direnv node virtual_env rustc java php pulumi chruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir +tide_right_prompt_items status cmd_duration context jobs direnv node python rustc java php pulumi ruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir tide_right_prompt_prefix  tide_right_prompt_separator_diff_color  tide_right_prompt_separator_same_color  tide_right_prompt_suffix '' +tide_ruby_bg_color B31209 +tide_ruby_color 000000 tide_rustc_bg_color F74C00 tide_rustc_color 000000 -tide_rustc_icon  tide_shlvl_bg_color 808000 tide_shlvl_color 000000 -tide_shlvl_icon  tide_shlvl_threshold 1 tide_status_bg_color 2E3436 tide_status_bg_color_failure CC0000 tide_status_color 4E9A06 tide_status_color_failure FFFF00 -tide_status_icon ✔ -tide_status_icon_failure ✘ tide_terraform_bg_color 800080 tide_terraform_color 000000 -tide_terraform_icon tide_time_bg_color D3D7CF tide_time_color 000000 tide_time_format %T tide_toolbox_bg_color 613583 tide_toolbox_color 000000 -tide_toolbox_icon ⬢ tide_vi_mode_bg_color_default 949494 tide_vi_mode_bg_color_insert 87AFAF tide_vi_mode_bg_color_replace 87AF87 @@ -142,10 +111,3 @@ tide_vi_mode_color_default 000000 tide_vi_mode_color_insert 000000 tide_vi_mode_color_replace 000000 tide_vi_mode_color_visual 000000 -tide_vi_mode_icon_default D -tide_vi_mode_icon_insert I -tide_vi_mode_icon_replace R -tide_vi_mode_icon_visual V -tide_virtual_env_bg_color 444444 -tide_virtual_env_color 00AFAF -tide_virtual_env_icon  diff --git a/fish/functions/tide/configure/configs/rainbow_16color.fish b/fish/functions/tide/configure/configs/rainbow_16color.fish index 7803596..148f3df 100644 --- a/fish/functions/tide/configure/configs/rainbow_16color.fish +++ b/fish/functions/tide/configure/configs/rainbow_16color.fish @@ -2,8 +2,6 @@ tide_aws_bg_color yellow tide_aws_color brblack tide_character_color brgreen tide_character_color_failure brred -tide_chruby_bg_color red -tide_chruby_color black tide_cmd_duration_bg_color yellow tide_cmd_duration_color black tide_context_bg_color brblack @@ -61,6 +59,10 @@ tide_pwd_bg_color blue tide_pwd_color_anchors brwhite tide_pwd_color_dirs brwhite tide_pwd_color_truncated_dirs white +tide_python_bg_color brblack +tide_python_color cyan +tide_ruby_bg_color red +tide_ruby_color black tide_rustc_bg_color red tide_rustc_color black tide_shlvl_bg_color yellow @@ -87,5 +89,3 @@ tide_vi_mode_icon_default D tide_vi_mode_icon_insert I tide_vi_mode_icon_replace R tide_vi_mode_icon_visual V -tide_virtual_env_bg_color brblack -tide_virtual_env_color cyan diff --git a/fish/functions/tide/configure/functions/_fake_tide_item_character.fish b/fish/functions/tide/configure/functions/_fake_tide_item_character.fish index 73ae055..94892ec 100644 --- a/fish/functions/tide/configure/functions/_fake_tide_item_character.fish +++ b/fish/functions/tide/configure/functions/_fake_tide_item_character.fish @@ -1,5 +1,8 @@ function _fake_tide_item_character set_color $fake_tide_character_color - contains newline $fake_tide_left_prompt_items || echo -ns ' ' - echo -ns $fake_tide_character_icon + if contains newline $fake_tide_left_prompt_items || set -q _configure_transient + echo -ns $fake_tide_character_icon + else + echo -ns ' '$fake_tide_character_icon + end end diff --git a/fish/functions/tide/configure/icons.fish b/fish/functions/tide/configure/icons.fish new file mode 100644 index 0000000..f2d405b --- /dev/null +++ b/fish/functions/tide/configure/icons.fish @@ -0,0 +1,39 @@ +tide_aws_icon  # Actual aws glyph is harder to see +tide_character_icon ❯ +tide_character_vi_icon_default ❮ +tide_character_vi_icon_replace ▶ +tide_character_vi_icon_visual V +tide_cmd_duration_icon +tide_crystal_icon  +tide_direnv_icon ▼ +tide_distrobox_icon 󰆧 +tide_docker_icon  +tide_elixir_icon  +tide_gcloud_icon 󰊭 # Actual google cloud glyph is harder to see +tide_git_icon +tide_go_icon  +tide_java_icon  +tide_jobs_icon  +tide_kubectl_icon 󱃾 +tide_nix_shell_icon  +tide_node_icon  # Actual nodejs glyph is harder to see +tide_os_icon $os_branding_icon +tide_php_icon  +tide_private_mode_icon 󰗹 +tide_prompt_icon_connection ' ' +tide_pulumi_icon  +tide_pwd_icon +tide_pwd_icon_home +tide_pwd_icon_unwritable  +tide_python_icon 󰌠 +tide_ruby_icon  +tide_rustc_icon  +tide_shlvl_icon  +tide_status_icon ✔ +tide_status_icon_failure ✘ +tide_terraform_icon +tide_toolbox_icon  +tide_vi_mode_icon_default D +tide_vi_mode_icon_insert I +tide_vi_mode_icon_replace R +tide_vi_mode_icon_visual V diff --git a/i3/config.d/catppuccin-mocha.conf b/i3/config.d/catppuccin-mocha.conf new file mode 100644 index 0000000..c02dda2 --- /dev/null +++ b/i3/config.d/catppuccin-mocha.conf @@ -0,0 +1,33 @@ +set $rosewater #f5e0dc +set $flamingo #f2cdcd +set $pink #f5c2e7 +set $mauve #cba6f7 +set $red #f38ba8 +set $maroon #eba0ac +set $peach #fab387 +set $green #a6e3a1 +set $teal #94e2d5 +set $sky #89dceb +set $sapphire #74c7ec +set $blue #89b4fa +set $lavender #b4befe +set $text #cdd6f4 +set $subtext1 #bac2de +set $subtext0 #a6adc8 +set $overlay2 #9399b2 +set $overlay1 #7f849c +set $overlay0 #6c7086 +set $surface2 #585b70 +set $surface1 #45475a +set $surface0 #313244 +set $base #1e1e2e +set $mantle #181825 +set $crust #11111b + +# target title bg text indicator border +client.focused $mauve $base $text $rosewater $mauve +client.focused_inactive $overlay0 $base $text $rosewater $overlay0 +client.unfocused $overlay0 $base $text $rosewater $overlay0 +client.urgent $mauve $base $mauve $overlay0 $mauve +client.placeholder $overlay0 $base $text $overlay0 $overlay0 +client.background $base diff --git a/sway/config b/sway/config index af3a50d..1e2732f 100644 --- a/sway/config +++ b/sway/config @@ -26,13 +26,11 @@ for_window [window_role="task_dialog"] floating enable # shutdown / restart / suspend... set $lockwall "swaylock -c 202f56" -set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (CTRL+s) shutdown +set $mode_system System (l) lock, (e) logout, (r) reboot, (s) shutdown mode "$mode_system" { bindsym l exec --no-startup-id $lockwall, mode "default" bindsym e exec --no-startup-id swaymsg exit, mode "default" - bindsym s exec --no-startup-id $lockwall && systemctl suspend, mode "default" - bindsym h exec --no-startup-id $lockwall && systemctl hibernate, mode "default" bindsym r exec --no-startup-id systemctl reboot, mode "default" bindsym Ctrl+s exec --no-startup-id systemctl poweroff -i, mode "default" @@ -55,12 +53,14 @@ bar { } } +# background +#exec --no-startup-id swaybg -i /home/askiiart/.config/sway/background.png + ##### END Custom stuff ##### ### Output configuration # # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) -# MODIFIED: path changed output * bg /home/askiiart/.config/sway/background.png fill # # Example configuration: @@ -236,7 +236,7 @@ bindsym $mod+r mode "resize" # # Status Bar: -# MODIFIED: commented out +# # Read `man 5 sway-bar` for more information about this section. #bar { # position top @@ -253,5 +253,4 @@ bindsym $mod+r mode "resize" #} include /etc/sway/config.d/* -# MODIFIED: added include include /home/askiiart/.config/sway/config.d/* diff --git a/sway/lid-close.sh b/sway/lid-close.sh old mode 100644 new mode 100755 index b561e39..f8b109b --- a/sway/lid-close.sh +++ b/sway/lid-close.sh @@ -1,4 +1,4 @@ #!/bin/sh -swaymsg output eDP-1 dpms off swaylock -f -c 202f56 -systemctl suspend \ No newline at end of file +systemctl suspend +iwctl station wlan0 connect Wifey diff --git a/universal-shellrc.txt b/universal-shellrc.txt index e41617f..c2d21d2 100644 --- a/universal-shellrc.txt +++ b/universal-shellrc.txt @@ -6,8 +6,6 @@ alias adb="sudo adb" # Needed on Fedora, not on Debian, IDK about other distros alias ls="ls --color=auto -CF" alias ll="ls -l" alias la="ls -a" -gpgconf --launch gpg-agent -gpg-connect-agent updatestartuptty /bye alias icat="kitten icat" alias lock="i3lock -c 202f56" diff --git a/vscode/extensions.txt b/vscode/extensions.txt index 5c237a0..fcd9bee 100644 --- a/vscode/extensions.txt +++ b/vscode/extensions.txt @@ -30,7 +30,8 @@ GrapeCity.gc-excelviewer Gruntfuggly.todo-tree HarryHopkinson.vim-theme hoovercj.vscode-settings-cycler -]ItzSelenux.lm-theme +icrawl.discord-vscode +ItzSelenux.lm-theme JoelCrosby.one-dark-darker kisstkondoros.vscode-gutter-preview kokoscript.loopytheme diff --git a/vscode/keybindings.json b/vscode/keybindings.json new file mode 100644 index 0000000..279e1b0 --- /dev/null +++ b/vscode/keybindings.json @@ -0,0 +1,11 @@ +// Place your key bindings in this file to override the defaults +[ + { + "key": "alt+\\", + "command": "settings.cycle.inlineCopilot", + }, + { + "key": "f10", + "command": "C_Cpp.BuildAndRunFile" + } +] \ No newline at end of file diff --git a/vscode/settings.json b/vscode/settings.json index 10f70fc..6828439 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -2,7 +2,7 @@ "editor.inlineSuggest.enabled": true, "git.autofetch": true, "github.copilot.enable": { - "*": true, + "*": false, "plaintext": true, "markdown": true, "scminput": false,