Update fisher & tide, add VS Code, i3, & sway configs

README.md

@@ -7,8 +7,3 @@ My dotfiles for:
 - kitty
 - nvim
 - gpg
-- 
-
-## Other stuff
-
-Tide prompt command: `tide configure --auto --style=Classic --prompt_colors='True color' --classic_prompt_color=Dark --show_time='24-hour format' --classic_prompt_separators=Vertical --powerline_prompt_heads=Sharp --powerline_prompt_tails=Flat --powerline_prompt_style='One line' --prompt_spacing=Compact --icons='Many icons' --transient=No`

backup.sh

@@ -25,6 +25,7 @@ cp $HOME/.gnupg/gpg-agent.conf $GIT_DIR/gnupg/
 rm -rf $GIT_DIR/VencordDesktop
 cp -r $HOME/.config/VencordDesktop/VencordDesktop/ $GIT_DIR
 
+# VS code
 rm -rf $GIT_DIR/vscode
 mkdir $GIT_DIR/vscode
 code --list-extensions >$GIT_DIR/vscode/extensions.txt

fish/completions/tide.fish

@@ -1,10 +1,9 @@
 complete tide --no-files
 
-set -l subcommands bug-report configure reload
+set -l subcommands bug-report configure
 
 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"

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:"
-            _tide_fish_colorize "fisher install ilancosman/tide@v6"
+            echo -ns "fisher install ilancosman/tide@v5" | fish_indent --ansi
             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 ' (_tide_fish_colorize "tide configure") ' to customize your prompt.'
+                echo -s \n 'Run ' (echo -ns "tide configure" | fish_indent --ansi) ' 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:"
-        _tide_fish_colorize "fisher install ilancosman/tide@v6"
+        echo -ns "fisher install ilancosman/tide@v5" | fish_indent --ansi
         sleep 3
     end
 end

fish/fish_plugins

@@ -1 +1,2 @@
-ilancosman/tide@v6
+jorgebucaran/fisher
+ilancosman/tide@v5

fish/functions/_tide_detect_os.fish

@@ -69,8 +69,6 @@ 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

fish/functions/_tide_fish_colorize.fish

@@ -1,7 +0,0 @@
-function _tide_fish_colorize
-    if command -q fish_indent
-        echo -ns "$argv" | fish_indent --ansi
-    else
-        echo -ns "$argv"
-    end
-end

fish/functions/_tide_item_chruby.fish

@@ -0,0 +1,3 @@
+function _tide_item_chruby
+    test -n "$RUBY_VERSION" && _tide_print_item chruby $tide_chruby_icon' ' $RUBY_VERSION
+end

fish/functions/_tide_item_context.fish

@@ -1,14 +1,15 @@
 function _tide_item_context
     if set -q SSH_TTY
-        set -fx tide_context_color $tide_context_color_ssh
+        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])
     else if test "$EUID" = 0
-        set -fx tide_context_color $tide_context_color_root
+        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])
     else if test "$tide_context_always_display" = true
-        set -fx tide_context_color $tide_context_color_default
+        set -lx tide_context_color $tide_context_color_default
-    else
+        test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER ||
-        return
+            h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts])
     end
-
-    string match -qr "^(?<h>(\.?[^\.]*){0,$tide_context_hostname_parts})" @$hostname
-    _tide_print_item context $USER$h
 end

fish/functions/_tide_item_crystal.fish

@@ -1,6 +1,4 @@
 function _tide_item_crystal
-    if path is $_tide_parent_dirs/shard.yml
+    path is $_tide_parent_dirs/shard.yml &&
-        crystal --version | string match -qr "(?<v>[\d.]+)"
+        _tide_print_item crystal $tide_crystal_icon' ' (crystal --version | string match -r "[\d.]+")[1]
-        _tide_print_item crystal $tide_crystal_icon' ' $v
-    end
 end

fish/functions/_tide_item_git.fish

@@ -14,17 +14,12 @@ function _tide_item_git
 
     # Operation
     if test -d $gdir/rebase-merge
-        # 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
-        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

fish/functions/_tide_item_go.fish

@@ -1,6 +1,4 @@
 function _tide_item_go
