diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ddb0e92 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/downloads diff --git a/.zshrc b/.zshrc new file mode 100644 index 0000000..e38429f --- /dev/null +++ b/.zshrc @@ -0,0 +1,339 @@ +export MISE_SHELL=zsh +export __MISE_ORIG_PATH="$PATH" + +mise() { + local command + command="${1:-}" + if [ "$#" = 0 ]; then + command mise + return + fi + shift + + case "$command" in + deactivate|shell|sh) + # if argv doesn't contains -h,--help + if [[ ! " $@ " =~ " --help " ]] && [[ ! " $@ " =~ " -h " ]]; then + eval "$(command mise "$command" "$@")" + return $? + fi + ;; + esac + command mise "$command" "$@" +} + +_mise_hook() { + eval "$(mise hook-env -s zsh)"; +} +typeset -ag precmd_functions; +if [[ -z "${precmd_functions[(r)_mise_hook]+1}" ]]; then + precmd_functions=( _mise_hook ${precmd_functions[@]} ) +fi +typeset -ag chpwd_functions; +if [[ -z "${chpwd_functions[(r)_mise_hook]+1}" ]]; then + chpwd_functions=( _mise_hook ${chpwd_functions[@]} ) +fi + +_mise_hook +if [ -z "${_mise_cmd_not_found:-}" ]; then + _mise_cmd_not_found=1 + # preserve existing handler if present + if typeset -f command_not_found_handler >/dev/null; then + functions -c command_not_found_handler _command_not_found_handler + fi + + typeset -gA _mise_cnf_tried + + # helper for fallback behavior + _mise_fallback() { + local _cmd="$1"; shift + if typeset -f _command_not_found_handler >/dev/null; then + _command_not_found_handler "$_cmd" "$@" + return $? + else + print -u2 -- "zsh: command not found: $_cmd" + return 127 + fi + } + + command_not_found_handler() { + local cmd="$1"; shift + + # never intercept mise itself or retry already-attempted commands + if [[ "$cmd" == "mise" || "$cmd" == mise-* || -n "${_mise_cnf_tried["$cmd"]}" ]]; then + _mise_fallback "$cmd" "$@" + return $? + fi + + # run the hook; only retry if the command is actually found afterward + if mise hook-not-found -s zsh -- "$cmd"; then + _mise_hook + if command -v -- "$cmd" >/dev/null 2>&1; then + "$cmd" "$@" + return $? + fi + else + # only mark as tried if mise explicitly can't handle it + _mise_cnf_tried["$cmd"]=1 + fi + + # fall back + _mise_fallback "$cmd" "$@" + } +fi + +# shellcheck shell=bash + +# ============================================================================= +# +# Utility functions for zoxide. +# + +# pwd based on the value of _ZO_RESOLVE_SYMLINKS. +function __zoxide_pwd() { + \builtin pwd -L +} + +# cd + custom logic based on the value of _ZO_ECHO. +function __zoxide_cd() { + # shellcheck disable=SC2164 + \builtin cd -- "$@" +} + +# ============================================================================= +# +# Hook configuration for zoxide. +# + +# Hook to add new entries to the database. +function __zoxide_hook() { + # shellcheck disable=SC2312 + \command zoxide add -- "$(__zoxide_pwd)" +} + +# Initialize hook. +\builtin typeset -ga precmd_functions +\builtin typeset -ga chpwd_functions +# shellcheck disable=SC2034,SC2296 +precmd_functions=("${(@)precmd_functions:#__zoxide_hook}") +# shellcheck disable=SC2034,SC2296 +chpwd_functions=("${(@)chpwd_functions:#__zoxide_hook}") +chpwd_functions+=(__zoxide_hook) + +# Report common issues. +function __zoxide_doctor() { + [[ ${_ZO_DOCTOR:-1} -ne 0 ]] || return 0 + [[ ${chpwd_functions[(Ie)__zoxide_hook]:-} -eq 0 ]] || return 0 + + _ZO_DOCTOR=0 + \builtin printf '%s\n' \ + 'zoxide: detected a possible configuration issue.' \ + 'Please ensure that zoxide is initialized right at the end of your shell configuration file (usually ~/.zshrc).' \ + '' \ + 'If the issue persists, consider filing an issue at:' \ + 'https://github.com/ajeetdsouza/zoxide/issues' \ + '' \ + 'Disable this message by setting _ZO_DOCTOR=0.' \ + '' >&2 +} + +# ============================================================================= +# +# When using zoxide with --no-cmd, alias these internal functions as desired. +# + +# Jump to a directory using only keywords. +function __zoxide_z() { + __zoxide_doctor + if [[ "$#" -eq 0 ]]; then + __zoxide_cd ~ + elif [[ "$#" -eq 1 ]] && { [[ -d "$1" ]] || [[ "$1" = '-' ]] || [[ "$1" =~ ^[-+][0-9]$ ]]; }; then + __zoxide_cd "$1" + elif [[ "$#" -eq 2 ]] && [[ "$1" = "--" ]]; then + __zoxide_cd "$2" + else + \builtin local result + # shellcheck disable=SC2312 + result="$(\command zoxide query --exclude "$(__zoxide_pwd)" -- "$@")" && __zoxide_cd "${result}" + fi +} + +# Jump to a directory using interactive search. +function __zoxide_zi() { + __zoxide_doctor + \builtin local result + result="$(\command zoxide query --interactive -- "$@")" && __zoxide_cd "${result}" +} + +# ============================================================================= +# +# Commands for zoxide. Disable these using --no-cmd. +# + +function z() { + __zoxide_z "$@" +} + +function zi() { + __zoxide_zi "$@" +} + +# Completions. +if [[ -o zle ]]; then + __zoxide_result='' + + function __zoxide_z_complete() { + # Only show completions when the cursor is at the end of the line. + # shellcheck disable=SC2154 + [[ "${#words[@]}" -eq "${CURRENT}" ]] || return 0 + + if [[ "${#words[@]}" -eq 2 ]]; then + # Show completions for local directories. + _cd -/ + + elif [[ "${words[-1]}" == '' ]]; then + # Show completions for Space-Tab. + # shellcheck disable=SC2086 + __zoxide_result="$(\command zoxide query --exclude "$(__zoxide_pwd || \builtin true)" --interactive -- ${words[2,-1]})" || __zoxide_result='' + + # Set a result to ensure completion doesn't re-run + compadd -Q "" + + # Bind '\e[0n' to helper function. + \builtin bindkey '\e[0n' '__zoxide_z_complete_helper' + # Sends query device status code, which results in a '\e[0n' being sent to console input. + \builtin printf '\e[5n' + + # Report that the completion was successful, so that we don't fall back + # to another completion function. + return 0 + fi + } + + function __zoxide_z_complete_helper() { + if [[ -n "${__zoxide_result}" ]]; then + # shellcheck disable=SC2034,SC2296 + BUFFER="z ${(q-)__zoxide_result}" + __zoxide_result='' + \builtin zle reset-prompt + \builtin zle accept-line + else + \builtin zle reset-prompt + fi + } + \builtin zle -N __zoxide_z_complete_helper + + [[ "${+functions[compdef]}" -ne 0 ]] && \compdef __zoxide_z_complete z +fi + +# ============================================================================= +# +# To initialize zoxide, add this to your shell configuration file (usually ~/.zshrc): +# +# eval "$(zoxide init zsh)" +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH + +# Path to your Oh My Zsh installation. +export ZSH="$HOME/.oh-my-zsh" + +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time Oh My Zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes +ZSH_THEME="nicoulaj" + +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in $ZSH/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment one of the following lines to change the auto-update behavior +# zstyle ':omz:update' mode disabled # disable automatic updates +# zstyle ':omz:update' mode auto # update automatically without asking +zstyle ':omz:update' mode reminder # just remind me to update when it's time + +# Uncomment the following line to change how often to auto-update (in days). +# zstyle ':omz:update' frequency 13 + +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS="true" + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# You can also set it to another string to have that shown instead of the default red dots. +# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" +# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +MAGIC_ENTER_GIT_COMMAND='git status -u . | bat --style=plain -l=sh' +MAGIC_ENTER_OTHER_COMMAND='ls -lh . | bat --paging=never -l=ls' +plugins=(git gh rake rails ssh mise mix bun docker docker-compose magic-enter sudo) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +export EDITOR='nvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch $(uname -m)" + +# Set personal aliases, overriding those provided by Oh My Zsh libs, +# plugins, and themes. Aliases can be placed here, though Oh My Zsh +# users are encouraged to define aliases within a top-level file in +# the $ZSH_CUSTOM folder, with .zsh extension. Examples: +# - $ZSH_CUSTOM/aliases.zsh +# - $ZSH_CUSTOM/macos.zsh +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" diff --git a/README.md b/README.md index 6913a9e..f6efd2f 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,9 @@ Misc dependencies: `git, curl` * Install [NeoVim](https://neovim.io/) ```sh -mkdir -p ~/.config/mise -curl https://git.gay/gaiety/dotfiles/raw/branch/main/dot_config/mise/config.toml -o ~/.config/mise/config.toml +./setup.sh + mise install -curl -sS https://starship.rs/install.sh | sh ln -s "$(pwd)/nvim" ~/.config/nvim ln -s "$(pwd)/fish" ~/.config/fish ln -s "$(pwd)/kitty" ~/.config/kitty diff --git a/Taskfile.yml b/Taskfile.yml new file mode 100644 index 0000000..285bb11 --- /dev/null +++ b/Taskfile.yml @@ -0,0 +1,60 @@ +# https://taskfile.dev + +version: '3' + +tasks: + default: + deps: [mise, fonts, tools] + cmds: + - echo "mise checks ran, tools updated" + + mise: + cmds: + - mise self-update + - mise doctor + + fonts: + dir: downloads + cmds: + - curl -LO https://github.com/githubnext/monaspace/releases/download/v1.301/monaspace-frozen-v1.301.zip + - unzip monaspace-frozen-v1.301.zip -d ./fonts + - mkdir -p ~/.fonts + - find . -type f -exec mv {} ~/.fonts \; + + + tools: + deps: [zsh, kitty, ripgrep, neovim, bat, zoxide] + cmds: + - echo "tools installed" + + kitty: + cmds: # installed via ./setup.sh + - cmd: ln -s "$(pwd)/kitty" ~/.config/kitty + ignore_error: true + + zsh: + cmds: # installed via ./setup.sh + - cmd: sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" + ignore_error: true + - cmd: rm ~/.zshrc + ignore_error: true + - cmd: ln -s "$(pwd)/.zshrc" ~/.zshrc + ignore_error: true + + ripgrep: + cmds: + - mise use --global ripgrep@latest + + neovim: + cmds: + - mise use --global neovim@0.11.4 + - cmd: ln -s "$(pwd)/nvim" ~/.config/nvim + ignore_error: true + + bat: + cmds: + - mise use --global bat@latest + + zoxide: + cmds: + - mise use --global zoxide@latest diff --git a/fish/completions/tide.fish b/fish/completions/tide.fish deleted file mode 100644 index 1ba1960..0000000 --- a/fish/completions/tide.fish +++ /dev/null @@ -1,13 +0,0 @@ -complete tide --no-files - -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" - -complete tide -x -n '__fish_seen_subcommand_from bug-report' -l clean -d "Run clean Fish instance and install Tide" -complete tide -x -n '__fish_seen_subcommand_from bug-report' -l verbose -d "Print full Tide configuration" diff --git a/fish/conf.d/_tide_init.fish b/fish/conf.d/_tide_init.fish deleted file mode 100644 index b448002..0000000 --- a/fish/conf.d/_tide_init.fish +++ /dev/null @@ -1,44 +0,0 @@ -function _tide_init_install --on-event _tide_init_install - set -U VIRTUAL_ENV_DISABLE_PROMPT true - - source (functions --details _tide_sub_configure) - _load_config lean - _tide_finish - - if status is-interactive - tide bug-report --check || sleep 4 - - 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" - sleep 3 - end - - switch (read --prompt-str="Configure tide prompt? [Y/n] " | string lower) - case y ye yes '' - tide configure - case '*' - echo -s \n 'Run ' (_tide_fish_colorize "tide configure") ' to customize your prompt.' - end - end -end - -function _tide_init_update --on-event _tide_init_update - # Warn users who install from main branch - 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" - sleep 3 - end - - # Set (disable) the new jobs variable - set -q tide_jobs_number_threshold || set -U tide_jobs_number_threshold 1000 -end - -function _tide_init_uninstall --on-event _tide_init_uninstall - set -e VIRTUAL_ENV_DISABLE_PROMPT - set -e (set -U --names | string match --entire -r '^_?tide') - functions --erase (functions --all | string match --entire -r '^_?tide') -end diff --git a/fish/config.fish b/fish/config.fish deleted file mode 100644 index b105344..0000000 --- a/fish/config.fish +++ /dev/null @@ -1,12 +0,0 @@ -set fish_greeting - -if status is-interactive - # Commands to run in interactive sessions can go here - mise activate fish | source - starship init fish | source - zoxide init fish | source - alias ssh="kitty +kitten ssh" - kitten icat ~/Downloads/pfp.gif 2>/dev/null - # echo "Begin chaos..." -end - diff --git a/fish/fish_variables b/fish/fish_variables deleted file mode 100644 index 84477f6..0000000 --- a/fish/fish_variables +++ /dev/null @@ -1,33 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR __fish_initialized:3400 -SETUVAR _tide_left_items:\x1d -SETUVAR _tide_right_items:\x1d -SETUVAR fish_color_autosuggestion:brblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:blue -SETUVAR fish_color_comment:red -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:green -SETUVAR fish_color_error:brred -SETUVAR fish_color_escape:brcyan -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:brcyan -SETUVAR fish_color_param:cyan -SETUVAR fish_color_quote:yellow -SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:yellow\x1e\x2di -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_pager_color_selected_background:\x2dr diff --git a/fish/functions/_tide_1_line_prompt.fish b/fish/functions/_tide_1_line_prompt.fish deleted file mode 100644 index 5772223..0000000 --- a/fish/functions/_tide_1_line_prompt.fish +++ /dev/null @@ -1,19 +0,0 @@ -function _tide_1_line_prompt - set -g add_prefix - _tide_side=left for item in $_tide_left_items - _tide_item_$item - end - set_color $prev_bg_color -b normal - echo $tide_left_prompt_suffix - - set -g add_prefix - _tide_side=right for item in $_tide_right_items - _tide_item_$item - end - set_color $prev_bg_color -b normal - echo $tide_right_prompt_suffix -end - -function _tide_item_pwd - _tide_print_item pwd @PWD@ -end diff --git a/fish/functions/_tide_2_line_prompt.fish b/fish/functions/_tide_2_line_prompt.fish deleted file mode 100644 index e9017af..0000000 --- a/fish/functions/_tide_2_line_prompt.fish +++ /dev/null @@ -1,31 +0,0 @@ -function _tide_2_line_prompt - set -g add_prefix - _tide_side=left for item in $_tide_left_items - _tide_item_$item - end - if not set -e add_prefix - set_color $prev_bg_color -b normal - echo $tide_left_prompt_suffix - end - - echo - - set -g add_prefix - _tide_side=right for item in $_tide_right_items - _tide_item_$item - end - if not set -e add_prefix - set_color $prev_bg_color -b normal - echo $tide_right_prompt_suffix - end -end - -function _tide_item_pwd - _tide_print_item pwd @PWD@ -end - -function _tide_item_newline - set_color $prev_bg_color -b normal - v=tide_"$_tide_side"_prompt_suffix echo $$v - set -g add_prefix -end diff --git a/fish/functions/_tide_cache_variables.fish b/fish/functions/_tide_cache_variables.fish deleted file mode 100644 index 31e3850..0000000 --- a/fish/functions/_tide_cache_variables.fish +++ /dev/null @@ -1,17 +0,0 @@ -function _tide_cache_variables - # Same-color-separator color - set_color $tide_prompt_color_separator_same_color | read -gx _tide_color_separator_same_color - - # git - contains git $_tide_left_items $_tide_right_items && set_color $tide_git_color_branch | read -gx _tide_location_color - - # private_mode - if contains private_mode $_tide_left_items $_tide_right_items && test -n "$fish_private_mode" - set -gx _tide_private_mode - else - set -e _tide_private_mode - end - - # item padding - test "$tide_prompt_pad_items" = true && set -gx _tide_pad ' ' || set -e _tide_pad -end diff --git a/fish/functions/_tide_detect_os.fish b/fish/functions/_tide_detect_os.fish deleted file mode 100644 index cf38388..0000000 --- a/fish/functions/_tide_detect_os.fish +++ /dev/null @@ -1,77 +0,0 @@ -# Outputs icon, color, bg_color -function _tide_detect_os - set -lx defaultColor 080808 CED7CF - switch (uname | string lower) - case darwin - printf %s\n  D6D6D6 333333 # from apple.com header - case freebsd openbsd dragonfly - printf %s\n  FFFFFF AB2B28 # https://freebsdfoundation.org/about-us/about-the-foundation/project/ - case 'cygwin*' 'mingw*_nt*' 'msys_nt*' - printf %s\n  FFFFFF 00CCFF # https://answers.microsoft.com/en-us/windows/forum/all/what-is-the-official-windows-8-blue-rgb-or-hex/fd57144b-f69b-42d8-8c21-6ca911646e44 - case linux - if test (uname -o) = Android - echo ﲎ # This character is evil and messes up code display, so it's put on its own line - # https://developer.android.com/distribute/marketing-tools/brand-guidelines - printf %s\n 3DDC84 3C3F41 # fg is from above link, bg is from Android Studio default dark theme - else - _tide_detect_os_linux_cases /etc/os-release ID || - _tide_detect_os_linux_cases /etc/os-release ID_LIKE || - _tide_detect_os_linux_cases /etc/lsb-release DISTRIB_ID || - printf %s\n  $defaultColor - end - case '*' - echo -ns '?' - end -end - -function _tide_detect_os_linux_cases -a file key - test -e $file || return - set -l split_file (string split '=' <$file) - set -l key_index (contains --index $key $split_file) || return - set -l value (string trim --chars='"' $split_file[(math $key_index + 1)]) - - # Anything which would have pure white background has been changed to D4D4D4 - # It was just too bright otherwise - switch (string lower $value) - case alpine - printf %s\n  FFFFFF 0D597F # from alpine logo - case arch - printf %s\n  1793D1 4D4D4D # from arch wiki header - case centos - printf %s\n  000000 D4D4D4 # https://wiki.centos.org/ArtWork/Brand/Logo, monochromatic - case debian - printf %s\n  C70036 D4D4D4 # from debian logo https://www.debian.org/logos/openlogo-nd-100.png - case devuan - printf %s\n  $defaultColor # logo is monochromatic - case elementary - printf %s\n  000000 D4D4D4 # https://elementary.io/brand, encouraged to be monochromatic - case fedora - printf %s\n  FFFFFF 294172 # from logo https://fedoraproject.org/w/uploads/2/2d/Logo_fedoralogo.png - case gentoo - printf %s\n  FFFFFF 54487A # https://wiki.gentoo.org/wiki/Project:Artwork/Colors - case mageia - printf %s\n  FFFFFF 262F45 # https://wiki.mageia.org/en/Artwork_guidelines - case manjaro - printf %s\n  FFFFFF 35BF5C # from https://gitlab.manjaro.org/artwork/branding/logo/-/blob/master/logo.svg - case mint linuxmint - printf %s\n  FFFFFF 69B53F # extracted from https://linuxmint.com/web/img/favicon.ico - case nixos - printf %s\n  FFFFFF 5277C3 # https://github.com/NixOS/nixos-artwork/tree/master/logo - case opensuse-leap opensuse-tumbleweed opensuse-microos - printf %s\n  73BA25 173f4f # https://en.opensuse.org/openSUSE:Artwork_brand - case raspbian - printf %s\n  FFFFFF A22846 # https://static.raspberrypi.org/files/Raspberry_Pi_Visual_Guidelines_2020.pdf - case rhel - printf %s\n  EE0000 000000 # https://www.redhat.com/en/about/brand/standards/color - case sabayon - printf %s\n  $defaultColor # Can't find colors, and they are rebranding anyway - case slackware - 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 -end diff --git a/fish/functions/_tide_find_and_remove.fish b/fish/functions/_tide_find_and_remove.fish deleted file mode 100644 index 29f2180..0000000 --- a/fish/functions/_tide_find_and_remove.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_find_and_remove -a name list --no-scope-shadowing - contains --index $name $$list | read -l index && set -e "$list"[$index] -end diff --git a/fish/functions/_tide_fish_colorize.fish b/fish/functions/_tide_fish_colorize.fish deleted file mode 100644 index f79b188..0000000 --- a/fish/functions/_tide_fish_colorize.fish +++ /dev/null @@ -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 diff --git a/fish/functions/_tide_item_aws.fish b/fish/functions/_tide_item_aws.fish deleted file mode 100644 index 7cb6338..0000000 --- a/fish/functions/_tide_item_aws.fish +++ /dev/null @@ -1,11 +0,0 @@ -function _tide_item_aws - # AWS_PROFILE overrides AWS_DEFAULT_PROFILE, AWS_REGION overrides AWS_DEFAULT_REGION - set -q AWS_PROFILE && set -l AWS_DEFAULT_PROFILE $AWS_PROFILE - set -q AWS_REGION && set -l AWS_DEFAULT_REGION $AWS_REGION - - if test -n "$AWS_DEFAULT_PROFILE" && test -n "$AWS_DEFAULT_REGION" - _tide_print_item aws $tide_aws_icon' ' "$AWS_DEFAULT_PROFILE/$AWS_DEFAULT_REGION" - else if test -n "$AWS_DEFAULT_PROFILE$AWS_DEFAULT_REGION" - _tide_print_item aws $tide_aws_icon' ' "$AWS_DEFAULT_PROFILE$AWS_DEFAULT_REGION" - end -end diff --git a/fish/functions/_tide_item_character.fish b/fish/functions/_tide_item_character.fish deleted file mode 100644 index 10bb324..0000000 --- a/fish/functions/_tide_item_character.fish +++ /dev/null @@ -1,17 +0,0 @@ -function _tide_item_character - test $_tide_status = 0 && set_color $tide_character_color || set_color $tide_character_color_failure - - set -q add_prefix || echo -ns ' ' - - test "$fish_key_bindings" = fish_default_key_bindings && echo -ns $tide_character_icon || - switch $fish_bind_mode - case insert - echo -ns $tide_character_icon - case default - echo -ns $tide_character_vi_icon_default - case replace replace_one - echo -ns $tide_character_vi_icon_replace - case visual - echo -ns $tide_character_vi_icon_visual - end -end diff --git a/fish/functions/_tide_item_cmd_duration.fish b/fish/functions/_tide_item_cmd_duration.fish deleted file mode 100644 index bc48bac..0000000 --- a/fish/functions/_tide_item_cmd_duration.fish +++ /dev/null @@ -1,12 +0,0 @@ -function _tide_item_cmd_duration - test $CMD_DURATION -gt $tide_cmd_duration_threshold && t=( - math -s0 "$CMD_DURATION/3600000" # Hours - math -s0 "$CMD_DURATION/60000"%60 # Minutes - math -s$tide_cmd_duration_decimals "$CMD_DURATION/1000"%60) if test $t[1] != 0 - _tide_print_item cmd_duration $tide_cmd_duration_icon' ' "$t[1]h $t[2]m $t[3]s" - else if test $t[2] != 0 - _tide_print_item cmd_duration $tide_cmd_duration_icon' ' "$t[2]m $t[3]s" - else - _tide_print_item cmd_duration $tide_cmd_duration_icon' ' "$t[3]s" - end -end diff --git a/fish/functions/_tide_item_context.fish b/fish/functions/_tide_item_context.fish deleted file mode 100644 index cbdf420..0000000 --- a/fish/functions/_tide_item_context.fish +++ /dev/null @@ -1,14 +0,0 @@ -function _tide_item_context - if set -q SSH_TTY - set -fx tide_context_color $tide_context_color_ssh - else if test "$EUID" = 0 - set -fx tide_context_color $tide_context_color_root - else if test "$tide_context_always_display" = true - 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 deleted file mode 100644 index 620dde4..0000000 --- a/fish/functions/_tide_item_crystal.fish +++ /dev/null @@ -1,6 +0,0 @@ -function _tide_item_crystal - 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_direnv.fish b/fish/functions/_tide_item_direnv.fish deleted file mode 100644 index f3c892b..0000000 --- a/fish/functions/_tide_item_direnv.fish +++ /dev/null @@ -1,7 +0,0 @@ -function _tide_item_direnv - set -q DIRENV_DIR || return - direnv status | string match -q 'Found RC allowed false' && - set -lx tide_direnv_color $tide_direnv_color_denied && - set -lx tide_direnv_bg_color $tide_direnv_bg_color_denied - _tide_print_item direnv $tide_direnv_icon -end diff --git a/fish/functions/_tide_item_distrobox.fish b/fish/functions/_tide_item_distrobox.fish deleted file mode 100644 index 5e06a8b..0000000 --- a/fish/functions/_tide_item_distrobox.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_distrobox - test -e /etc/profile.d/distrobox_profile.sh && test -e /run/.containerenv && - _tide_print_item distrobox $tide_distrobox_icon' ' (string match -rg 'name="(.*)"' .*)' <$CLOUDSDK_CONFIG/configurations/config_$config && - _tide_print_item gcloud $tide_gcloud_icon' ' $project -end diff --git a/fish/functions/_tide_item_git.fish b/fish/functions/_tide_item_git.fish deleted file mode 100644 index 3154acc..0000000 --- a/fish/functions/_tide_item_git.fish +++ /dev/null @@ -1,72 +0,0 @@ -function _tide_item_git - if git branch --show-current 2>/dev/null | string shorten -"$tide_git_truncation_strategy"m$tide_git_truncation_length | read -l location - git rev-parse --git-dir --is-inside-git-dir | read -fL gdir in_gdir - set location $_tide_location_color$location - else if test $pipestatus[1] != 0 - return - else if git tag --points-at HEAD | string shorten -"$tide_git_truncation_strategy"m$tide_git_truncation_length | read location - git rev-parse --git-dir --is-inside-git-dir | read -fL gdir in_gdir - set location '#'$_tide_location_color$location - else - git rev-parse --git-dir --is-inside-git-dir --short HEAD | read -fL gdir in_gdir location - set location @$_tide_location_color$location - end - - # 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 - set -f operation am - else - set -f operation am/rebase - end - else if test -f $gdir/MERGE_HEAD - set -f operation merge - else if test -f $gdir/CHERRY_PICK_HEAD - set -f operation cherry-pick - else if test -f $gdir/REVERT_HEAD - set -f operation revert - else if test -f $gdir/BISECT_LOG - set -f operation bisect - end - - # Git status/stash + Upstream behind/ahead - test $in_gdir = true && set -l _set_dir_opt -C $gdir/.. - # Suppress errors in case we are in a bare repo or there is no upstream - set -l stat (git $_set_dir_opt --no-optional-locks status --porcelain 2>/dev/null) - string match -qr '(0|(?.*))\n(0|(?.*))\n(0|(?.*)) -(0|(?.*))\n(0|(?.*))(\n(0|(?.*))\t(0|(?.*)))?' \ - "$(git $_set_dir_opt stash list 2>/dev/null | count - string match -r ^UU $stat | count - string match -r ^[ADMR]. $stat | count - string match -r ^.[ADMR] $stat | count - string match -r '^\?\?' $stat | count - git rev-list --count --left-right @{upstream}...HEAD 2>/dev/null)" - - if test -n "$operation$conflicted" - set -g tide_git_bg_color $tide_git_bg_color_urgent - else if test -n "$staged$dirty$untracked" - set -g tide_git_bg_color $tide_git_bg_color_unstable - end - - _tide_print_item git $_tide_location_color$tide_git_icon' ' (set_color white; echo -ns $location - set_color $tide_git_color_operation; echo -ns ' '$operation ' '$step/$total_steps - set_color $tide_git_color_upstream; echo -ns ' ⇣'$behind ' ⇡'$ahead - set_color $tide_git_color_stash; echo -ns ' *'$stash - set_color $tide_git_color_conflicted; echo -ns ' ~'$conflicted - set_color $tide_git_color_staged; echo -ns ' +'$staged - set_color $tide_git_color_dirty; echo -ns ' !'$dirty - set_color $tide_git_color_untracked; echo -ns ' ?'$untracked) -end diff --git a/fish/functions/_tide_item_go.fish b/fish/functions/_tide_item_go.fish deleted file mode 100644 index b9aacae..0000000 --- a/fish/functions/_tide_item_go.fish +++ /dev/null @@ -1,6 +0,0 @@ -function _tide_item_go - 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 deleted file mode 100644 index 804ec05..0000000 --- a/fish/functions/_tide_item_java.fish +++ /dev/null @@ -1,6 +0,0 @@ -function _tide_item_java - 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_jobs.fish b/fish/functions/_tide_item_jobs.fish deleted file mode 100644 index 2a02118..0000000 --- a/fish/functions/_tide_item_jobs.fish +++ /dev/null @@ -1,7 +0,0 @@ -function _tide_item_jobs - set -q _tide_jobs && if test $_tide_jobs -ge $tide_jobs_number_threshold - _tide_print_item jobs $tide_jobs_icon' ' $_tide_jobs - else - _tide_print_item jobs $tide_jobs_icon - end -end diff --git a/fish/functions/_tide_item_kubectl.fish b/fish/functions/_tide_item_kubectl.fish deleted file mode 100644 index ab044b3..0000000 --- a/fish/functions/_tide_item_kubectl.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_kubectl - kubectl config view --minify --output 'jsonpath={.current-context}/{..namespace}' 2>/dev/null | read -l context && - _tide_print_item kubectl $tide_kubectl_icon' ' (string replace -r '/(|default)$' '' $context) -end diff --git a/fish/functions/_tide_item_nix_shell.fish b/fish/functions/_tide_item_nix_shell.fish deleted file mode 100644 index 647f606..0000000 --- a/fish/functions/_tide_item_nix_shell.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_nix_shell - set -q IN_NIX_SHELL && _tide_print_item nix_shell $tide_nix_shell_icon' ' $IN_NIX_SHELL -end diff --git a/fish/functions/_tide_item_node.fish b/fish/functions/_tide_item_node.fish deleted file mode 100644 index fc57832..0000000 --- a/fish/functions/_tide_item_node.fish +++ /dev/null @@ -1,6 +0,0 @@ -function _tide_item_node - 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_os.fish b/fish/functions/_tide_item_os.fish deleted file mode 100644 index 8a6208c..0000000 --- a/fish/functions/_tide_item_os.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_os - _tide_print_item os $tide_os_icon -end diff --git a/fish/functions/_tide_item_php.fish b/fish/functions/_tide_item_php.fish deleted file mode 100644 index c8d28d9..0000000 --- a/fish/functions/_tide_item_php.fish +++ /dev/null @@ -1,6 +0,0 @@ -function _tide_item_php - 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_private_mode.fish b/fish/functions/_tide_item_private_mode.fish deleted file mode 100644 index 4eb4684..0000000 --- a/fish/functions/_tide_item_private_mode.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_private_mode - set -q _tide_private_mode && _tide_print_item private_mode $tide_private_mode_icon -end diff --git a/fish/functions/_tide_item_pulumi.fish b/fish/functions/_tide_item_pulumi.fish deleted file mode 100644 index 6302a7e..0000000 --- a/fish/functions/_tide_item_pulumi.fish +++ /dev/null @@ -1,19 +0,0 @@ -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 "(?.{40})" - else if command -q shasum - echo -n "$yaml_path" | shasum | string match -qr "(?.{40})" - else - return - end - - 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 -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 deleted file mode 100644 index 57f7075..0000000 --- a/fish/functions/_tide_item_python.fish +++ /dev/null @@ -1,27 +0,0 @@ -function _tide_item_python - if test -n "$VIRTUAL_ENV" - if command -q python3 - python3 --version | string match -qr "(?[\d.]+)" - else - python --version | string match -qr "(?[\d.]+)" - end - 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 - if command -q python3 - python3 --version | string match -qr "(?[\d.]+)" - else - python --version | string match -qr "(?[\d.]+)" - end - _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 deleted file mode 100644 index bde84eb..0000000 --- a/fish/functions/_tide_item_ruby.fish +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index b46cd99..0000000 --- a/fish/functions/_tide_item_rustc.fish +++ /dev/null @@ -1,6 +0,0 @@ -function _tide_item_rustc - 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_shlvl.fish b/fish/functions/_tide_item_shlvl.fish deleted file mode 100644 index 95dd5ff..0000000 --- a/fish/functions/_tide_item_shlvl.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_shlvl - # Non-interactive shells do not increment SHLVL, so we don't need to subtract 1 - test $SHLVL -gt $tide_shlvl_threshold && _tide_print_item shlvl $tide_shlvl_icon' ' $SHLVL -end diff --git a/fish/functions/_tide_item_status.fish b/fish/functions/_tide_item_status.fish deleted file mode 100644 index 3a040fd..0000000 --- a/fish/functions/_tide_item_status.fish +++ /dev/null @@ -1,15 +0,0 @@ -function _tide_item_status - if string match -qv 0 $_tide_pipestatus # If there is a failure anywhere in the pipestatus - if test "$_tide_pipestatus" = 1 # If simple failure - contains character $_tide_left_items || tide_status_bg_color=$tide_status_bg_color_failure \ - tide_status_color=$tide_status_color_failure _tide_print_item status $tide_status_icon_failure' ' 1 - else - fish_status_to_signal $_tide_pipestatus | string replace SIG '' | string join '|' | read -l out - test $_tide_status = 0 && _tide_print_item status $tide_status_icon' ' $out || - tide_status_bg_color=$tide_status_bg_color_failure tide_status_color=$tide_status_color_failure \ - _tide_print_item status $tide_status_icon_failure' ' $out - end - else if not contains character $_tide_left_items - _tide_print_item status $tide_status_icon - end -end diff --git a/fish/functions/_tide_item_terraform.fish b/fish/functions/_tide_item_terraform.fish deleted file mode 100644 index c079ce3..0000000 --- a/fish/functions/_tide_item_terraform.fish +++ /dev/null @@ -1,5 +0,0 @@ -function _tide_item_terraform - path is $_tide_parent_dirs/.terraform && - terraform workspace show | string match -v default | read -l w && - _tide_print_item terraform $tide_terraform_icon' ' $w -end diff --git a/fish/functions/_tide_item_time.fish b/fish/functions/_tide_item_time.fish deleted file mode 100644 index b8522bc..0000000 --- a/fish/functions/_tide_item_time.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_time - _tide_print_item time (date +$tide_time_format) -end diff --git a/fish/functions/_tide_item_toolbox.fish b/fish/functions/_tide_item_toolbox.fish deleted file mode 100644 index 0b33f29..0000000 --- a/fish/functions/_tide_item_toolbox.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_toolbox - test -e /run/.toolboxenv && - _tide_print_item toolbox $tide_toolbox_icon' ' (string match -rg 'name="(.*)"' [\d.]+(-dev)?)" - _tide_print_item zig $tide_zig_icon' ' $v - end -end diff --git a/fish/functions/_tide_parent_dirs.fish b/fish/functions/_tide_parent_dirs.fish deleted file mode 100644 index 9f31b04..0000000 --- a/fish/functions/_tide_parent_dirs.fish +++ /dev/null @@ -1,7 +0,0 @@ -function _tide_parent_dirs --on-variable PWD - set -g _tide_parent_dirs (string escape ( - for dir in (string split / -- $PWD) - set -la parts $dir - string join / -- $parts - end)) -end diff --git a/fish/functions/_tide_print_item.fish b/fish/functions/_tide_print_item.fish deleted file mode 100644 index db5c98b..0000000 --- a/fish/functions/_tide_print_item.fish +++ /dev/null @@ -1,22 +0,0 @@ -function _tide_print_item -a item - v=tide_"$item"_bg_color set -f item_bg_color $$v - - if set -e add_prefix - set_color $item_bg_color -b normal - v=tide_"$_tide_side"_prompt_prefix echo -ns $$v - else if test "$item_bg_color" = "$prev_bg_color" - v=tide_"$_tide_side"_prompt_separator_same_color echo -ns $_tide_color_separator_same_color$$v - else if test $_tide_side = left - set_color $prev_bg_color -b $item_bg_color - echo -ns $tide_left_prompt_separator_diff_color - else - set_color $item_bg_color -b $prev_bg_color - echo -ns $tide_right_prompt_separator_diff_color - end - - v=tide_"$item"_color set_color $$v -b $item_bg_color - - echo -ns $_tide_pad $argv[2..] $_tide_pad - - set -g prev_bg_color $item_bg_color -end diff --git a/fish/functions/_tide_pwd.fish b/fish/functions/_tide_pwd.fish deleted file mode 100644 index 5447dd4..0000000 --- a/fish/functions/_tide_pwd.fish +++ /dev/null @@ -1,42 +0,0 @@ -set_color -o $tide_pwd_color_anchors | read -l color_anchors -set_color $tide_pwd_color_truncated_dirs | read -l color_truncated -set -l reset_to_color_dirs (set_color normal -b $tide_pwd_bg_color; set_color $tide_pwd_color_dirs) - -set -l unwritable_icon $tide_pwd_icon_unwritable' ' -set -l home_icon $tide_pwd_icon_home' ' -set -l pwd_icon $tide_pwd_icon' ' - -eval "function _tide_pwd - if set -l split_pwd (string replace -r '^$HOME' '~' -- \$PWD | string split /) - test -w . && set -f split_output \"$pwd_icon\$split_pwd[1]\" \$split_pwd[2..] || - set -f split_output \"$unwritable_icon\$split_pwd[1]\" \$split_pwd[2..] - set split_output[-1] \"$color_anchors\$split_output[-1]$reset_to_color_dirs\" - else - set -f split_output \"$home_icon$color_anchors~\" - end - - string join / -- \$split_output | string length -V | read -g _tide_pwd_len - - i=1 for dir_section in \$split_pwd[2..-2] - string join -- / \$split_pwd[..\$i] | string replace '~' $HOME | read -l parent_dir # Uses i before increment - - math \$i+1 | read i - - 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 - string match -qr \"(?\..|.)\" \$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 - end - end - - string join -- / \"$reset_to_color_dirs\$split_output[1]\" \$split_output[2..] -end" diff --git a/fish/functions/_tide_remove_unusable_items.fish b/fish/functions/_tide_remove_unusable_items.fish deleted file mode 100644 index deb4c10..0000000 --- a/fish/functions/_tide_remove_unusable_items.fish +++ /dev/null @@ -1,25 +0,0 @@ -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 zig - 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 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 - - set -U _tide_left_items (for item in $tide_left_prompt_items - contains $item $removed_items || echo $item - end) - set -U _tide_right_items (for item in $tide_right_prompt_items - contains $item $removed_items || echo $item - end) -end diff --git a/fish/functions/_tide_sub_bug-report.fish b/fish/functions/_tide_sub_bug-report.fish deleted file mode 100644 index a8065c8..0000000 --- a/fish/functions/_tide_sub_bug-report.fish +++ /dev/null @@ -1,73 +0,0 @@ -function _tide_sub_bug-report - argparse c/clean v/verbose check -- $argv - - set -l fish_path (status fish-path) - - 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" - 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 - else - set -l fish_version ($fish_path --version | string match -r "fish, version (\d\.\d\.\d)")[2] - _tide_check_version Fish fish-shell/fish-shell "(\d\.\d\.\d)" $fish_version || return - - set -l tide_version (tide --version | string match -r "tide, version (\d\.\d\.\d)")[2] - _tide_check_version Tide IlanCosman/tide "v(\d\.\d\.\d)" $tide_version || return - - if command --query git - test (git --version | string match -r "git version ([\d\.]*)" | string replace --all . '')[2] -gt 2220 - _tide_check_condition \ - "Your git version is too old." \ - "Tide requires at least version 2.22." \ - "Please update before submitting a bug report." || return - end - - # Check that omf is not installed - not functions --query omf - _tide_check_condition \ - "Tide does not work with oh-my-fish installed." \ - "Please uninstall it before submitting a bug report." || return - - if not set -q _flag_check - set -l fish_startup_time ($fish_path -ic "time $fish_path -c exit" 2>| - string match -r "Executed in(.*)fish" | string trim)[2] - - read --local --prompt-str "What operating system are you using? (e.g Ubuntu 20.04): " os - read --local --prompt-str "What terminal emulator are you using? (e.g Kitty): " terminal_emulator - - printf '%b\n' "\nPlease copy the following information into the issue:\n" \ - "fish version: $fish_version" \ - "tide version: $tide_version" \ - "term: $TERM" \ - "os: $os" \ - "terminal emulator: $terminal_emulator" \ - "fish startup: $fish_startup_time" \ - "fisher plugins: $_fisher_plugins" - end - end -end - -function _tide_check_version -a program_name repo_name regex_to_get_version current_version - curl --silent https://github.com/$repo_name/releases/latest | - string match -r ".*$repo_name/releases/tag/$regex_to_get_version.*" | - read --local --line __ latestVersion - - string match --quiet -r "^$latestVersion" "$current_version" - _tide_check_condition \ - "Your $program_name version is out of date." \ - "The latest is $latestVersion. You have $current_version." \ - "Please update before submitting a bug report." -end - -function _tide_check_condition - if test "$status" != 0 - set_color red - printf '%s\n' $argv - set_color normal - return 1 - end - return 0 -end diff --git a/fish/functions/_tide_sub_configure.fish b/fish/functions/_tide_sub_configure.fish deleted file mode 100644 index 22faf3a..0000000 --- a/fish/functions/_tide_sub_configure.fish +++ /dev/null @@ -1,156 +0,0 @@ -set -g _tide_color_dark_blue 0087AF -set -g _tide_color_dark_green 5FAF00 -set -g _tide_color_gold D7AF00 -set -g _tide_color_green 5FD700 -set -g _tide_color_light_blue 00AFFF - -# Create an empty fake function for each item -for func in _fake(functions --all | string match --entire _tide_item) - function $func - end -end - -for file in (status dirname)/tide/configure/{choices, functions}/**.fish - source $file -end - -function _tide_sub_configure - 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 - - _tide_detect_os | read -g --line os_branding_icon os_branding_color os_branding_bg_color - - set -g fake_columns $COLUMNS - test $fake_columns -gt 90 && set fake_columns 90 - set -g fake_lines $LINES - - set -g _tide_selected_option - _next_choice all/style -end - -function _next_choice -a nextChoice - set -q _tide_selected_option || return 0 - set -l cmd (string split '/' $nextChoice)[2] - $cmd -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 $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 - if set -q _flag_auto - 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 \ - "$(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 - _tide_exit_configure - set -e _tide_symbol_list - set -e _tide_option_list - command -q clear && clear - break - 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 - break - end - end -end - -function _tide_display_prompt - set -q _flag_auto && return - - _fake_tide_cache_variables - set -l prompt (_fake_tide_prompt) - - set -l bottom_left_prompt_string_length (string length --visible $prompt[-1]) - 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 - -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 deleted file mode 100644 index 5a45fbd..0000000 --- a/fish/functions/_tide_sub_reload.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_sub_reload - source (functions --details fish_prompt) -end diff --git a/fish/functions/fish_mode_prompt.fish b/fish/functions/fish_mode_prompt.fish deleted file mode 100644 index f37cf7d..0000000 --- a/fish/functions/fish_mode_prompt.fish +++ /dev/null @@ -1 +0,0 @@ -# Disable default vi prompt diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish deleted file mode 100644 index 3b58b7b..0000000 --- a/fish/functions/fish_prompt.fish +++ /dev/null @@ -1,171 +0,0 @@ -function fish_prompt -end # In case this file gets loaded non-interactively, e.g by conda -status is-interactive || exit - -_tide_remove_unusable_items -_tide_cache_variables -_tide_parent_dirs -source (functions --details _tide_pwd) - -set -l prompt_var _tide_prompt_$fish_pid -set -U $prompt_var # Set var here so if we erase $prompt_var, bg job won't set a uvar - -set_color normal | read -l color_normal -status fish-path | read -l fish_path - -# _tide_repaint prevents us from creating a second background job -function _tide_refresh_prompt --on-variable $prompt_var --on-variable COLUMNS - set -g _tide_repaint - commandline -f repaint -end - -if contains newline $_tide_left_items # two line prompt initialization - test "$tide_prompt_add_newline_before" = true && set -l add_newline '\n' - - set_color $tide_prompt_color_frame_and_connection -b normal | read -l prompt_and_frame_color - - set -l column_offset 5 - test "$tide_left_prompt_frame_enabled" = true && - set -l top_left_frame "$prompt_and_frame_color╭─" && - set -l bot_left_frame "$prompt_and_frame_color╰─" && - set column_offset (math $column_offset-2) - test "$tide_right_prompt_frame_enabled" = true && - set -l top_right_frame "$prompt_and_frame_color─╮" && - 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 && jobs -p | count | read -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 && jobs -p | count | read -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 - - math \$COLUMNS-(string length -V \"\$$prompt_var[1][1]\$$prompt_var[1][3]\")+$column_offset | read -lx dist_btwn_sides - - echo -ns $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 -ns \"\$$prompt_var[1][3]$top_right_frame\"\n\"$bot_left_frame\$$prompt_var[1][2]$color_normal \" -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 && jobs -p | count | read -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 && jobs -p | count | read -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 - - 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 - -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)" - # Pager open usually means selecting, not running - # Can be untrue, but it's better than the alternative - if not commandline --paging-mode - set -g _tide_transient - set -g _tide_repaint - commandline -f repaint - end - end - commandline -f execute - end - - bind \r _tide_enter_transient - bind \n _tide_enter_transient - bind -M insert \r _tide_enter_transient - bind -M insert \n _tide_enter_transient -end diff --git a/fish/functions/tide.fish b/fish/functions/tide.fish deleted file mode 100644 index 092a722..0000000 --- a/fish/functions/tide.fish +++ /dev/null @@ -1,28 +0,0 @@ -function tide --description 'Manage your Tide prompt' - argparse --stop-nonopt v/version h/help -- $argv - - if set -q _flag_version - echo 'tide, version 6.1.1' - else if set -q _flag_help - _tide_help - else if functions --query _tide_sub_$argv[1] - _tide_sub_$argv[1] $argv[2..] - else - _tide_help - return 1 - end -end - -function _tide_help - printf %s\n \ - 'Usage: tide [options] subcommand [options]' \ - '' \ - 'Options:' \ - ' -v or --version print tide version number' \ - ' -h or --help print this help message' \ - '' \ - '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 deleted file mode 100644 index f670b1e..0000000 --- a/fish/functions/tide/configure/choices/all/finish.fish +++ /dev/null @@ -1,46 +0,0 @@ -function finish - _tide_title Finish - - echo - set_color red - _tide_option y 'Overwrite your current tide config' - set_color normal - echo - - _tide_option p 'Exit and print the config you just generated' - echo - - _tide_menu (status function) - switch $_tide_selected_option - 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 - _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 - - # Set the real variables - for fakeVar in (set --names | string match -r "^fake_tide.*") - set -U (string replace 'fake_' '' $fakeVar) $$fakeVar - end - - # Make sure old prompt won't display - set -e $_tide_prompt_var 2>/dev/null - - # Re-initialize the 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 deleted file mode 100644 index be167bb..0000000 --- a/fish/functions/tide/configure/choices/all/icons.fish +++ /dev/null @@ -1,33 +0,0 @@ -function icons - _tide_title Icons - - _tide_option 1 'Few icons' - _tide_display_prompt - - _tide_option 2 'Many icons' - _enable_icons - _tide_display_prompt - - _tide_menu (status function) - switch $_tide_selected_option - case 'Few icons' - _disable_icons - end - _next_choice all/transient -end - -function _enable_icons - set -p fake_tide_left_prompt_items os - set -g fake_tide_pwd_icon  - set -g fake_tide_pwd_icon_home  - set -g fake_tide_cmd_duration_icon  - set -g fake_tide_git_icon  -end - -function _disable_icons - _tide_find_and_remove os fake_tide_left_prompt_items - set fake_tide_pwd_icon - set fake_tide_pwd_icon_home - set fake_tide_cmd_duration_icon - set fake_tide_git_icon -end diff --git a/fish/functions/tide/configure/choices/all/prompt_colors.fish b/fish/functions/tide/configure/choices/all/prompt_colors.fish deleted file mode 100644 index 247ef4e..0000000 --- a/fish/functions/tide/configure/choices/all/prompt_colors.fish +++ /dev/null @@ -1,26 +0,0 @@ -function prompt_colors - _tide_title 'Prompt Colors' - - _tide_option 1 'True color' - _tide_display_prompt - - _tide_option 2 '16 colors' - _load_config "$_tide_configure_style"_16color - set -g _tide_16color true - _tide_display_prompt - - _tide_menu (status function) - switch $_tide_selected_option - case 'True color' - _load_config "$_tide_configure_style" - set -e _tide_16color - switch $_tide_configure_style - case lean rainbow - _next_choice all/show_time - case classic - _next_choice classic/classic_prompt_color - end - 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 deleted file mode 100644 index ff76546..0000000 --- a/fish/functions/tide/configure/choices/all/prompt_connection.fish +++ /dev/null @@ -1,31 +0,0 @@ -function prompt_connection - _tide_title 'Prompt Connection' - - _tide_option 1 Disconnected - set -g fake_tide_prompt_icon_connection ' ' - _tide_display_prompt - - _tide_option 2 Dotted - set -g fake_tide_prompt_icon_connection '·' - _tide_display_prompt - - _tide_option 3 Solid - set -g fake_tide_prompt_icon_connection '─' - _tide_display_prompt - - _tide_menu (status function) - switch $_tide_selected_option - case Disconnected - set -g fake_tide_prompt_icon_connection ' ' - case Dotted - set -g fake_tide_prompt_icon_connection '·' - 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_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 deleted file mode 100644 index cefbf2c..0000000 --- a/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish +++ /dev/null @@ -1,40 +0,0 @@ -function prompt_connection_andor_frame_color - if test "$_tide_16color" = true || - test "$fake_tide_left_prompt_frame_enabled" = false -a \ - "$fake_tide_right_prompt_frame_enabled" = false -a \ - "$fake_tide_prompt_icon_connection" = ' ' - _next_choice all/prompt_spacing - return 0 - end - - _tide_title "Connection & Frame Color" - - _tide_option 1 Lightest - set -g 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 - - _tide_option 3 Dark - set -g 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 - - _tide_menu (status function) - switch $_tide_selected_option - case Lightest - set -g fake_tide_prompt_color_frame_and_connection 808080 - case Light - set -g fake_tide_prompt_color_frame_and_connection 6C6C6C - case Dark - set -g fake_tide_prompt_color_frame_and_connection 585858 - case Darkest - set -g fake_tide_prompt_color_frame_and_connection 444444 - end - _next_choice all/prompt_spacing -end diff --git a/fish/functions/tide/configure/choices/all/prompt_spacing.fish b/fish/functions/tide/configure/choices/all/prompt_spacing.fish deleted file mode 100644 index f68be68..0000000 --- a/fish/functions/tide/configure/choices/all/prompt_spacing.fish +++ /dev/null @@ -1,22 +0,0 @@ -function prompt_spacing - _tide_title 'Prompt Spacing' - - _tide_option 1 Compact - set -g fake_tide_prompt_add_newline_before false - _tide_display_prompt - _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) - switch $_tide_selected_option - case Compact - set -g fake_tide_prompt_add_newline_before false - case Sparse - set -g fake_tide_prompt_add_newline_before true - end - _next_choice all/icons -end diff --git a/fish/functions/tide/configure/choices/all/show_time.fish b/fish/functions/tide/configure/choices/all/show_time.fish deleted file mode 100644 index b66c785..0000000 --- a/fish/functions/tide/configure/choices/all/show_time.fish +++ /dev/null @@ -1,33 +0,0 @@ -function show_time - _tide_title 'Show current time?' - - _tide_option 1 No - _tide_display_prompt - - set -a fake_tide_right_prompt_items time - - _tide_option 2 '24-hour format' - set -g fake_tide_time_format %T - _tide_display_prompt - - _tide_option 3 '12-hour format' - set -g fake_tide_time_format %r - _tide_display_prompt - - _tide_menu (status function) - switch $_tide_selected_option - case No - set -g fake_tide_time_format '' - set -e fake_tide_right_prompt_items[-1] - case '24-hour format' - set -g fake_tide_time_format %T - case '12-hour format' - set -g fake_tide_time_format %r - end - switch $_tide_configure_style - case lean - _next_choice "$_tide_configure_style"/"$_tide_configure_style"_prompt_height - case classic rainbow - _next_choice "$_tide_configure_style"/"$_tide_configure_style"_prompt_separators - end -end diff --git a/fish/functions/tide/configure/choices/all/style.fish b/fish/functions/tide/configure/choices/all/style.fish deleted file mode 100644 index fe9a58f..0000000 --- a/fish/functions/tide/configure/choices/all/style.fish +++ /dev/null @@ -1,36 +0,0 @@ -function style - set -g _tide_configure_current_options - - _tide_title 'Prompt Style' - - _tide_option 1 Lean - _load_config lean - _tide_display_prompt - - _tide_option 2 Classic - _load_config classic - _tide_display_prompt - - _tide_option 3 Rainbow - _load_config rainbow - _tide_display_prompt - - _tide_menu (status function) --no-restart - switch $_tide_selected_option - case Lean - _load_config lean - set -g _tide_configure_style lean - case Classic - _load_config classic - set -g _tide_configure_style classic - case Rainbow - _load_config rainbow - set -g _tide_configure_style rainbow - end - _next_choice all/prompt_colors -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 diff --git a/fish/functions/tide/configure/choices/all/transient.fish b/fish/functions/tide/configure/choices/all/transient.fish deleted file mode 100644 index df2b6b6..0000000 --- a/fish/functions/tide/configure/choices/all/transient.fish +++ /dev/null @@ -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 diff --git a/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish b/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish deleted file mode 100644 index 77ceeaf..0000000 --- a/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish +++ /dev/null @@ -1,38 +0,0 @@ -function classic_prompt_color - _tide_title 'Prompt Color' - - _tide_option 1 Lightest - _set_all_items_bg_color 585858 - _tide_display_prompt - - _tide_option 2 Light - _set_all_items_bg_color 444444 - _tide_display_prompt - - _tide_option 3 Dark - _set_all_items_bg_color 303030 - _tide_display_prompt - - _tide_option 4 Darkest - _set_all_items_bg_color 1C1C1C - _tide_display_prompt - - _tide_menu (status function) - switch $_tide_selected_option - case Lightest - _set_all_items_bg_color 585858 - case Light - _set_all_items_bg_color 444444 - case Dark - _set_all_items_bg_color 303030 - case Darkest - _set_all_items_bg_color 1C1C1C - end - _next_choice all/show_time -end - -function _set_all_items_bg_color -a color - for var in (set --names | string match -r "fake_.*_bg_color.*") - set $var $color - end -end diff --git a/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish b/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish deleted file mode 100644 index 20af6cd..0000000 --- a/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish +++ /dev/null @@ -1,40 +0,0 @@ -function classic_prompt_separators - _tide_title 'Prompt Separators' - - _tide_option 1 Angled - set -g fake_tide_left_prompt_separator_same_color  - set -g fake_tide_right_prompt_separator_same_color  - _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 │ - _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 ╱ - _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  - _tide_display_prompt - - _tide_menu (status function) - switch $_tide_selected_option - case Angled - 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 deleted file mode 100644 index 2077241..0000000 --- a/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish +++ /dev/null @@ -1,26 +0,0 @@ -function lean_prompt_height - _tide_title 'Prompt Height' - - _tide_option 1 'One line' - _tide_find_and_remove newline fake_tide_left_prompt_items - set -g fake_tide_left_prompt_suffix '' - _tide_display_prompt - - _tide_option 2 'Two lines' - 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 ' ' - _tide_display_prompt - - _tide_menu (status function) - switch $_tide_selected_option - 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 '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 ' ' - _next_choice all/prompt_connection - end -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 deleted file mode 100644 index 0030cad..0000000 --- a/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish +++ /dev/null @@ -1,32 +0,0 @@ -function powerline_prompt_heads - _tide_title 'Prompt Heads' - - _tide_option 1 Sharp - set -g fake_tide_left_prompt_suffix  - set -g fake_tide_right_prompt_prefix  - _tide_display_prompt - - _tide_option 2 Slanted - set -g fake_tide_left_prompt_suffix  - set -g fake_tide_right_prompt_prefix  - _tide_display_prompt - - _tide_option 3 Round - set -g fake_tide_left_prompt_suffix  - set -g fake_tide_right_prompt_prefix  - _tide_display_prompt - - _tide_menu (status function) - switch $_tide_selected_option - case Sharp - 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_style.fish b/fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish deleted file mode 100644 index b374757..0000000 --- a/fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish +++ /dev/null @@ -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 diff --git a/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish b/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish deleted file mode 100644 index 6b1574b..0000000 --- a/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish +++ /dev/null @@ -1,40 +0,0 @@ -function powerline_prompt_tails - _tide_title 'Prompt Tails' - - _tide_option 1 Flat - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - _tide_display_prompt - - _tide_option 2 Sharp - set -g fake_tide_left_prompt_prefix  - set -g fake_tide_right_prompt_suffix  - _tide_display_prompt - - _tide_option 3 Slanted - set -g fake_tide_left_prompt_prefix  - set -g fake_tide_right_prompt_suffix  - _tide_display_prompt - - _tide_option 4 Round - set -g fake_tide_left_prompt_prefix  - set -g fake_tide_right_prompt_suffix  - _tide_display_prompt - - _tide_menu (status function) - switch $_tide_selected_option - case Flat - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - case Sharp - 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_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 deleted file mode 100644 index a2d0a5b..0000000 --- a/fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish +++ /dev/null @@ -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 diff --git a/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish b/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish deleted file mode 100644 index 14b9319..0000000 --- a/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish +++ /dev/null @@ -1,40 +0,0 @@ -function rainbow_prompt_separators - _tide_title 'Prompt Separators' - - _tide_option 1 Angled - set -g fake_tide_left_prompt_separator_diff_color  - set -g fake_tide_right_prompt_separator_diff_color  - _tide_display_prompt - - _tide_option 2 Vertical - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - _tide_display_prompt - - _tide_option 3 Slanted - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - _tide_display_prompt - - _tide_option 4 Round - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - _tide_display_prompt - - _tide_menu (status function) - switch $_tide_selected_option - case Angled - set -g fake_tide_left_prompt_separator_diff_color  - set -g fake_tide_right_prompt_separator_diff_color  - case Vertical - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - case Slanted - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - case Round - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - end - _next_choice powerline/powerline_prompt_heads -end diff --git a/fish/functions/tide/configure/configs/classic.fish b/fish/functions/tide/configure/configs/classic.fish deleted file mode 100644 index 8973cbc..0000000 --- a/fish/functions/tide/configure/configs/classic.fish +++ /dev/null @@ -1,116 +0,0 @@ -tide_aws_bg_color 444444 -tide_aws_color FF9900 -tide_character_color $_tide_color_green -tide_character_color_failure FF0000 -tide_cmd_duration_bg_color 444444 -tide_cmd_duration_color 87875F -tide_cmd_duration_decimals 0 -tide_cmd_duration_threshold 3000 -tide_context_always_display false -tide_context_bg_color 444444 -tide_context_color_default D7AF87 -tide_context_color_root $_tide_color_gold -tide_context_color_ssh D7AF87 -tide_context_hostname_parts 1 -tide_crystal_bg_color 444444 -tide_crystal_color FFFFFF -tide_direnv_bg_color 444444 -tide_direnv_bg_color_denied 444444 -tide_direnv_color $_tide_color_gold -tide_direnv_color_denied FF0000 -tide_distrobox_bg_color 444444 -tide_distrobox_color FF00FF -tide_docker_bg_color 444444 -tide_docker_color 2496ED -tide_docker_default_contexts default colima -tide_elixir_bg_color 444444 -tide_elixir_color 4E2A8E -tide_gcloud_bg_color 444444 -tide_gcloud_color 4285F4 -tide_git_bg_color 444444 -tide_git_bg_color_unstable 444444 -tide_git_bg_color_urgent 444444 -tide_git_color_branch $_tide_color_green -tide_git_color_conflicted FF0000 -tide_git_color_dirty $_tide_color_gold -tide_git_color_operation FF0000 -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_truncation_length 24 -tide_git_truncation_strategy -tide_go_bg_color 444444 -tide_go_color 00ACD7 -tide_java_bg_color 444444 -tide_java_color ED8B00 -tide_jobs_bg_color 444444 -tide_jobs_color $_tide_color_dark_green -tide_jobs_number_threshold 1000 -tide_kubectl_bg_color 444444 -tide_kubectl_color 326CE5 -tide_left_prompt_frame_enabled true -tide_left_prompt_items pwd git newline -tide_left_prompt_prefix '' -tide_left_prompt_separator_diff_color  -tide_left_prompt_separator_same_color  -tide_left_prompt_suffix  -tide_nix_shell_bg_color 444444 -tide_nix_shell_color 7EBAE4 -tide_node_bg_color 444444 -tide_node_color 44883E -tide_os_bg_color 444444 -tide_os_color EEEEEE -tide_php_bg_color 444444 -tide_php_color 617CBE -tide_private_mode_bg_color 444444 -tide_private_mode_color FFFFFF -tide_prompt_add_newline_before true -tide_prompt_color_frame_and_connection 6C6C6C -tide_prompt_color_separator_same_color 949494 -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_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_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 build.zig -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 zig -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_shlvl_bg_color 444444 -tide_shlvl_color d78700 -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_terraform_bg_color 444444 -tide_terraform_color 844FBA -tide_time_bg_color 444444 -tide_time_color 5F8787 -tide_time_format %T -tide_toolbox_bg_color 444444 -tide_toolbox_color 613583 -tide_vi_mode_bg_color_default 444444 -tide_vi_mode_bg_color_insert 444444 -tide_vi_mode_bg_color_replace 444444 -tide_vi_mode_bg_color_visual 444444 -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_zig_bg_color 444444 -tide_zig_color F7A41D diff --git a/fish/functions/tide/configure/configs/classic_16color.fish b/fish/functions/tide/configure/configs/classic_16color.fish deleted file mode 100644 index 670170f..0000000 --- a/fish/functions/tide/configure/configs/classic_16color.fish +++ /dev/null @@ -1,89 +0,0 @@ -tide_aws_bg_color black -tide_aws_color yellow -tide_character_color brgreen -tide_character_color_failure brred -tide_cmd_duration_bg_color black -tide_cmd_duration_color brblack -tide_context_bg_color black -tide_context_color_default yellow -tide_context_color_root bryellow -tide_context_color_ssh yellow -tide_crystal_bg_color black -tide_crystal_color brwhite -tide_direnv_bg_color black -tide_direnv_bg_color_denied black -tide_direnv_color bryellow -tide_direnv_color_denied brred -tide_distrobox_bg_color black -tide_distrobox_color brmagenta -tide_docker_bg_color black -tide_docker_color blue -tide_elixir_bg_color black -tide_elixir_color magenta -tide_gcloud_bg_color black -tide_gcloud_color blue -tide_git_bg_color black -tide_git_bg_color_unstable black -tide_git_bg_color_urgent black -tide_git_color_branch brgreen -tide_git_color_conflicted brred -tide_git_color_dirty bryellow -tide_git_color_operation brred -tide_git_color_staged bryellow -tide_git_color_stash brgreen -tide_git_color_untracked brblue -tide_git_color_upstream brgreen -tide_go_bg_color black -tide_go_color brcyan -tide_java_bg_color black -tide_java_color yellow -tide_jobs_bg_color black -tide_jobs_color green -tide_kubectl_bg_color black -tide_kubectl_color blue -tide_nix_shell_bg_color black -tide_nix_shell_color brblue -tide_node_bg_color black -tide_node_color green -tide_os_bg_color black -tide_os_color brwhite -tide_php_bg_color black -tide_php_color blue -tide_private_mode_bg_color black -tide_private_mode_color brwhite -tide_prompt_color_frame_and_connection brblack -tide_prompt_color_separator_same_color brblack -tide_pulumi_bg_color black -tide_pulumi_color yellow -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 -tide_shlvl_color yellow -tide_status_bg_color black -tide_status_bg_color_failure black -tide_status_color green -tide_status_color_failure red -tide_terraform_bg_color black -tide_terraform_color magenta -tide_time_bg_color black -tide_time_color brblack -tide_toolbox_bg_color black -tide_toolbox_color magenta -tide_vi_mode_bg_color_default black -tide_vi_mode_bg_color_insert black -tide_vi_mode_bg_color_replace black -tide_vi_mode_bg_color_visual black -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_zig_bg_color black -tide_zig_color yellow diff --git a/fish/functions/tide/configure/configs/lean.fish b/fish/functions/tide/configure/configs/lean.fish deleted file mode 100644 index a958a17..0000000 --- a/fish/functions/tide/configure/configs/lean.fish +++ /dev/null @@ -1,116 +0,0 @@ -tide_aws_bg_color normal -tide_aws_color FF9900 -tide_character_color $_tide_color_green -tide_character_color_failure FF0000 -tide_cmd_duration_bg_color normal -tide_cmd_duration_color 87875F -tide_cmd_duration_decimals 0 -tide_cmd_duration_threshold 3000 -tide_context_always_display false -tide_context_bg_color normal -tide_context_color_default D7AF87 -tide_context_color_root $_tide_color_gold -tide_context_color_ssh D7AF87 -tide_context_hostname_parts 1 -tide_crystal_bg_color normal -tide_crystal_color FFFFFF -tide_direnv_bg_color normal -tide_direnv_bg_color_denied normal -tide_direnv_color $_tide_color_gold -tide_direnv_color_denied FF0000 -tide_distrobox_bg_color normal -tide_distrobox_color FF00FF -tide_docker_bg_color normal -tide_docker_color 2496ED -tide_docker_default_contexts default colima -tide_elixir_bg_color normal -tide_elixir_color 4E2A8E -tide_gcloud_bg_color normal -tide_gcloud_color 4285F4 -tide_git_bg_color normal -tide_git_bg_color_unstable normal -tide_git_bg_color_urgent normal -tide_git_color_branch $_tide_color_green -tide_git_color_conflicted FF0000 -tide_git_color_dirty $_tide_color_gold -tide_git_color_operation FF0000 -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_truncation_length 24 -tide_git_truncation_strategy -tide_go_bg_color normal -tide_go_color 00ACD7 -tide_java_bg_color normal -tide_java_color ED8B00 -tide_jobs_bg_color normal -tide_jobs_color $_tide_color_dark_green -tide_jobs_number_threshold 1000 -tide_kubectl_bg_color normal -tide_kubectl_color 326CE5 -tide_left_prompt_frame_enabled false -tide_left_prompt_items pwd git newline character -tide_left_prompt_prefix '' -tide_left_prompt_separator_diff_color ' ' -tide_left_prompt_separator_same_color ' ' -tide_left_prompt_suffix ' ' -tide_nix_shell_bg_color normal -tide_nix_shell_color 7EBAE4 -tide_node_bg_color normal -tide_node_color 44883E -tide_os_bg_color normal -tide_os_color normal -tide_php_bg_color normal -tide_php_color 617CBE -tide_private_mode_bg_color normal -tide_private_mode_color FFFFFF -tide_prompt_add_newline_before true -tide_prompt_color_frame_and_connection 6C6C6C -tide_prompt_color_separator_same_color 949494 -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_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_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 build.zig -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 zig -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_shlvl_bg_color normal -tide_shlvl_color d78700 -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_terraform_bg_color normal -tide_terraform_color 844FBA -tide_time_bg_color normal -tide_time_color 5F8787 -tide_time_format %T -tide_toolbox_bg_color normal -tide_toolbox_color 613583 -tide_vi_mode_bg_color_default normal -tide_vi_mode_bg_color_insert normal -tide_vi_mode_bg_color_replace normal -tide_vi_mode_bg_color_visual normal -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_zig_bg_color normal -tide_zig_color F7A41D diff --git a/fish/functions/tide/configure/configs/lean_16color.fish b/fish/functions/tide/configure/configs/lean_16color.fish deleted file mode 100644 index 16c2511..0000000 --- a/fish/functions/tide/configure/configs/lean_16color.fish +++ /dev/null @@ -1,89 +0,0 @@ -tide_aws_bg_color normal -tide_aws_color yellow -tide_character_color brgreen -tide_character_color_failure brred -tide_cmd_duration_bg_color normal -tide_cmd_duration_color brblack -tide_context_bg_color normal -tide_context_color_default yellow -tide_context_color_root bryellow -tide_context_color_ssh yellow -tide_crystal_bg_color normal -tide_crystal_color brwhite -tide_direnv_bg_color normal -tide_direnv_bg_color_denied normal -tide_direnv_color bryellow -tide_direnv_color_denied brred -tide_distrobox_bg_color normal -tide_distrobox_color brmagenta -tide_docker_bg_color normal -tide_docker_color blue -tide_elixir_bg_color normal -tide_elixir_color magenta -tide_gcloud_bg_color normal -tide_gcloud_color blue -tide_git_bg_color normal -tide_git_bg_color_unstable normal -tide_git_bg_color_urgent normal -tide_git_color_branch brgreen -tide_git_color_conflicted brred -tide_git_color_dirty bryellow -tide_git_color_operation brred -tide_git_color_staged bryellow -tide_git_color_stash brgreen -tide_git_color_untracked brblue -tide_git_color_upstream brgreen -tide_go_bg_color normal -tide_go_color brcyan -tide_java_bg_color normal -tide_java_color yellow -tide_jobs_bg_color normal -tide_jobs_color green -tide_kubectl_bg_color normal -tide_kubectl_color blue -tide_nix_shell_bg_color normal -tide_nix_shell_color brblue -tide_node_bg_color normal -tide_node_color green -tide_os_bg_color normal -tide_os_color brwhite -tide_php_bg_color normal -tide_php_color blue -tide_private_mode_bg_color normal -tide_private_mode_color brwhite -tide_prompt_color_frame_and_connection brblack -tide_prompt_color_separator_same_color brblack -tide_pulumi_bg_color normal -tide_pulumi_color yellow -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 -tide_shlvl_color yellow -tide_status_bg_color normal -tide_status_bg_color_failure normal -tide_status_color green -tide_status_color_failure red -tide_terraform_bg_color normal -tide_terraform_color magenta -tide_time_bg_color normal -tide_time_color brblack -tide_toolbox_bg_color normal -tide_toolbox_color magenta -tide_vi_mode_bg_color_default normal -tide_vi_mode_bg_color_insert normal -tide_vi_mode_bg_color_replace normal -tide_vi_mode_bg_color_visual normal -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_zig_bg_color normal -tide_zig_color yellow diff --git a/fish/functions/tide/configure/configs/rainbow.fish b/fish/functions/tide/configure/configs/rainbow.fish deleted file mode 100644 index 60c1592..0000000 --- a/fish/functions/tide/configure/configs/rainbow.fish +++ /dev/null @@ -1,116 +0,0 @@ -tide_aws_bg_color FF9900 -tide_aws_color 232F3E -tide_character_color $_tide_color_green -tide_character_color_failure FF0000 -tide_cmd_duration_bg_color C4A000 -tide_cmd_duration_color 000000 -tide_cmd_duration_decimals 0 -tide_cmd_duration_threshold 3000 -tide_context_always_display false -tide_context_bg_color 444444 -tide_context_color_default D7AF87 -tide_context_color_root $_tide_color_gold -tide_context_color_ssh D7AF87 -tide_context_hostname_parts 1 -tide_crystal_bg_color FFFFFF -tide_crystal_color 000000 -tide_direnv_bg_color $_tide_color_gold -tide_direnv_bg_color_denied FF0000 -tide_direnv_color 000000 -tide_direnv_color_denied 000000 -tide_distrobox_bg_color FF00FF -tide_distrobox_color 000000 -tide_docker_bg_color 2496ED -tide_docker_color 000000 -tide_docker_default_contexts default colima -tide_elixir_bg_color 4E2A8E -tide_elixir_color 000000 -tide_gcloud_bg_color 4285F4 -tide_gcloud_color 000000 -tide_git_bg_color 4E9A06 -tide_git_bg_color_unstable C4A000 -tide_git_bg_color_urgent CC0000 -tide_git_color_branch 000000 -tide_git_color_conflicted 000000 -tide_git_color_dirty 000000 -tide_git_color_operation 000000 -tide_git_color_staged 000000 -tide_git_color_stash 000000 -tide_git_color_untracked 000000 -tide_git_color_upstream 000000 -tide_git_truncation_length 24 -tide_git_truncation_strategy -tide_go_bg_color 00ACD7 -tide_go_color 000000 -tide_java_bg_color ED8B00 -tide_java_color 000000 -tide_jobs_bg_color 444444 -tide_jobs_color 4E9A06 -tide_jobs_number_threshold 1000 -tide_kubectl_bg_color 326CE5 -tide_kubectl_color 000000 -tide_left_prompt_frame_enabled true -tide_left_prompt_items pwd git newline -tide_left_prompt_prefix '' -tide_left_prompt_separator_diff_color  -tide_left_prompt_separator_same_color  -tide_left_prompt_suffix  -tide_nix_shell_bg_color 7EBAE4 -tide_nix_shell_color 000000 -tide_node_bg_color 44883E -tide_node_color 000000 -tide_os_bg_color $os_branding_bg_color -tide_os_color $os_branding_color -tide_php_bg_color 617CBE -tide_php_color 000000 -tide_private_mode_bg_color F1F3F4 -tide_private_mode_color 000000 -tide_prompt_add_newline_before true -tide_prompt_color_frame_and_connection 6C6C6C -tide_prompt_color_separator_same_color 949494 -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_pwd_bg_color 3465A4 -tide_pwd_color_anchors E4E4E4 -tide_pwd_color_dirs E4E4E4 -tide_pwd_color_truncated_dirs BCBCBC -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 build.zig -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 zig -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_shlvl_bg_color 808000 -tide_shlvl_color 000000 -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_terraform_bg_color 800080 -tide_terraform_color 000000 -tide_time_bg_color D3D7CF -tide_time_color 000000 -tide_time_format %T -tide_toolbox_bg_color 613583 -tide_toolbox_color 000000 -tide_vi_mode_bg_color_default 949494 -tide_vi_mode_bg_color_insert 87AFAF -tide_vi_mode_bg_color_replace 87AF87 -tide_vi_mode_bg_color_visual FF8700 -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_zig_bg_color F7A41D -tide_zig_color 000000 diff --git a/fish/functions/tide/configure/configs/rainbow_16color.fish b/fish/functions/tide/configure/configs/rainbow_16color.fish deleted file mode 100644 index a040f58..0000000 --- a/fish/functions/tide/configure/configs/rainbow_16color.fish +++ /dev/null @@ -1,93 +0,0 @@ -tide_aws_bg_color yellow -tide_aws_color brblack -tide_character_color brgreen -tide_character_color_failure brred -tide_cmd_duration_bg_color yellow -tide_cmd_duration_color black -tide_context_bg_color brblack -tide_context_color_default yellow -tide_context_color_root yellow -tide_context_color_ssh yellow -tide_crystal_bg_color brwhite -tide_crystal_color black -tide_direnv_bg_color bryellow -tide_direnv_bg_color_denied brred -tide_direnv_color black -tide_direnv_color_denied black -tide_distrobox_bg_color brmagenta -tide_distrobox_color black -tide_docker_bg_color blue -tide_docker_color black -tide_elixir_bg_color magenta -tide_elixir_color black -tide_gcloud_bg_color blue -tide_gcloud_color black -tide_git_bg_color green -tide_git_bg_color_unstable yellow -tide_git_bg_color_urgent red -tide_git_color_branch black -tide_git_color_conflicted black -tide_git_color_dirty black -tide_git_color_operation black -tide_git_color_staged black -tide_git_color_stash black -tide_git_color_untracked black -tide_git_color_upstream black -tide_go_bg_color brcyan -tide_go_color black -tide_java_bg_color yellow -tide_java_color black -tide_jobs_bg_color brblack -tide_jobs_color green -tide_kubectl_bg_color blue -tide_kubectl_color black -tide_nix_shell_bg_color brblue -tide_nix_shell_color black -tide_node_bg_color green -tide_node_color black -tide_os_bg_color white -tide_os_color black -tide_php_bg_color blue -tide_php_color black -tide_private_mode_bg_color brwhite -tide_private_mode_color black -tide_prompt_color_frame_and_connection brblack -tide_prompt_color_separator_same_color brblack -tide_pulumi_bg_color yellow -tide_pulumi_color black -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 -tide_shlvl_color black -tide_status_bg_color black -tide_status_bg_color_failure red -tide_status_color green -tide_status_color_failure bryellow -tide_terraform_bg_color magenta -tide_terraform_color black -tide_time_bg_color white -tide_time_color black -tide_toolbox_bg_color magenta -tide_toolbox_color black -tide_vi_mode_bg_color_default white -tide_vi_mode_bg_color_insert cyan -tide_vi_mode_bg_color_replace green -tide_vi_mode_bg_color_visual yellow -tide_vi_mode_color_default black -tide_vi_mode_color_insert black -tide_vi_mode_color_replace black -tide_vi_mode_color_visual black -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_zig_bg_color yellow -tide_zig_color black diff --git a/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish b/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish deleted file mode 100644 index 4661ab1..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish +++ /dev/null @@ -1,41 +0,0 @@ -function _fake_tide_cache_variables - # pwd - set_color -o $fake_tide_pwd_color_anchors | read -gx _fake_tide_color_anchors - set -gx _fake_tide_color_truncated_dirs "$(set_color $fake_tide_pwd_color_truncated_dirs)" - set -gx _fake_tide_reset_to_color_dirs (set_color normal -b $fake_tide_pwd_bg_color; set_color $fake_tide_pwd_color_dirs) - - # git - contains git $fake_tide_left_prompt_items $fake_tide_right_prompt_items && - set -gx _fake_tide_location_color "$(set_color $fake_tide_git_color_branch)" - - # private_mode - if contains private_mode $fake_tide_left_prompt_items $fake_tide_right_prompt_items && test -n "$fish_private_mode" - set -gx _fake_tide_private_mode - else - set -e _fake_tide_private_mode - end - - # Same-color-separator color - set -gx _fake_tide_color_separator_same_color "$(set_color $fake_tide_prompt_color_separator_same_color)" - - # two line prompt - if contains newline $fake_tide_left_prompt_items - set_color $fake_tide_prompt_color_frame_and_connection -b normal | read -gx _fake_tide_prompt_and_frame_color - else - set -e _fake_tide_prompt_and_frame_color - end - - # newline before - if test "$fake_tide_prompt_add_newline_before" = true - set -g _fake_tide_add_newline '' - else - set -e _fake_tide_add_newline - end - - # item padding - if test "$fake_tide_prompt_pad_items" = true - set -gx _fake_tide_pad ' ' - else - set -e _fake_tide_pad - end -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_item_character.fish b/fish/functions/tide/configure/functions/_fake_tide_item_character.fish deleted file mode 100644 index 94892ec..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_item_character.fish +++ /dev/null @@ -1,8 +0,0 @@ -function _fake_tide_item_character - set_color $fake_tide_character_color - 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/functions/_fake_tide_item_cmd_duration.fish b/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish deleted file mode 100644 index 5aa13b2..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _fake_tide_item_cmd_duration - _fake_tide_print_item cmd_duration $fake_tide_cmd_duration_icon' ' 5s -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_item_git.fish b/fish/functions/tide/configure/functions/_fake_tide_item_git.fish deleted file mode 100644 index fb5b957..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_item_git.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _fake_tide_item_git - _fake_tide_print_item git (set_color $fake_tide_git_color_branch) $fake_tide_git_icon' ' main -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish b/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish deleted file mode 100644 index c614bab..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish +++ /dev/null @@ -1,5 +0,0 @@ -function _fake_tide_item_newline - set_color $prev_bg_color -b normal - var=fake_tide_"$_fake_tide_side"_prompt_suffix echo $$var - set -g add_prefix -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_item_os.fish b/fish/functions/tide/configure/functions/_fake_tide_item_os.fish deleted file mode 100644 index 5255721..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_item_os.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _fake_tide_item_os - _fake_tide_print_item os $fake_tide_os_icon -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_item_time.fish b/fish/functions/tide/configure/functions/_fake_tide_item_time.fish deleted file mode 100644 index bbce0b5..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_item_time.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _fake_tide_item_time - _fake_tide_print_item time (date +$fake_tide_time_format) -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_print_item.fish b/fish/functions/tide/configure/functions/_fake_tide_print_item.fish deleted file mode 100644 index 30cd024..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_print_item.fish +++ /dev/null @@ -1,22 +0,0 @@ -function _fake_tide_print_item -a item - var=fake_tide_"$item"_bg_color set -f item_bg_color $$var - - if set -e add_prefix - set_color $item_bg_color -b normal - var=fake_tide_"$_fake_tide_side"_prompt_prefix echo -ns $$var - else if test "$item_bg_color" = "$prev_bg_color" - var=fake_tide_"$_fake_tide_side"_prompt_separator_same_color echo -ns $_fake_tide_color_separator_same_color$$var - else if test "$_fake_tide_side" = left - set_color $prev_bg_color -b $item_bg_color - echo -ns $fake_tide_left_prompt_separator_diff_color - else - set_color $item_bg_color -b $prev_bg_color - echo -ns $fake_tide_right_prompt_separator_diff_color - end - - var=fake_tide_"$item"_color set_color $$var -b $item_bg_color - - echo -ns $_fake_tide_pad $argv[2..] $_fake_tide_pad - - set -g prev_bg_color $item_bg_color -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_prompt.fish b/fish/functions/tide/configure/functions/_fake_tide_prompt.fish deleted file mode 100644 index 11f20ca..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_prompt.fish +++ /dev/null @@ -1,42 +0,0 @@ -function _fake_tide_prompt - set -g add_prefix - _fake_tide_side=left set -f left (for item in $fake_tide_left_prompt_items - _fake_tide_item_$item - end - if not set -e add_prefix - set_color $prev_bg_color -b normal - echo -ns $fake_tide_left_prompt_suffix - end) - - set -g add_prefix - _fake_tide_side=right set -f right (for item in $fake_tide_right_prompt_items - _fake_tide_item_$item - end - if not set -e add_prefix - set_color $prev_bg_color -b normal - echo -ns $fake_tide_right_prompt_suffix - end) - - if set -q _fake_tide_prompt_and_frame_color # If prompt is two lines - test "$fake_tide_left_prompt_frame_enabled" = true && - set left[1] "$_fake_tide_prompt_and_frame_color╭─$left[1]" && - set left[2] "$_fake_tide_prompt_and_frame_color╰─$left[2]" - test "$fake_tide_right_prompt_frame_enabled" = true && - set right[1] "$right[1]$_fake_tide_prompt_and_frame_color─╮" && - set right[2] "$right[2]$_fake_tide_prompt_and_frame_color─╯" - - # 5 = @PWD@ length which will be replaced - math $fake_columns+5-(string length --visible "$left[1]$right[1]") | read -lx dist_btwn_sides - echo -ns "$right[2]"\n(string replace @PWD@ (_fake_tide_pwd) "$left[1]")$_fake_tide_prompt_and_frame_color - - string repeat --no-newline --max (math max 0, $dist_btwn_sides-$_tide_pwd_len) $fake_tide_prompt_icon_connection - echo -ns "$right[1]"\n"$left[2] " - else - math $fake_columns+5-(string length --visible "$left[1]$right[1]") -$fake_tide_prompt_min_cols | read -lx dist_btwn_sides - string replace @PWD@ (_fake_tide_pwd) "$right[1]" "$left[1] " - end -end - -function _fake_tide_item_pwd - _fake_tide_print_item pwd @PWD@ -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_pwd.fish b/fish/functions/tide/configure/functions/_fake_tide_pwd.fish deleted file mode 100644 index 433eafa..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_pwd.fish +++ /dev/null @@ -1,11 +0,0 @@ -function _fake_tide_pwd - set -l out ( - set_color $fake_tide_pwd_color_dirs - echo -ns $fake_tide_pwd_icon' ' '~/' - set_color -o $fake_tide_pwd_color_anchors - echo -ns src - set_color normal -b $fake_tide_pwd_bg_color - ) - set -g _tide_pwd_len (string length --visible $out) - echo -ns $out -end diff --git a/fish/functions/tide/configure/icons.fish b/fish/functions/tide/configure/icons.fish deleted file mode 100644 index 70611cd..0000000 --- a/fish/functions/tide/configure/icons.fish +++ /dev/null @@ -1,40 +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 -tide_zig_icon  diff --git a/kitty/kitty b/kitty/kitty new file mode 120000 index 0000000..74b2715 --- /dev/null +++ b/kitty/kitty @@ -0,0 +1 @@ +/mnt/storage/repos/dotfiles/kitty \ No newline at end of file diff --git a/kitty/kitty-theme.conf b/kitty/kitty-theme.conf index d50dbe6..4a3193b 100644 --- a/kitty/kitty-theme.conf +++ b/kitty/kitty-theme.conf @@ -1,80 +1,89 @@ -# vim:ft=kitty - -## name: Catppuccin Kitty Macchiato -## author: Catppuccin Org -## license: MIT -## upstream: https://github.com/catppuccin/kitty/blob/main/themes/macchiato.conf -## blurb: Soothing pastel theme for the high-spirited! - - +######################### +# verdigris for kitty for kitty +# 0.0.1 +# GPL-3.0-only +# https://git.basking.monster/gaiety/verdigris +#################### +######################### # The basic colors -foreground #CAD3F5 -background #24273A -selection_foreground #24273A -selection_background #F4DBD6 +foreground #C6E4F0 +background #00040B +selection_foreground #19323B +selection_background #C6E4F0 +#################### +######################### # Cursor colors -cursor #F4DBD6 -cursor_text_color #24273A +cursor #C6E4F0 +cursor_text_color #19323B +# cursor_trail_color none +#################### -# URL underline color when hovering with mouse -url_color #F4DBD6 +######################### +# URL colors +url_color #8CC8E0 +#################### -# Kitty window border colors -active_border_color #B7BDF8 -inactive_border_color #6E738D -bell_border_color #EED49F - -# OS Window titlebar colors -wayland_titlebar_color #24273A -macos_titlebar_color #24273A +######################### +# Marks colors +# mark1_foreground black +# mark1_background #98d3cb +# mark2_foreground black +# mark2_background #f2dcd3 +# mark3_foreground black +# mark3_background #f274bc +#################### +######################### # Tab bar colors -active_tab_foreground #181926 -active_tab_background #C6A0F6 -inactive_tab_foreground #CAD3F5 -inactive_tab_background #1E2030 -tab_bar_background #181926 +active_tab_foreground #C6E4F0 +active_tab_background #19323B +inactive_tab_foreground #C6E4F0 +inactive_tab_background #4E6872 +# tab_bar_background #{pit.toHex()} +# tab_bar_margin_color none +#################### -# Colors for marks (marked text in the terminal) -mark1_foreground #24273A -mark1_background #B7BDF8 -mark2_foreground #24273A -mark2_background #C6A0F6 -mark3_foreground #24273A -mark3_background #7DC4E4 +######################### +# window border colors and terminal bell colors +active_border_color #23DBC1 +inactive_border_color #4E6872 +bell_border_color #FF9F6F +# visual_bell_color none +#################### -# The 16 terminal colors +######################### +# The basic 16 colors +#: black +color0 #00040B +color8 #4E6872 -# black -color0 #494D64 -color8 #5B6078 +#: red +color1 #E8ADA9 +color9 #E8ADA9 -# red -color1 #ED8796 -color9 #ED8796 +#: green +color2 #98CCAC +color10 #98CCAC -# green -color2 #A6DA95 -color10 #A6DA95 +#: yellow +color3 #E1B392 +color11 #E1B392 -# yellow -color3 #EED49F -color11 #EED49F +#: blue +color4 #8CC8E0 +color12 #8CC8E0 -# blue -color4 #8AADF4 -color12 #8AADF4 +#: magenta +color5 #BEB6E8 +color13 #BEB6E8 -# magenta -color5 #F5BDE6 -color13 #F5BDE6 +#: cyan +color6 #23DBC1 +color14 #23DBC1 -# cyan -color6 #8BD5CA -color14 #8BD5CA - -# white -color7 #B8C0E0 -color15 #A5ADCB +#: white +color7 #C6E4F0 +color15 #C6E4F0 +#################### \ No newline at end of file diff --git a/mise.toml b/mise.toml new file mode 100644 index 0000000..7293bde --- /dev/null +++ b/mise.toml @@ -0,0 +1,2 @@ +[tools] +task = "3.45.4" diff --git a/mise/config.toml b/mise/config.toml deleted file mode 100644 index e0c32fd..0000000 --- a/mise/config.toml +++ /dev/null @@ -1,3 +0,0 @@ -[tools] -node = "20.17.0" -chezmoi = "2.52.1" diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 11a42c0..fea9b67 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,7 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "fb525166ccc30296fb3457441eb979113de46b00" }, "alpha-nvim": { "branch": "main", "commit": "a35468cd72645dbd52c0624ceead5f301c566dff" }, - "catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, @@ -38,7 +37,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "19d6211c78169e78bab372b585b6fb17ad974e82" }, "overseer.nvim": { "branch": "master", "commit": "72c68aab0358c92f451168b704c411c4a3e3410e" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "55ad4fb76ab68460f700599b7449385f0c4e858e" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "3277ad5f96eb03c9d618c88e24f683e4364e578c" }, "render-markdown.nvim": { "branch": "main", "commit": "0944ba04ea7fc9e9087c1dedc76562d6e0d110cf" }, "resession.nvim": { "branch": "master", "commit": "84c81e5fd8a94dc85a60b97089536174e558e288" }, "smear-cursor.nvim": { "branch": "main", "commit": "cf2f73a4d0b402edb8177d059ee1127e621b79a7" }, diff --git a/nvim/lua/config/autocmds.lua b/nvim/lua/config/autocmds.lua index 62622c8..918d0d6 100644 --- a/nvim/lua/config/autocmds.lua +++ b/nvim/lua/config/autocmds.lua @@ -1,12 +1,6 @@ local augroup = vim.api.nvim_create_augroup -- Create/get autocommand group local autocmd = vim.api.nvim_create_autocmd -- Create autocommand --- Remove whitespace on save -autocmd('BufWritePost', { - pattern = '', - command = "lua vim.notify('Save Successful')" -}) - -- Highlight on yank augroup('YankHighlight', { clear = true }) autocmd('TextYankPost', { diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua index 6f122af..5dffdc9 100644 --- a/nvim/lua/config/options.lua +++ b/nvim/lua/config/options.lua @@ -5,11 +5,8 @@ vim.g.maplocalleader = "\\" -- LazyVim auto format vim.g.autoformat = true --- Use pretty notifications -vim.notify = require("notify") - -- Set Theme -vim.cmd.colorscheme "catppuccin" +-- vim.cmd.colorscheme "catppuccin" -- Set Misc Options local opt = vim.opt diff --git a/nvim/lua/filetypes/markdown.lua b/nvim/lua/filetypes/markdown.lua index 674284e..a0761f6 100644 --- a/nvim/lua/filetypes/markdown.lua +++ b/nvim/lua/filetypes/markdown.lua @@ -1,7 +1,7 @@ return { 'MeanderingProgrammer/render-markdown.nvim', ft = { "markdown" }, - dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons + dependencies = { 'nvim-treesitter/nvim-treesitter'}, ---@module 'render-markdown' ---@type render.md.UserConfig opts = {}, diff --git a/nvim/lua/plugins/codestats.lua b/nvim/lua/plugins/codestats.lua index 1aba91a..b7f2e41 100644 --- a/nvim/lua/plugins/codestats.lua +++ b/nvim/lua/plugins/codestats.lua @@ -5,13 +5,13 @@ return { cmd = { "CodeStatsXpSend", "CodeStatsProfileUpdate" }, config = function() require("codestats").setup({ - username = "gaiety", -- needed to fetch profile data - base_url = "https://codestats.net", -- codestats.net base url - api_key = "", -- fill with your codestats machine API - send_on_exit = true, -- send xp on nvim exit - send_on_timer = true, -- send xp on timer - timer_interval = 60000, -- timer interval in milliseconds (minimum 1000ms to prevent DDoSing codestat.net servers) - curl_timeout = 5, -- curl request timeout in seconds + username = "gaiety", -- needed to fetch profile data + base_url = "https://codestats.net", -- codestats.net base url + api_key = "SFMyNTY.WjJGcFpYUjUjI01qSXhPVFU9.P5dSCW38Tr2S1o5cKqRAVlQfsTcU--po2dAE7PPj1Eo", -- fill with your codestats machine API + send_on_exit = true, -- send xp on nvim exit + send_on_timer = true, -- send xp on timer + timer_interval = 60000, -- timer interval in milliseconds (minimum 1000ms to prevent DDoSing codestat.net servers) + curl_timeout = 5, -- curl request timeout in seconds }) end, } diff --git a/nvim/lua/plugins/dash.lua b/nvim/lua/plugins/dash.lua index 3e27369..b48bc35 100644 --- a/nvim/lua/plugins/dash.lua +++ b/nvim/lua/plugins/dash.lua @@ -1,7 +1,5 @@ return { "goolord/alpha-nvim", - -- dependencies = { 'echasnovski/mini.icons' }, - dependencies = { 'nvim-tree/nvim-web-devicons' }, config = function() local startify = require("alpha.themes.startify") local dashboard = require("alpha.themes.dashboard") @@ -39,7 +37,6 @@ return { dashboard.button('SPC SPC', '󰱽 Find File'), dashboard.button('SPC /', '󱝩 Live Grep'), } - startify.file_icons.provider = "devicons" require("alpha").setup( dashboard.opts ) diff --git a/nvim/lua/plugins/indentguide.lua b/nvim/lua/plugins/indentguide.lua deleted file mode 100644 index b02a22f..0000000 --- a/nvim/lua/plugins/indentguide.lua +++ /dev/null @@ -1,40 +0,0 @@ -return { - { - "HiPhish/rainbow-delimiters.nvim", - }, - { - "lukas-reineke/indent-blankline.nvim", - main = "ibl", - ---@module "ibl" - ---@type ibl.config - opts = {}, - config = function() - local highlight = { - "RainbowRed", - "RainbowYellow", - "RainbowBlue", - "RainbowOrange", - "RainbowGreen", - "RainbowViolet", - "RainbowCyan", - } - local hooks = require "ibl.hooks" - -- create the highlight groups in the highlight setup hook, so they are reset - -- every time the colorscheme changes - hooks.register(hooks.type.HIGHLIGHT_SETUP, function() - vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" }) - vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" }) - vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" }) - vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" }) - vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" }) - vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" }) - vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" }) - end) - - vim.g.rainbow_delimiters = { highlight = highlight } - require("ibl").setup { scope = { highlight = highlight } } - - hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark) - end, - }, -} diff --git a/nvim/lua/plugins/notify.lua b/nvim/lua/plugins/notify.lua deleted file mode 100644 index 85c3bbc..0000000 --- a/nvim/lua/plugins/notify.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "rcarriga/nvim-notify", - name = "notify", - lazy = true, - config = function() - require("notify").setup({ - background_colour = "#7f849c" - }) - end, -} diff --git a/nvim/lua/plugins/statusline.lua b/nvim/lua/plugins/statusline.lua index 5d4ee28..60aaf15 100644 --- a/nvim/lua/plugins/statusline.lua +++ b/nvim/lua/plugins/statusline.lua @@ -1,6 +1,5 @@ return { 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, config = function() -- Bubbles config for lualine -- Author: lokesh-krishna diff --git a/nvim/lua/plugins/theme.lua b/nvim/lua/plugins/theme.lua deleted file mode 100644 index 2bd8927..0000000 --- a/nvim/lua/plugins/theme.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - "catppuccin/nvim", - lazy = true, - name = "catppuccin", - opts = { - flavour = "mocha", - integrations = { - cmp = true, - gitsigns = true, - treesitter = true, - barbar = true, - }, - transparent_background = true, -- disables setting the background color. - styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): - comments = { "italic" }, -- Change the style of comments - }, - } -} diff --git a/nvim/nvim b/nvim/nvim new file mode 120000 index 0000000..dc97487 --- /dev/null +++ b/nvim/nvim @@ -0,0 +1 @@ +/mnt/storage/repos/dotfiles/nvim \ No newline at end of file diff --git a/nvim/verdigris.vim b/nvim/verdigris.vim new file mode 100644 index 0000000..4bae984 --- /dev/null +++ b/nvim/verdigris.vim @@ -0,0 +1,52 @@ +"" +" verdigris v0.0.1 +" + +" URL: https://git.basking.monster/gaiety/verdigris/ports/neovim +" Author: Gaiety +" License: GPL-3.0-only +"" + +set background=dark +hi clear + +if exists("syntax_on") + syntax reset +endif +let g:colors_name="verdigris" + + +let Italic = "" +if exists('g:verdigris_italic') + let Italic = "italic" +endif +let g:verdigris_italic = get(g:, 'verdigris_italic', 0) + +let Bold = "" +if exists('g:verdigris_bold') + let Bold = "bold" +endif +let g:verdigris_bold = get(g:, 'verdigris_bold', 0) + +hi Conceal guifg=#4E6872 ctermfg=242 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi DiffAdd guifg=#98CCAC ctermfg=115 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi DiffChange guifg=#E1B392 ctermfg=180 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi DiffDelete guifg=#E8ADA9 ctermfg=181 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi ErrorMsg guifg=#E8ADA9 ctermfg=181 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpellBad guifg=#E8ADA9 ctermfg=181 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi WarningMsg guifg=#E1B392 ctermfg=180 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Comment guifg=#19323B ctermfg=236 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Constant guifg=#FF9F6F ctermfg=215 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi String guifg=#23DBC1 ctermfg=43 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Identifier guifg=#8CC8E0 ctermfg=116 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Statement guifg=#C6E4F0 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Exception guifg=#E8ADA9 ctermfg=181 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi PreProc guifg=#4E6872 ctermfg=242 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Type guifg=#E1B392 ctermfg=180 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Special guifg=#E1B392 ctermfg=180 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Ignore guifg=#4E6872 ctermfg=242 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Error guifg=#E8ADA9 ctermfg=181 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Todo guifg=#8CC8E0 ctermfg=116 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + + + diff --git a/setup.sh b/setup.sh new file mode 100644 index 0000000..99fc0b3 --- /dev/null +++ b/setup.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +echo Installing ZSH +sudo apt install zsh +chsh -s $(which zsh) +echo ZSH installed, log out then back in to have it be your default shell +echo then run this script again + +echo Installing mise +curl https://mise.run | sh +echo "eval \"\$(~/.local/bin/mise activate bash)\"" >> ~/.bashrc +source ~/.bashrc + +echo mise installed, restart your terminal then run this script again +mise doctor +mise trust + +sudo apt install kitty +sudo update-alternatives --config x-terminal-emulator +echo kitty installed, set it as your default terminal if you wish + +sudo apt install ranger +sudo update-alternatives --config xdg-open +echo ranger installed, set it as your default file manager if you wish + +sudo apt install mosh +echo mosh installed + +echo Finally, run 'task' whenever you are ready for the remaining setup diff --git a/starship.toml b/starship.toml deleted file mode 100644 index 2c1bc11..0000000 --- a/starship.toml +++ /dev/null @@ -1,279 +0,0 @@ -"$schema" = 'https://starship.rs/config-schema.json' - -format = """ -[](red)\ -$os\ -$username\ -[](bg:peach fg:red)\ -$directory\ -[](bg:yellow fg:peach)\ -$git_branch\ -$git_status\ -[](fg:yellow bg:green)\ -$c\ -$rust\ -$golang\ -$nodejs\ -$php\ -$java\ -$kotlin\ -$haskell\ -$python\ -[](fg:green bg:sapphire)\ -$conda\ -[](fg:sapphire bg:lavender)\ -$time\ -[ ](fg:lavender)\ -$cmd_duration\ -$line_break\ -$character""" - -palette = 'catppuccin_mocha' - -[os] -disabled = false -style = "bg:red fg:crust" - -[os.symbols] -Windows = "" -Ubuntu = "󰕈" -SUSE = "" -Raspbian = "󰐿" -Mint = "󰣭" -Macos = "󰀵" -Manjaro = "" -Linux = "󰌽" -Gentoo = "󰣨" -Fedora = "󰣛" -Alpine = "" -Amazon = "" -Android = "" -Arch = "󰣇" -Artix = "󰣇" -CentOS = "" -Debian = "󰣚" -Redhat = "󱄛" -RedHatEnterprise = "󱄛" - -[username] -show_always = true -style_user = "bg:red fg:crust" -style_root = "bg:red fg:crust" -format = '[ $user]($style)' - -[directory] -style = "bg:peach fg:crust" -format = "[ $path ]($style)" -truncation_length = 3 -truncation_symbol = "…/" - -[directory.substitutions] -"Documents" = "󰈙 " -"Downloads" = " " -"Music" = "󰝚 " -"Pictures" = " " -"Developer" = "󰲋 " - -[git_branch] -symbol = "" -style = "bg:yellow" -format = '[[ $symbol $branch ](fg:crust bg:yellow)]($style)' - -[git_status] -style = "bg:yellow" -format = '[[($all_status$ahead_behind )](fg:crust bg:yellow)]($style)' - -[nodejs] -symbol = "" -style = "bg:green" -format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)' - -[c] -symbol = " " -style = "bg:green" -format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)' - -[rust] -symbol = "" -style = "bg:green" -format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)' - -[golang] -symbol = "" -style = "bg:green" -format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)' - -[php] -symbol = "" -style = "bg:green" -format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)' - -[java] -symbol = " " -style = "bg:green" -format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)' - -[kotlin] -symbol = "" -style = "bg:green" -format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)' - -[haskell] -symbol = "" -style = "bg:green" -format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)' - -[python] -symbol = "" -style = "bg:green" -format = '[[ $symbol( $version)(\(#$virtualenv\)) ](fg:crust bg:green)]($style)' - -[docker_context] -symbol = "" -style = "bg:sapphire" -format = '[[ $symbol( $context) ](fg:crust bg:sapphire)]($style)' - -[conda] -symbol = "  " -style = "fg:crust bg:sapphire" -format = '[$symbol$environment ]($style)' -ignore_base = false - -[time] -disabled = false -use_12hr = true -time_format = "%R" -style = "bg:lavender" -format = '[[  $time ](fg:crust bg:lavender)]($style)' - -[line_break] -disabled = false - -[character] -disabled = false -success_symbol = '[❯](bold fg:green)' -error_symbol = '[❯](bold fg:red)' -vimcmd_symbol = '[❮](bold fg:green)' -vimcmd_replace_one_symbol = '[❮](bold fg:lavender)' -vimcmd_replace_symbol = '[❮](bold fg:lavender)' -vimcmd_visual_symbol = '[❮](bold fg:yellow)' - -[cmd_duration] -show_milliseconds = true -format = " in $duration " -style = "bg:lavender" -disabled = false -show_notifications = true -min_time_to_notify = 45000 - -[palettes.catppuccin_mocha] -rosewater = "#f5e0dc" -flamingo = "#f2cdcd" -pink = "#f5c2e7" -mauve = "#cba6f7" -red = "#f38ba8" -maroon = "#eba0ac" -peach = "#fab387" -yellow = "#f9e2af" -green = "#a6e3a1" -teal = "#94e2d5" -sky = "#89dceb" -sapphire = "#74c7ec" -blue = "#89b4fa" -lavender = "#b4befe" -text = "#cdd6f4" -subtext1 = "#bac2de" -subtext0 = "#a6adc8" -overlay2 = "#9399b2" -overlay1 = "#7f849c" -overlay0 = "#6c7086" -surface2 = "#585b70" -surface1 = "#45475a" -surface0 = "#313244" -base = "#1e1e2e" -mantle = "#181825" -crust = "#11111b" - -[palettes.catppuccin_frappe] -rosewater = "#f2d5cf" -flamingo = "#eebebe" -pink = "#f4b8e4" -mauve = "#ca9ee6" -red = "#e78284" -maroon = "#ea999c" -peach = "#ef9f76" -yellow = "#e5c890" -green = "#a6d189" -teal = "#81c8be" -sky = "#99d1db" -sapphire = "#85c1dc" -blue = "#8caaee" -lavender = "#babbf1" -text = "#c6d0f5" -subtext1 = "#b5bfe2" -subtext0 = "#a5adce" -overlay2 = "#949cbb" -overlay1 = "#838ba7" -overlay0 = "#737994" -surface2 = "#626880" -surface1 = "#51576d" -surface0 = "#414559" -base = "#303446" -mantle = "#292c3c" -crust = "#232634" - -[palettes.catppuccin_latte] -rosewater = "#dc8a78" -flamingo = "#dd7878" -pink = "#ea76cb" -mauve = "#8839ef" -red = "#d20f39" -maroon = "#e64553" -peach = "#fe640b" -yellow = "#df8e1d" -green = "#40a02b" -teal = "#179299" -sky = "#04a5e5" -sapphire = "#209fb5" -blue = "#1e66f5" -lavender = "#7287fd" -text = "#4c4f69" -subtext1 = "#5c5f77" -subtext0 = "#6c6f85" -overlay2 = "#7c7f93" -overlay1 = "#8c8fa1" -overlay0 = "#9ca0b0" -surface2 = "#acb0be" -surface1 = "#bcc0cc" -surface0 = "#ccd0da" -base = "#eff1f5" -mantle = "#e6e9ef" -crust = "#dce0e8" - -[palettes.catppuccin_macchiato] -rosewater = "#f4dbd6" -flamingo = "#f0c6c6" -pink = "#f5bde6" -mauve = "#c6a0f6" -red = "#ed8796" -maroon = "#ee99a0" -peach = "#f5a97f" -yellow = "#eed49f" -green = "#a6da95" -teal = "#8bd5ca" -sky = "#91d7e3" -sapphire = "#7dc4e4" -blue = "#8aadf4" -lavender = "#b7bdf8" -text = "#cad3f5" -subtext1 = "#b8c0e0" -subtext0 = "#a5adcb" -overlay2 = "#939ab7" -overlay1 = "#8087a2" -overlay0 = "#6e738d" -surface2 = "#5b6078" -surface1 = "#494d64" -surface0 = "#363a4f" -base = "#24273a" -mantle = "#1e2030" -crust = "#181926" diff --git a/zellij/config.kdl b/zellij/config.kdl deleted file mode 100644 index 5835517..0000000 --- a/zellij/config.kdl +++ /dev/null @@ -1,140 +0,0 @@ -simplified_ui true -pane_frames false -default_layout "default" - -ui { - pane_frames { - hide_session_name true - rounded_corners true - } -} - -keybinds { - normal { - // uncomment this and adjust key if using copy_on_select=false - // bind "Alt c" { Copy; } - } - resize { - bind "Ctrl n" { SwitchToMode "Normal"; } - bind "h" "Left" { Resize "Increase Left"; } - bind "j" "Down" { Resize "Increase Down"; } - bind "k" "Up" { Resize "Increase Up"; } - bind "l" "Right" { Resize "Increase Right"; } - bind "H" { Resize "Decrease Left"; } - bind "J" { Resize "Decrease Down"; } - bind "K" { Resize "Decrease Up"; } - bind "L" { Resize "Decrease Right"; } - bind "=" "+" { Resize "Increase"; } - bind "-" { Resize "Decrease"; } - } - pane { - bind "Ctrl p" { SwitchToMode "Normal"; } - bind "h" "Left" { MoveFocus "Left"; } - bind "l" "Right" { MoveFocus "Right"; } - bind "j" "Down" { MoveFocus "Down"; } - bind "k" "Up" { MoveFocus "Up"; } - bind "p" { SwitchFocus; } - bind "n" { NewPane; SwitchToMode "Normal"; } - bind "d" { NewPane "Down"; SwitchToMode "Normal"; } - bind "r" { NewPane "Right"; SwitchToMode "Normal"; } - bind "x" { CloseFocus; SwitchToMode "Normal"; } - bind "f" { ToggleFocusFullscreen; SwitchToMode "Normal"; } - bind "z" { TogglePaneFrames; SwitchToMode "Normal"; } - bind "w" { ToggleFloatingPanes; SwitchToMode "Normal"; } - bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "Normal"; } - bind "c" { SwitchToMode "RenamePane"; PaneNameInput 0;} - } - move { - bind "Ctrl h" { SwitchToMode "Normal"; } - bind "n" "Tab" { MovePane; } - bind "p" { MovePaneBackwards; } - bind "h" "Left" { MovePane "Left"; } - bind "j" "Down" { MovePane "Down"; } - bind "k" "Up" { MovePane "Up"; } - bind "l" "Right" { MovePane "Right"; } - } - tab { - bind "Ctrl t" { SwitchToMode "Normal"; } - bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; } - bind "h" "Left" "Up" "k" { GoToPreviousTab; } - bind "l" "Right" "Down" "j" { GoToNextTab; } - bind "n" { NewTab; SwitchToMode "Normal"; } - bind "x" { CloseTab; SwitchToMode "Normal"; } - bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; } - bind "b" { BreakPane; SwitchToMode "Normal"; } - bind "]" { BreakPaneRight; SwitchToMode "Normal"; } - bind "[" { BreakPaneLeft; SwitchToMode "Normal"; } - bind "1" { GoToTab 1; SwitchToMode "Normal"; } - bind "2" { GoToTab 2; SwitchToMode "Normal"; } - bind "3" { GoToTab 3; SwitchToMode "Normal"; } - bind "4" { GoToTab 4; SwitchToMode "Normal"; } - bind "5" { GoToTab 5; SwitchToMode "Normal"; } - bind "6" { GoToTab 6; SwitchToMode "Normal"; } - bind "7" { GoToTab 7; SwitchToMode "Normal"; } - bind "8" { GoToTab 8; SwitchToMode "Normal"; } - bind "9" { GoToTab 9; SwitchToMode "Normal"; } - bind "Tab" { ToggleTab; } - } - scroll { - bind "Ctrl s" { SwitchToMode "Normal"; } - bind "e" { EditScrollback; SwitchToMode "Normal"; } - bind "s" { SwitchToMode "EnterSearch"; SearchInput 0; } - bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; } - bind "j" "Down" { ScrollDown; } - bind "k" "Up" { ScrollUp; } - bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; } - bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; } - bind "d" { HalfPageScrollDown; } - bind "u" { HalfPageScrollUp; } - // uncomment this and adjust key if using copy_on_select=false - // bind "Alt c" { Copy; } - } - search { - bind "Ctrl s" { SwitchToMode "Normal"; } - bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; } - bind "j" "Down" { ScrollDown; } - bind "k" "Up" { ScrollUp; } - bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; } - bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; } - bind "d" { HalfPageScrollDown; } - bind "u" { HalfPageScrollUp; } - bind "n" { Search "down"; } - bind "p" { Search "up"; } - bind "c" { SearchToggleOption "CaseSensitivity"; } - bind "w" { SearchToggleOption "Wrap"; } - bind "o" { SearchToggleOption "WholeWord"; } - } - entersearch { - bind "Ctrl c" "Esc" { SwitchToMode "Scroll"; } - bind "Enter" { SwitchToMode "Search"; } - } - renametab { - bind "Ctrl c" { SwitchToMode "Normal"; } - bind "Esc" { UndoRenameTab; SwitchToMode "Tab"; } - } - renamepane { - bind "Ctrl c" { SwitchToMode "Normal"; } - bind "Esc" { UndoRenamePane; SwitchToMode "Pane"; } - } - session { - bind "Ctrl o" { SwitchToMode "Normal"; } - bind "Ctrl s" { SwitchToMode "Scroll"; } - bind "d" { Detach; } - bind "w" { - LaunchOrFocusPlugin "zellij:session-manager" { - floating true - move_to_focused_tab true - }; - SwitchToMode "Normal" - } - } -} - -plugins { - tab-bar { path "tab-bar"; } - status-bar { path "status-bar"; } - strider { path "strider"; } - compact-bar { path "compact-bar"; } -} - -theme "catppuccin-mocha" diff --git a/zellij/layouts/default.kdl b/zellij/layouts/default.kdl deleted file mode 100644 index 04f4595..0000000 --- a/zellij/layouts/default.kdl +++ /dev/null @@ -1,6 +0,0 @@ -layout { - pane size=1 borderless=true { - plugin location="zellij:compact-bar" - } - pane -} diff --git a/zellij/themes/catppuccin.kdl b/zellij/themes/catppuccin.kdl deleted file mode 100644 index f87e3bc..0000000 --- a/zellij/themes/catppuccin.kdl +++ /dev/null @@ -1,61 +0,0 @@ -// Catppuccin Theme: -// https://github.com/catppuccin/catppuccin - -themes { - catppuccin-latte { - bg "#acb0be" // Surface2 - fg "#acb0be" // Surface2 - red "#d20f39" - green "#40a02b" - blue "#1e66f5" - yellow "#df8e1d" - magenta "#ea76cb" // Pink - orange "#fe640b" // Peach - cyan "#04a5e5" // Sky - black "#dce0e8" // Crust - white "#4c4f69" // Text - } - - catppuccin-frappe { - bg "#626880" // Surface2 - fg "#c6d0f5" - red "#e78284" - green "#a6d189" - blue "#8caaee" - yellow "#e5c890" - magenta "#f4b8e4" // Pink - orange "#ef9f76" // Peach - cyan "#99d1db" // Sky - black "#292c3c" // Mantle - white "#c6d0f5" - } - - catppuccin-macchiato { - bg "#5b6078" // Surface2 - fg "#cad3f5" - red "#ed8796" - green "#a6da95" - blue "#8aadf4" - yellow "#eed49f" - magenta "#f5bde6" // Pink - orange "#f5a97f" // Peach - cyan "#91d7e3" // Sky - black "#1e2030" // Mantle - white "#cad3f5" - } - - catppuccin-mocha { - bg "#585b70" // Surface2 - fg "#cdd6f4" - red "#f38ba8" - green "#a6e3a1" - blue "#89b4fa" - yellow "#f9e2af" - magenta "#f5c2e7" // Pink - orange "#fab387" // Peach - cyan "#89dceb" // Sky - black "#181825" // Mantle - white "#cdd6f4" - } -} -