From 48ec97775bf461b1e81a5eabad4e8fbbb0a47834 Mon Sep 17 00:00:00 2001 From: William Ball Date: Sun, 6 Oct 2024 16:40:04 -0700 Subject: [PATCH] fish stuff --- fish/.config/fish/conf.d/rustup.fish | 1 + fish/.config/fish/config.fish | 9 ---- fish/.config/fish/fish_plugins | 1 - fish/.config/fish/fish_variables | 54 +++++++++---------- fish/.config/fish/functions/fisher.fish | 6 +-- .../fish/themes/Catppuccin Frappe.theme | 30 ----------- .../fish/themes/Catppuccin Latte.theme | 30 ----------- .../fish/themes/Catppuccin Macchiato.theme | 30 ----------- .../fish/themes/Catppuccin Mocha.theme | 30 ----------- 9 files changed, 31 insertions(+), 160 deletions(-) delete mode 100644 fish/.config/fish/themes/Catppuccin Frappe.theme delete mode 100644 fish/.config/fish/themes/Catppuccin Latte.theme delete mode 100644 fish/.config/fish/themes/Catppuccin Macchiato.theme delete mode 100644 fish/.config/fish/themes/Catppuccin Mocha.theme diff --git a/fish/.config/fish/conf.d/rustup.fish b/fish/.config/fish/conf.d/rustup.fish index 45aa295..31b9323 100644 --- a/fish/.config/fish/conf.d/rustup.fish +++ b/fish/.config/fish/conf.d/rustup.fish @@ -1 +1,2 @@ . "/home/wball/.local/share/cargo/env.fish" +source "/home/wball/.local/share/cargo/env.fish" diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 0c78b18..24d5fd1 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -67,12 +67,3 @@ end eval (opam env --switch=default) set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME ; set -gx PATH $HOME/.cabal/bin $PATH /home/wball/.local/bin # ghcup-env - -# >>> JVM installed by coursier >>> -set -gx JAVA_HOME "/home/wball/.cache/coursier/arc/https/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%252B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz/jdk-11.0.24+8" -set -gx PATH "$PATH:/home/wball/.cache/coursier/arc/https/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%252B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz/jdk-11.0.24+8/bin" -# <<< JVM installed by coursier <<< - -# >>> coursier install directory >>> -set -gx PATH "$PATH:/home/wball/.local/share/coursier/bin" -# <<< coursier install directory <<< diff --git a/fish/.config/fish/fish_plugins b/fish/.config/fish/fish_plugins index 08afdc3..15c8c9b 100644 --- a/fish/.config/fish/fish_plugins +++ b/fish/.config/fish/fish_plugins @@ -1,4 +1,3 @@ jorgebucaran/fisher jethrokuan/z patrickf1/fzf.fish -catppuccin/fish diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables index 09ca98c..278bd76 100644 --- a/fish/.config/fish/fish_variables +++ b/fish/.config/fish/fish_variables @@ -7,48 +7,48 @@ 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:3400 -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\x1ecatppuccin/fish +SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejethrokuan/z\x1epatrickf1/fzf\x2efish SETUVAR _fisher_upgraded_to_4_4:\x1d -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_autosuggestion:brblack +SETUVAR fish_color_cancel:\x2d\x2dreverse +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:fab387 -SETUVAR fish_color_error:f38ba8 -SETUVAR fish_color_escape:eba0ac +SETUVAR fish_color_end:green +SETUVAR fish_color_error:brred +SETUVAR fish_color_escape:brcyan SETUVAR fish_color_gray:6c7086 SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:89b4fa -SETUVAR fish_color_host_remote:a6e3a1 -SETUVAR fish_color_keyword:f38ba8 -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_host:normal +SETUVAR fish_color_host_remote:\x1d +SETUVAR fish_color_keyword:\x1d +SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue +SETUVAR fish_color_normal:normal +SETUVAR fish_color_operator:brcyan +SETUVAR fish_color_option:\x1d +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:f38ba8 -SETUVAR fish_color_user:94e2d5 +SETUVAR fish_color_user:brgreen 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:cdd6f4 -SETUVAR fish_pager_color_description:6c7086 -SETUVAR fish_pager_color_prefix:f5c2e7 -SETUVAR fish_pager_color_progress:6c7086 +SETUVAR fish_pager_color_completion:normal +SETUVAR fish_pager_color_description:yellow\x1e\x2d\x2ditalics +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_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:\x1d +SETUVAR fish_pager_color_selected_background:\x2d\x2dreverse SETUVAR fish_pager_color_selected_completion:\x1d SETUVAR fish_pager_color_selected_description:\x1d SETUVAR fish_pager_color_selected_prefix:\x1d diff --git a/fish/.config/fish/functions/fisher.fish b/fish/.config/fish/functions/fisher.fish index b1513d3..e915cb8 100644 --- a/fish/.config/fish/functions/fisher.fish +++ b/fish/.config/fish/functions/fisher.fish @@ -1,6 +1,6 @@ function fisher --argument-names cmd --description "A plugin manager for Fish" set --query fisher_path || set --local fisher_path $__fish_config_dir - set --local fisher_version 4.4.4 + set --local fisher_version 4.4.5 set --local fish_plugins $__fish_config_dir/fish_plugins switch "$cmd" @@ -29,7 +29,7 @@ function fisher --argument-names cmd --description "A plugin manager for Fish" set --local old_plugins $_fisher_plugins set --local new_plugins - test -e $fish_plugins && set --local file_plugins (string match --regex -- '^[^\s]+$' <$fish_plugins) + test -e $fish_plugins && set --local file_plugins (string match --regex -- '^[^\s]+$' <$fish_plugins | string replace -- \~ ~) if ! set --query argv[2] if test "$cmd" != update @@ -206,7 +206,7 @@ function fisher --argument-names cmd --description "A plugin manager for Fish" contains -- (string lower -- $plugin) (string lower -- $commit_plugins) || set --append commit_plugins $plugin end - printf "%s\n" $commit_plugins >$fish_plugins + string replace --regex -- $HOME \~ $commit_plugins >$fish_plugins else set --erase _fisher_plugins command rm -f $fish_plugins diff --git a/fish/.config/fish/themes/Catppuccin Frappe.theme b/fish/.config/fish/themes/Catppuccin Frappe.theme deleted file mode 100644 index b4c1994..0000000 --- a/fish/.config/fish/themes/Catppuccin Frappe.theme +++ /dev/null @@ -1,30 +0,0 @@ -# name: 'Catppuccin Frappé' -# url: 'https://github.com/catppuccin/fish' -# preferred_background: 303446 - -fish_color_normal c6d0f5 -fish_color_command 8caaee -fish_color_param eebebe -fish_color_keyword e78284 -fish_color_quote a6d189 -fish_color_redirection f4b8e4 -fish_color_end ef9f76 -fish_color_comment 838ba7 -fish_color_error e78284 -fish_color_gray 737994 -fish_color_selection --background=414559 -fish_color_search_match --background=414559 -fish_color_option a6d189 -fish_color_operator f4b8e4 -fish_color_escape ea999c -fish_color_autosuggestion 737994 -fish_color_cancel e78284 -fish_color_cwd e5c890 -fish_color_user 81c8be -fish_color_host 8caaee -fish_color_host_remote a6d189 -fish_color_status e78284 -fish_pager_color_progress 737994 -fish_pager_color_prefix f4b8e4 -fish_pager_color_completion c6d0f5 -fish_pager_color_description 737994 \ No newline at end of file diff --git a/fish/.config/fish/themes/Catppuccin Latte.theme b/fish/.config/fish/themes/Catppuccin Latte.theme deleted file mode 100644 index 002dace..0000000 --- a/fish/.config/fish/themes/Catppuccin Latte.theme +++ /dev/null @@ -1,30 +0,0 @@ -# name: 'Catppuccin Latte' -# url: 'https://github.com/catppuccin/fish' -# preferred_background: eff1f5 - -fish_color_normal 4c4f69 -fish_color_command 1e66f5 -fish_color_param dd7878 -fish_color_keyword d20f39 -fish_color_quote 40a02b -fish_color_redirection ea76cb -fish_color_end fe640b -fish_color_comment 8c8fa1 -fish_color_error d20f39 -fish_color_gray 9ca0b0 -fish_color_selection --background=ccd0da -fish_color_search_match --background=ccd0da -fish_color_option 40a02b -fish_color_operator ea76cb -fish_color_escape e64553 -fish_color_autosuggestion 9ca0b0 -fish_color_cancel d20f39 -fish_color_cwd df8e1d -fish_color_user 179299 -fish_color_host 1e66f5 -fish_color_host_remote 40a02b -fish_color_status d20f39 -fish_pager_color_progress 9ca0b0 -fish_pager_color_prefix ea76cb -fish_pager_color_completion 4c4f69 -fish_pager_color_description 9ca0b0 \ No newline at end of file diff --git a/fish/.config/fish/themes/Catppuccin Macchiato.theme b/fish/.config/fish/themes/Catppuccin Macchiato.theme deleted file mode 100644 index c8be912..0000000 --- a/fish/.config/fish/themes/Catppuccin Macchiato.theme +++ /dev/null @@ -1,30 +0,0 @@ -# name: 'Catppuccin Macchiato' -# url: 'https://github.com/catppuccin/fish' -# preferred_background: 24273a - -fish_color_normal cad3f5 -fish_color_command 8aadf4 -fish_color_param f0c6c6 -fish_color_keyword ed8796 -fish_color_quote a6da95 -fish_color_redirection f5bde6 -fish_color_end f5a97f -fish_color_comment 8087a2 -fish_color_error ed8796 -fish_color_gray 6e738d -fish_color_selection --background=363a4f -fish_color_search_match --background=363a4f -fish_color_option a6da95 -fish_color_operator f5bde6 -fish_color_escape ee99a0 -fish_color_autosuggestion 6e738d -fish_color_cancel ed8796 -fish_color_cwd eed49f -fish_color_user 8bd5ca -fish_color_host 8aadf4 -fish_color_host_remote a6da95 -fish_color_status ed8796 -fish_pager_color_progress 6e738d -fish_pager_color_prefix f5bde6 -fish_pager_color_completion cad3f5 -fish_pager_color_description 6e738d \ No newline at end of file diff --git a/fish/.config/fish/themes/Catppuccin Mocha.theme b/fish/.config/fish/themes/Catppuccin Mocha.theme deleted file mode 100644 index 892a000..0000000 --- a/fish/.config/fish/themes/Catppuccin Mocha.theme +++ /dev/null @@ -1,30 +0,0 @@ -# name: 'Catppuccin Mocha' -# url: 'https://github.com/catppuccin/fish' -# preferred_background: 1e1e2e - -fish_color_normal cdd6f4 -fish_color_command 89b4fa -fish_color_param f2cdcd -fish_color_keyword f38ba8 -fish_color_quote a6e3a1 -fish_color_redirection f5c2e7 -fish_color_end fab387 -fish_color_comment 7f849c -fish_color_error f38ba8 -fish_color_gray 6c7086 -fish_color_selection --background=313244 -fish_color_search_match --background=313244 -fish_color_option a6e3a1 -fish_color_operator f5c2e7 -fish_color_escape eba0ac -fish_color_autosuggestion 6c7086 -fish_color_cancel f38ba8 -fish_color_cwd f9e2af -fish_color_user 94e2d5 -fish_color_host 89b4fa -fish_color_host_remote a6e3a1 -fish_color_status f38ba8 -fish_pager_color_progress 6c7086 -fish_pager_color_prefix f5c2e7 -fish_pager_color_completion cdd6f4 -fish_pager_color_description 6c7086 \ No newline at end of file