-    if path is $_tide_parent_dirs/go.mod
+    path is $_tide_parent_dirs/go.mod &&
-        go version | string match -qr "(?<v>[\d.]+)"
+        _tide_print_item go $tide_go_icon' ' (go version | string match -r "[\d.]+")
-        _tide_print_item go $tide_go_icon' ' $v
-    end
 end

fish/functions/_tide_item_java.fish

@@ -1,6 +1,4 @@
 function _tide_item_java
-    if path is $_tide_parent_dirs/pom.xml
+    path is $_tide_parent_dirs/pom.xml &&
-        java -version &| string match -qr "(?<v>[\d.]+)"
+        _tide_print_item java $tide_java_icon' ' (java -version &| string match -r "[\d.]+")[1]
-        _tide_print_item java $tide_java_icon' ' $v
-    end
 end

fish/functions/_tide_item_node.fish

@@ -1,6 +1,4 @@
 function _tide_item_node
-    if path is $_tide_parent_dirs/package.json
+    path is $_tide_parent_dirs/package.json &&
-        node --version | string match -qr "v(?<v>.*)"
+        _tide_print_item node $tide_node_icon' ' (node --version | string trim --chars=v)
-        _tide_print_item node $tide_node_icon' ' $v
-    end
 end

fish/functions/_tide_item_php.fish

@@ -1,6 +1,4 @@
 function _tide_item_php
-    if path is $_tide_parent_dirs/composer.json
+    path is $_tide_parent_dirs/composer.json &&
-        php --version | string match -qr "(?<v>[\d.]+)"
+        _tide_print_item php $tide_php_icon' ' (php --version | string match -r 'PHP ([\d.]+)')[2]
-        _tide_print_item php $tide_php_icon' ' $v
-    end
 end

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 match -qr "(?<path_hash>.{40})"
+            echo -n "$yaml_path" | sha1sum | string sub -e40 | read -f path_hash
         else if command -q shasum
-            echo -n "$yaml_path" | shasum | string match -qr "(?<path_hash>.{40})"
+            echo -n "$yaml_path" | shasum | string sub -e40 | read -f path_hash
-        else
-            return
         end
 
-        string match -qr 'name: *(?<project_name>.*)' <$yaml_path
+        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"
 
             if test -e $workspace_file
-            string match -qr '"stack": *"(?<stack>.*)"' <$workspace_file
+                string match -rg '"stack": *"(.*)"' <$workspace_file | read -l stack
                 _tide_print_item pulumi $tide_pulumi_icon' ' $stack
             end
         end
+    end
 end

fish/functions/_tide_item_python.fish

@@ -1,20 +0,0 @@
-function _tide_item_python
-    if test -n "$VIRTUAL_ENV"
-        python --version | string match -qr "(?<v>[\d.]+)"
-
-        string match -qr "^.*/(?<dir>.*)/(?<base>.*)" $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>.*)-.*" $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 "(?<v>[\d.]+)"
-        _tide_print_item python $tide_python_icon' ' $v
-    end
-end

fish/functions/_tide_item_ruby.fish

@@ -1,6 +0,0 @@
-function _tide_item_ruby
-    if path is $_tide_parent_dirs/{*.gemspec,Gemfile,Rakefile,.ruby-version}
-        ruby --version | string match -qr "(?<v>[\d.]+)"
-        _tide_print_item ruby $tide_ruby_icon' ' $v
-    end
-end

fish/functions/_tide_item_rustc.fish

@@ -1,6 +1,4 @@
 function _tide_item_rustc
-    if path is $_tide_parent_dirs/Cargo.toml
+    path is $_tide_parent_dirs/Cargo.toml &&
-        rustc --version | string match -qr "(?<v>[\d.]+)"
+        _tide_print_item rustc $tide_rustc_icon' ' (rustc --version | string split ' ')[2]
-        _tide_print_item rustc $tide_rustc_icon' ' $v
-    end
 end

fish/functions/_tide_item_virtual_env.fish

@@ -0,0 +1,11 @@
+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

fish/functions/_tide_pwd.fish

