From 63cdd79c7d6187f9fcb67a03a9fdd653f8b85671 Mon Sep 17 00:00:00 2001 From: William Ball Date: Thu, 31 Jul 2025 21:08:08 -0700 Subject: [PATCH] back to fish --- fish/.config/fish/config.fish | 6 ++-- fish/.config/fish/fish_plugins | 1 + fish/.config/fish/fish_variables | 53 ++++++++++++++++---------------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 12400cd..aa3a9d9 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -42,18 +42,20 @@ set -x MANPAGER "less -R --use-color -Dd+r -Du+b" set -x EDITOR nvim set -x VISUAL nvim set -x TERM xterm-256color -set -x BROWSER firefox +set -x BROWSER librewolf set -x MOZ_ENABLE_WAYLAND 1 set -x ELECTRON_OZONE_PLATFORM_HINT auto set -x GDK_BACKEND wayland +set -x BEMENU_OPTS '--ignorecase --fb "#1e1e2e" --ff "#cdd6f4" --nb "#1e1e2e" --nf "#cdd6f4" --tb "#1e1e2e" --hb "#1e1e2e" --tf "#f5c2e7" --hf "#f9e2af" --af "#cdd6f4" --ab "#1e1e2e" --fn "Iosevka Nerd Font 16" --no-overlap --wrap' + set -x LESSHISTFILE - set -x INPUTRC $HOME/.config/readline/inputrc set -x HISTFILE $XDG_CACHE_HOME/bash/history set -x XDG_DATA_HOME $HOME/.local/share set -x CARGO_HOME $XDG_DATA_HOME/cargo -set -x GNUPGHOME $XDG_DATA_HOME/gnupg +# set -x GNUPGHOME $XDG_DATA_HOME/gnupg set -x GPG_TTY (tty) set -x STACK_XDG 1 set -x GHCUP_USE_XDG_DIRS true diff --git a/fish/.config/fish/fish_plugins b/fish/.config/fish/fish_plugins index 15c8c9b..08afdc3 100644 --- a/fish/.config/fish/fish_plugins +++ b/fish/.config/fish/fish_plugins @@ -1,3 +1,4 @@ jorgebucaran/fisher jethrokuan/z patrickf1/fzf.fish +catppuccin/fish diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables index a90c876..9e6933c 100644 --- a/fish/.config/fish/fish_variables +++ b/fish/.config/fish/fish_variables @@ -10,48 +10,49 @@ SETUVAR Z_DATA:/home/wball/\x2elocal/share/z/data SETUVAR Z_DATA_DIR:/home/wball/\x2elocal/share/z SETUVAR Z_EXCLUDE:\x5e/home/wball\x24 SETUVAR __fish_initialized:3800 +SETUVAR _fisher_catppuccin_2F_fish_files:\x7e/\x2econfig/fish/themes/Catppuccin\x20Frappe\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Latte\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Macchiato\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Mocha\x2etheme SETUVAR _fisher_jethrokuan_2F_z_files:\x7e/\x2econfig/fish/functions/__z\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_add\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_clean\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_complete\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/z\x2efish SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish SETUVAR _fisher_patrickf1_2F_fzf_2E_fish_files:\x7e/\x2econfig/fish/functions/_fzf_configure_bindings_help\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_extract_var_info\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_changed_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_diff_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_file_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_directory\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_log\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_status\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_history\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_processes\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_variables\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_wrapper\x2efish\x1e\x7e/\x2econfig/fish/functions/fzf_configure_bindings\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fzf\x2efish\x1e\x7e/\x2econfig/fish/completions/fzf_configure_bindings\x2efish -SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejethrokuan/z\x1epatrickf1/fzf\x2efish +SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejethrokuan/z\x1epatrickf1/fzf\x2efish\x1ecatppuccin/fish SETUVAR _fisher_upgraded_to_4_4:\x1d -SETUVAR fish_color_autosuggestion:8e908c -SETUVAR fish_color_cancel:\x2d\x2dreverse -SETUVAR fish_color_command:8959a8 -SETUVAR fish_color_comment:eab700 -SETUVAR fish_color_cwd:green +SETUVAR fish_color_autosuggestion:6c7086 +SETUVAR fish_color_cancel:f38ba8 +SETUVAR fish_color_command:89b4fa +SETUVAR fish_color_comment:7f849c +SETUVAR fish_color_cwd:f9e2af SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:8959a8 -SETUVAR fish_color_error:c82829 -SETUVAR fish_color_escape:00a6b2 +SETUVAR fish_color_end:fab387 +SETUVAR fish_color_error:f38ba8 +SETUVAR fish_color_escape:eba0ac SETUVAR fish_color_gray:6c7086 SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:\x1d -SETUVAR fish_color_keyword:\x1d +SETUVAR fish_color_host:89b4fa +SETUVAR fish_color_host_remote:a6e3a1 +SETUVAR fish_color_keyword:f38ba8 SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:00a6b2 -SETUVAR fish_color_option:\x1d -SETUVAR fish_color_param:4271ae -SETUVAR fish_color_quote:718c00 -SETUVAR fish_color_redirection:3e999f -SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_normal:cdd6f4 +SETUVAR fish_color_operator:f5c2e7 +SETUVAR fish_color_option:a6e3a1 +SETUVAR fish_color_param:f2cdcd +SETUVAR fish_color_quote:a6e3a1 +SETUVAR fish_color_redirection:f5c2e7 +SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d313244 +SETUVAR fish_color_selection:\x2d\x2dbackground\x3d313244 SETUVAR fish_color_status:f38ba8 -SETUVAR fish_color_user:brgreen +SETUVAR fish_color_user:94e2d5 SETUVAR fish_color_valid_path:\x2d\x2dunderline SETUVAR fish_key_bindings:fish_hybrid_key_bindings SETUVAR fish_pager_color_background:\x1d -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:B3A06D -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_completion:cdd6f4 +SETUVAR fish_pager_color_description:6c7086 +SETUVAR fish_pager_color_prefix:f5c2e7 +SETUVAR fish_pager_color_progress:6c7086 SETUVAR fish_pager_color_secondary_background:\x1d SETUVAR fish_pager_color_secondary_completion:\x1d SETUVAR fish_pager_color_secondary_description:\x1d SETUVAR fish_pager_color_secondary_prefix:\x1d -SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dbrblack +SETUVAR fish_pager_color_selected_background:\x1d SETUVAR fish_pager_color_selected_completion:\x1d SETUVAR fish_pager_color_selected_description:\x1d SETUVAR fish_pager_color_selected_prefix:\x1d