@@ -25,13 +25,9 @@ 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 \"(?<trunc>\..|.)\" \$dir_section
-
+            while v=\$parent_dir/\$trunc*/ set -q v[2] && string match -qr \"(?<trunc>\$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 \"(?<trunc>\$(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

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 crystal direnv distrobox docker elixir gcloud git go java kubectl nix_shell node php pulumi python ruby rustc terraform toolbox
+    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
         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

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@v6"
+        source && fisher install ilancosman/tide@v5"
     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

fish/functions/_tide_sub_configure.fish

@@ -15,16 +15,7 @@ for file in (status dirname)/tide/configure/{choices, functions}/**.fish
 end
 
 function _tide_sub_configure
-    set -l choices (path basename (status dirname)/tide/configure/choices/**.fish | path change-extension '')
+    if test $COLUMNS -lt 55 -o $LINES -lt 21
-    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
@@ -46,86 +37,51 @@ 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_symbol_list $symbol
+    set -ga _tide_option_list $symbol
-    set -ga _tide_option_list $text
-
-    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 -a func
+function _tide_menu
-    if set -q _flag_auto
+    set -l list_with_slashes (string join '/' $_tide_option_list)
-        set -l flag_var_name _flag_$func
-        set -g _tide_selected_option $$flag_var_name
 
-        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 read --nchars 1 --prompt-str \
+    while true
-            "$(set_color -o)Choice [$(string join '/' $_tide_symbol_list $r q)] $(set_color normal)" input
+        set_color -o
+        read --nchars 1 --prompt-str "Choice [$list_with_slashes/r/q] " input
+        set_color normal
+
         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
-                _tide_exit_configure
+                set -e _tide_selected_option # Skip through all the _next_choices
-                set -e _tide_symbol_list
                 set -e _tide_option_list
                 command -q clear && clear
                 break
-            case $_tide_symbol_list
+            case $_tide_option_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
+function _tide_display_prompt -a var_name var_value
-    set -q _flag_auto && return
+    test -n "$var_name" && set -g $var_name $var_value
-
     _fake_tide_cache_variables
     set -l prompt (_fake_tide_prompt)
 
@@ -133,24 +89,7 @@ function _tide_display_prompt
     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"
 
-    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
-end
+    echo
-
-function _tide_exit_configure
-    set -e _tide_selected_option # Skip through all switch and _next_choice
 end

fish/functions/_tide_sub_reload.fish

@@ -1,3 +0,0 @@
-function _tide_sub_reload
-    source (functions --details fish_prompt)
-end

fish/functions/fish_prompt.fish

@@ -34,35 +34,6 @@ 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)
 
-    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
@@ -86,42 +57,12 @@ 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"
 
-    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
@@ -142,24 +83,8 @@ 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

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 6.0.1'
+        echo 'tide, version 5.6.0'
     else if set -q _flag_help
         _tide_help
     else if functions --query _tide_sub_$argv[1]
@@ -23,6 +23,5 @@ function _tide_help
         '' \
         'Subcommands:' \
         '  configure   run interactive configuration wizard' \
-        '  reload      reload tide configuration' \
         '  bug-report  print info for use in bug reports'
 end

fish/functions/tide/configure/choices/all/finish.fish

@@ -1,30 +1,21 @@
 function finish
-    _tide_title Finish
-
-    echo
     set_color red
-    _tide_option y 'Overwrite your current tide config'
+    _tide_title 'Overwrite tide config?'
     set_color normal
+
+    _tide_option y Yes
     echo
 
-    _tide_option p 'Exit and print the config you just generated'
+    _tide_menu
-    echo
-
-    _tide_menu (status function)
     switch $_tide_selected_option
-        case 'Overwrite your current tide config'
+        case y
             _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
-    _tide_exit_configure
+    set -e _tide_selected_option # Skip through all the _next_choices
 
     # Deal with prompt char/vi mode
     contains character $fake_tide_left_prompt_items || set -p fake_tide_left_prompt_items vi_mode
@@ -38,9 +29,5 @@ function _tide_finish
     set -e $_tide_prompt_var 2>/dev/null
 
     # Re-initialize the prompt
-    tide reload
+    source (functions --details fish_prompt)
-end
-
-function _tide_print_configure_current_options
-    _tide_fish_colorize "tide configure --auto $_tide_configure_current_options"
 end

fish/functions/tide/configure/choices/all/icons.fish

@@ -8,12 +8,12 @@ function icons
     _enable_icons
     _tide_display_prompt
 
-    _tide_menu (status function)
+    _tide_menu
     switch $_tide_selected_option
-        case 'Few icons'
+        case 1
             _disable_icons
     end
-    _next_choice all/transient
+    _next_choice all/finish
 end
 
 function _enable_icons

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 (status function)
+    _tide_menu
     switch $_tide_selected_option
-        case 'True color'
+        case 1
             _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 '16 colors'
+        case 2
             _next_choice all/show_time
     end
 end

fish/functions/tide/configure/choices/all/prompt_connection.fish

@@ -2,30 +2,27 @@ function prompt_connection
     _tide_title 'Prompt Connection'
 
     _tide_option 1 Disconnected
-    set -g fake_tide_prompt_icon_connection ' '
+    _tide_display_prompt fake_tide_prompt_icon_connection ' '
-    _tide_display_prompt
 
     _tide_option 2 Dotted
-    set -g fake_tide_prompt_icon_connection '·'
+    _tide_display_prompt fake_tide_prompt_icon_connection '·'
-    _tide_display_prompt
 
     _tide_option 3 Solid
-    set -g fake_tide_prompt_icon_connection '─'
+    _tide_display_prompt fake_tide_prompt_icon_connection '─'
-    _tide_display_prompt
 
-    _tide_menu (status function)
+    _tide_menu
     switch $_tide_selected_option
-        case Disconnected
+        case 1
             set -g fake_tide_prompt_icon_connection ' '
-        case Dotted
+        case 2
             set -g fake_tide_prompt_icon_connection '·'
-        case Solid
+        case 3
             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_right_prompt_frame
+            _next_choice powerline/powerline_prompt_frame
     end
 end

fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish

@@ -10,30 +10,26 @@ function prompt_connection_andor_frame_color
     _tide_title "Connection & Frame Color"
 
     _tide_option 1 Lightest
-    set -g fake_tide_prompt_color_frame_and_connection 808080
+    _tide_display_prompt fake_tide_prompt_color_frame_and_connection 808080
-    _tide_display_prompt
 
     _tide_option 2 Light
-    set -g fake_tide_prompt_color_frame_and_connection 6C6C6C
+    _tide_display_prompt fake_tide_prompt_color_frame_and_connection 6C6C6C
-    _tide_display_prompt
 
     _tide_option 3 Dark
-    set -g fake_tide_prompt_color_frame_and_connection 585858
+    _tide_display_prompt fake_tide_prompt_color_frame_and_connection 585858
-    _tide_display_prompt
 
     _tide_option 4 Darkest
-    set -g fake_tide_prompt_color_frame_and_connection 444444
+    _tide_display_prompt fake_tide_prompt_color_frame_and_connection 444444
-    _tide_display_prompt
 
-    _tide_menu (status function)
+    _tide_menu
     switch $_tide_selected_option
-        case Lightest
+        case 1
             set -g fake_tide_prompt_color_frame_and_connection 808080
-        case Light
+        case 2
             set -g fake_tide_prompt_color_frame_and_connection 6C6C6C
-        case Dark
+        case 3
             set -g fake_tide_prompt_color_frame_and_connection 585858
-        case Darkest
+        case 4
             set -g fake_tide_prompt_color_frame_and_connection 444444
     end
     _next_choice all/prompt_spacing

fish/functions/tide/configure/choices/all/prompt_spacing.fish

@@ -2,20 +2,19 @@ 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 (status function)
+    _tide_menu
     switch $_tide_selected_option
-        case Compact
+        case 1
             set -g fake_tide_prompt_add_newline_before false
-        case Sparse
+        case 2
             set -g fake_tide_prompt_add_newline_before true
     end
     _next_choice all/icons

fish/functions/tide/configure/choices/all/show_time.fish

@@ -7,22 +7,20 @@ function show_time
     set -a fake_tide_right_prompt_items time
 
     _tide_option 2 '24-hour format'
-    set -g fake_tide_time_format %T
+    _tide_display_prompt fake_tide_time_format %T
-    _tide_display_prompt
 
     _tide_option 3 '12-hour format'
-    set -g fake_tide_time_format %r
+    _tide_display_prompt fake_tide_time_format '%r'
-    _tide_display_prompt
 
-    _tide_menu (status function)
+    _tide_menu
     switch $_tide_selected_option
-        case No
+        case 1
             set -g fake_tide_time_format ''
             set -e fake_tide_right_prompt_items[-1]
-        case '24-hour format'
+        case 2
             set -g fake_tide_time_format %T
-        case '12-hour format'
+        case 3
-            set -g fake_tide_time_format %r
+            set -g fake_tide_time_format '%r'
     end
     switch $_tide_configure_style
         case lean

fish/functions/tide/configure/choices/all/style.fish

@@ -1,6 +1,4 @@
 function style
-    set -g _tide_configure_current_options
-
     _tide_title 'Prompt Style'
 
     _tide_option 1 Lean
@@ -15,15 +13,15 @@ function style
     _load_config rainbow
     _tide_display_prompt
 
-    _tide_menu (status function) --no-restart
+    _tide_style_menu
     switch $_tide_selected_option
-        case Lean
+        case 1
             _load_config lean
             set -g _tide_configure_style lean
-        case Classic
+        case 2
             _load_config classic
             set -g _tide_configure_style classic
-        case Rainbow
+        case 3
             _load_config rainbow
             set -g _tide_configure_style rainbow
     end
@@ -31,6 +29,29 @@ 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

fish/functions/tide/configure/choices/all/transient.fish

@@ -1,22 +0,0 @@
-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

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 (status function)
+    _tide_menu
     switch $_tide_selected_option
-        case Lightest
+        case 1
             _set_all_items_bg_color 585858
-        case Light
+        case 2
             _set_all_items_bg_color 444444
-        case Dark
+        case 3
             _set_all_items_bg_color 303030
-        case Darkest
+        case 4
             _set_all_items_bg_color 1C1C1C
     end
     _next_choice all/show_time

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_left_prompt_separator_same_color '│'
-    set -g fake_tide_right_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_left_prompt_separator_same_color '╱'
-    set -g fake_tide_right_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_left_prompt_separator_same_color ''
-    set -g fake_tide_right_prompt_separator_same_color 
+    set -g fake_tide_right_prompt_separator_same_color ''
     _tide_display_prompt
 
-    _tide_menu (status function)
+    _tide_menu
     switch $_tide_selected_option
-        case Angled
+        case 1
             set -g fake_tide_left_prompt_separator_same_color 
             set -g fake_tide_right_prompt_separator_same_color 
-        case Vertical
+        case 2
-            set -g fake_tide_left_prompt_separator_same_color │
+            set -g fake_tide_left_prompt_separator_same_color '│'
-            set -g fake_tide_right_prompt_separator_same_color │
+            set -g fake_tide_right_prompt_separator_same_color '│'
-        case Slanted
+        case 3
-            set -g fake_tide_left_prompt_separator_same_color ╱
+            set -g fake_tide_left_prompt_separator_same_color '╱'
-            set -g fake_tide_right_prompt_separator_same_color ╱
+            set -g fake_tide_right_prompt_separator_same_color '╱'
-        case Round
+        case 4
-            set -g fake_tide_left_prompt_separator_same_color 
+            set -g fake_tide_left_prompt_separator_same_color ''
-            set -g fake_tide_right_prompt_separator_same_color 
+            set -g fake_tide_right_prompt_separator_same_color ''
     end
     _next_choice powerline/powerline_prompt_heads
 end

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 (status function)
+    _tide_menu
     switch $_tide_selected_option
-        case 'One line'
+        case 1
             _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 'Two lines'
+        case 2
             _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 ' '

fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish

@@ -0,0 +1,46 @@
+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

fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish

@@ -6,27 +6,35 @@ function powerline_prompt_heads
     set -g fake_tide_right_prompt_prefix 
     _tide_display_prompt
 
-    _tide_option 2 Slanted
+    _tide_option 2 Blurred
-    set -g fake_tide_left_prompt_suffix 
+    set -g fake_tide_left_prompt_suffix '▓▒░'
-    set -g fake_tide_right_prompt_prefix 
+    set -g fake_tide_right_prompt_prefix '░▒▓'
     _tide_display_prompt
 
-    _tide_option 3 Round
+    _tide_option 3 Slanted
-    set -g fake_tide_left_prompt_suffix 
+    set -g fake_tide_left_prompt_suffix ''
-    set -g fake_tide_right_prompt_prefix 
+    set -g fake_tide_right_prompt_prefix ''
     _tide_display_prompt
 
-    _tide_menu (status function)
+    _tide_option 4 Round
+    set -g fake_tide_left_prompt_suffix ''
+    set -g fake_tide_right_prompt_prefix ''
+    _tide_display_prompt
+
+    _tide_menu
     switch $_tide_selected_option
-        case Sharp
+        case 1
             set -g fake_tide_left_prompt_suffix 
             set -g fake_tide_right_prompt_prefix 
-        case Slanted
+        case 2
-            set -g fake_tide_left_prompt_suffix 
+            set -g fake_tide_left_prompt_suffix '▓▒░'
-            set -g fake_tide_right_prompt_prefix 
+            set -g fake_tide_right_prompt_prefix '░▒▓'
-        case Round
+        case 3
-            set -g fake_tide_left_prompt_suffix 
+            set -g fake_tide_left_prompt_suffix ''
-            set -g fake_tide_right_prompt_prefix 
+            set -g fake_tide_right_prompt_prefix ''
+        case 4
+            set -g fake_tide_left_prompt_suffix ''
+            set -g fake_tide_right_prompt_prefix ''
     end
     _next_choice powerline/powerline_prompt_tails
 end

fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish

@@ -0,0 +1,30 @@
+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

fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish

@@ -1,51 +0,0 @@
-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

fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish

@@ -6,35 +6,43 @@ function powerline_prompt_tails
     set -g fake_tide_right_prompt_suffix ''
     _tide_display_prompt
 
-    _tide_option 2 Sharp
+    _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
     set -g fake_tide_left_prompt_prefix 
     set -g fake_tide_right_prompt_suffix 
     _tide_display_prompt
 
-    _tide_option 3 Slanted
+    _tide_option 4 Slanted
-    set -g fake_tide_left_prompt_prefix 
+    set -g fake_tide_left_prompt_prefix ''
-    set -g fake_tide_right_prompt_suffix 
+    set -g fake_tide_right_prompt_suffix ''
     _tide_display_prompt
 
-    _tide_option 4 Round
+    _tide_option 5 Round
-    set -g fake_tide_left_prompt_prefix 
+    set -g fake_tide_left_prompt_prefix ''
-    set -g fake_tide_right_prompt_suffix 
+    set -g fake_tide_right_prompt_suffix ''
     _tide_display_prompt
 
-    _tide_menu (status function)
+    _tide_menu
     switch $_tide_selected_option
-        case Flat
+        case 1
             set -g fake_tide_left_prompt_prefix ''
             set -g fake_tide_right_prompt_suffix ''
-        case Sharp
+        case 2
+            set -g fake_tide_left_prompt_prefix '░▒▓'
+            set -g fake_tide_right_prompt_suffix '▓▒░'
+        case 3
             set -g fake_tide_left_prompt_prefix 
             set -g fake_tide_right_prompt_suffix 
-        case Slanted
+        case 4
-            set -g fake_tide_left_prompt_prefix 
+            set -g fake_tide_left_prompt_prefix ''
-            set -g fake_tide_right_prompt_suffix 
+            set -g fake_tide_right_prompt_suffix ''
-        case Round
+        case 5
-            set -g fake_tide_left_prompt_prefix 
+            set -g fake_tide_left_prompt_prefix ''
-            set -g fake_tide_right_prompt_suffix 
+            set -g fake_tide_right_prompt_suffix ''
     end
-    _next_choice powerline/powerline_prompt_style
+    _next_choice powerline/powerline_prompt_height
 end

fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish

@@ -1,20 +0,0 @@
-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

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 (status function)
+    _tide_menu
     switch $_tide_selected_option
-        case Angled
+        case 1
             set -g fake_tide_left_prompt_separator_diff_color 
             set -g fake_tide_right_prompt_separator_diff_color 
-        case Vertical
+        case 2
             set -g fake_tide_left_prompt_separator_diff_color ''
             set -g fake_tide_right_prompt_separator_diff_color ''
-        case Slanted
+        case 3
             set -g fake_tide_left_prompt_separator_diff_color ''
             set -g fake_tide_right_prompt_separator_diff_color ''
-        case Round
+        case 4
             set -g fake_tide_left_prompt_separator_diff_color ''
             set -g fake_tide_right_prompt_separator_diff_color ''
     end

fish/functions/tide/configure/configs/classic.fish

@@ -1,10 +1,19 @@
 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
@@ -14,19 +23,25 @@ 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
@@ -38,16 +53,21 @@ 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 ''
@@ -56,53 +76,64 @@ 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 python rustc java php pulumi ruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir
+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_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
@@ -111,3 +142,10 @@ 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 

fish/functions/tide/configure/configs/classic_16color.fish

@@ -2,6 +2,8 @@ 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
@@ -59,10 +61,6 @@ 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
@@ -85,3 +83,5 @@ 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

fish/functions/tide/configure/configs/lean.fish

@@ -1,10 +1,19 @@
 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
@@ -14,19 +23,25 @@ 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
@@ -38,16 +53,21 @@ 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 ''
@@ -56,53 +76,64 @@ 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 python rustc java php pulumi ruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir
+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_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
@@ -111,3 +142,10 @@ 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 

fish/functions/tide/configure/configs/lean_16color.fish

@@ -2,6 +2,8 @@ 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
@@ -59,10 +61,6 @@ 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
@@ -85,3 +83,5 @@ 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

fish/functions/tide/configure/configs/rainbow.fish

@@ -1,10 +1,19 @@
 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
@@ -14,19 +23,25 @@ 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
@@ -38,16 +53,21 @@ 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 ''
@@ -56,53 +76,64 @@ 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 python rustc java php pulumi ruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir
+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_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
@@ -111,3 +142,10 @@ 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 

fish/functions/tide/configure/configs/rainbow_16color.fish

@@ -2,6 +2,8 @@ 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
@@ -59,10 +61,6 @@ 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
@@ -89,3 +87,5 @@ 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

fish/functions/tide/configure/functions/_fake_tide_item_character.fish

@@ -1,8 +1,5 @@
 function _fake_tide_item_character
     set_color $fake_tide_character_color
-    if contains newline $fake_tide_left_prompt_items || set -q _configure_transient
+    contains newline $fake_tide_left_prompt_items || echo -ns ' '
     echo -ns $fake_tide_character_icon
-    else
-        echo -ns ' '$fake_tide_character_icon
-    end
 end

fish/functions/tide/configure/icons.fish

@@ -1,39 +0,0 @@
-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

i3/config.d/catppuccin-mocha.conf

@@ -1,33 +0,0 @@
-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

restore.sh

@@ -5,8 +5,6 @@ GIT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 rm -rf $HOME/.config/fish/
 cp -r $GIT_DIR/fish/ $HOME/.config/
 cp $GIT_DIR/universal-shellrc.txt $HOME/.config/fish/conf.d/universal.fish
-sudo mkdir /usr/share/fonts/meslolgs
-sudo cp $GIT_DIR/other-files/*.ttf /usr/share/fonts/meslolgs/
 
 # kitty
 rm -rf $HOME/.config/kitty/

vscode/extensions.txt

@@ -30,8 +30,7 @@ GrapeCity.gc-excelviewer
 Gruntfuggly.todo-tree
 HarryHopkinson.vim-theme
 hoovercj.vscode-settings-cycler
-icrawl.discord-vscode
+]ItzSelenux.lm-theme
-ItzSelenux.lm-theme
 JoelCrosby.one-dark-darker
 kisstkondoros.vscode-gutter-preview
 kokoscript.loopytheme

vscode/keybindings.json

@@ -1,11 +0,0 @@
-// Place your key bindings in this file to override the defaults
-[
-    {
-        "key": "alt+\\",
-        "command": "settings.cycle.inlineCopilot",
-    },
-    {
-        "key": "f10",
-        "command": "C_Cpp.BuildAndRunFile"
-    }
-]