From 3f6b86fcb48d243a743cc6e4e684d9d6496c09b2 Mon Sep 17 00:00:00 2001 From: Amolith Date: Sun, 9 Nov 2025 12:46:29 -0700 Subject: [PATCH] chore(fish): use -x instead of -gx, add fundle --- dot_config/private_fish/config.fish.tmpl | 118 ++++++++++++----------- dot_config/private_fish/fish_plugins | 6 -- 2 files changed, 63 insertions(+), 61 deletions(-) delete mode 100644 dot_config/private_fish/fish_plugins diff --git a/dot_config/private_fish/config.fish.tmpl b/dot_config/private_fish/config.fish.tmpl index 8debf3fab0e0902553eb4f3cb8be8b7da901011b..2cf2e8d781a3a232b1a3f07d49b18a9f2fccdef9 100644 --- a/dot_config/private_fish/config.fish.tmpl +++ b/dot_config/private_fish/config.fish.tmpl @@ -1,38 +1,38 @@ -set -gx BAT_THEME "ansi" -set -gx DFT_BACKGROUND "light" +set -x BAT_THEME "ansi" +set -x DFT_BACKGROUND "light" # XDG variables -set -gx XDG_DATA_HOME "$HOME/.local/share" -set -gx XDG_CONFIG_HOME "$HOME/.config" -set -gx XDG_STATE_HOME "$HOME/.local/state" -set -gx XDG_CACHE_HOME "$HOME/.cache" -set -gx XDG_BIN_HOME "$HOME/.local/bin" -set -gx XDG_BIN_DIR $XDG_BIN_HOME +set -x XDG_DATA_HOME "$HOME/.local/share" +set -x XDG_CONFIG_HOME "$HOME/.config" +set -x XDG_STATE_HOME "$HOME/.local/state" +set -x XDG_CACHE_HOME "$HOME/.cache" +set -x XDG_BIN_HOME "$HOME/.local/bin" +set -x XDG_BIN_DIR $XDG_BIN_HOME # Moving dotfiles around -set -gx WINEPREFIX "$XDG_DATA_HOME"/wine -set -gx WORKON_HOME "$XDG_DATA_HOME/virtualenvs" -set -gx SQLITE_HISTORY "$XDG_CACHE_HOME"/sqlite_history -set -gx BUNDLE_USER_CONFIG "$XDG_CONFIG_HOME"/bundle -set -gx BUNDLE_USER_CACHE "$XDG_CACHE_HOME"/bundle -set -gx BUNDLE_USER_PLUGIN "$XDG_DATA_HOME"/bundle -set -gx NUGET_PACKAGES "$XDG_CACHE_HOME"/NuGetPackages -set -gx DVDCSS_CACHE "$XDG_DATA_HOME"/dvdcss -set -gx KDEHOME "$XDG_CONFIG_HOME"/kde -set -gx GOPATH "$XDG_DATA_HOME"/go -set -gx ZIM_HOME "$XDG_CONFIG_HOME"/.zim -set -gx GHCUP_USE_XDG_DIRS "ishouldjustbeabletoexportthisnotsetit" -set -gx NODE_PATH "$XDG_DATA_HOME/npm-packages/lib/node_modules" -set -gx CARGO_HOME "$XDG_DATA_HOME"/cargo -set -gx ASDF_DATA_DIR "$XDG_DATA_HOME/asdf" +set -x WINEPREFIX "$XDG_DATA_HOME"/wine +set -x WORKON_HOME "$XDG_DATA_HOME/virtualenvs" +set -x SQLITE_HISTORY "$XDG_CACHE_HOME"/sqlite_history +set -x BUNDLE_USER_CONFIG "$XDG_CONFIG_HOME"/bundle +set -x BUNDLE_USER_CACHE "$XDG_CACHE_HOME"/bundle +set -x BUNDLE_USER_PLUGIN "$XDG_DATA_HOME"/bundle +set -x NUGET_PACKAGES "$XDG_CACHE_HOME"/NuGetPackages +set -x DVDCSS_CACHE "$XDG_DATA_HOME"/dvdcss +set -x KDEHOME "$XDG_CONFIG_HOME"/kde +set -x GOPATH "$XDG_DATA_HOME"/go +set -x ZIM_HOME "$XDG_CONFIG_HOME"/.zim +set -x GHCUP_USE_XDG_DIRS "ishouldjustbeabletoexportthisnotsetit" +set -x NODE_PATH "$XDG_DATA_HOME/npm-packages/lib/node_modules" +set -x CARGO_HOME "$XDG_DATA_HOME"/cargo +set -x ASDF_DATA_DIR "$XDG_DATA_HOME/asdf" # Ruby crap rbenv init - | source fish_add_path "$HOME/.rbenv/versions/3.2.2/bin" # Android crap -set -gx ANDROID_HOME "$XDG_DATA_HOME/Android" -set -gx ANDROID_SDK_ROOT "$ANDROID_HOME" +set -x ANDROID_HOME "$XDG_DATA_HOME/Android" +set -x ANDROID_SDK_ROOT "$ANDROID_HOME" fish_add_path "$ANDROID_HOME/cmdline-tools/latest/bin" fish_add_path "$ANDROID_HOME/platform-tools" fish_add_path "$ANDROID_HOME/emulator" @@ -50,55 +50,55 @@ fish_add_path "$XDG_CACHE_HOME/.bun/bin" # Additional preferences {{ if eq .chezmoi.hostname "sidhe" }} -set -gx EDITOR "zed --wait" +set -x EDITOR "zed --wait" {{ else }} -set -gx EDITOR "zeditor --wait" +set -x EDITOR "zeditor --wait" {{ end }} -set -gx VISUAL "$EDITOR" -set -gx MANPAGER "nvim +Man!" -set -gx COLUMNS 80 -set -gx MANWIDTH 80 -set -gx CHARM_HOST "charm.secluded.site" -set -gx RIPGREP_CONFIG_PATH "$HOME/.config/ripgreprc" -set -gx RANGER_LOAD_DEFAULT_RC false +set -x VISUAL "$EDITOR" +set -x MANPAGER "nvim +Man!" +set -x COLUMNS 80 +set -x MANWIDTH 80 +set -x CHARM_HOST "charm.secluded.site" +set -x RIPGREP_CONFIG_PATH "$HOME/.config/ripgreprc" +set -x RANGER_LOAD_DEFAULT_RC false # Disable dumb Python keyring integration -set -gx PYTHON_KEYRING_BACKEND "keyring.backends.null.Keyring" +set -x PYTHON_KEYRING_BACKEND "keyring.backends.null.Keyring" -set -gx UV_PUBLISH_TOKEN '{{ onepasswordRead "op://Private/PyPI/uv angmar" }}' +set -x UV_PUBLISH_TOKEN '{{ onepasswordRead "op://Private/PyPI/uv angmar" }}' # Authenticate to local Radicle (.xyz) node {{ if eq .chezmoi.hostname "angmar" }} -set -gx RAD_PASSWORD '{{ onepasswordRead "op://Private/2ujzijel6ni3np2uj5k5syptzm/angmar" }}' +set -x RAD_PASSWORD '{{ onepasswordRead "op://Private/2ujzijel6ni3np2uj5k5syptzm/angmar" }}' {{ end }} {{ if eq .chezmoi.hostname "sidhe" }} -set -gx RAD_PASSWORD '{{ onepasswordRead "op://Private/2ujzijel6ni3np2uj5k5syptzm/sidhe" }}' +set -x RAD_PASSWORD '{{ onepasswordRead "op://Private/2ujzijel6ni3np2uj5k5syptzm/sidhe" }}' {{ end }} # Auth to SourceHut -set -gx SRHT_TOKEN '{{ onepasswordRead "op://Private/SourceHut/token" }}' +set -x SRHT_TOKEN '{{ onepasswordRead "op://Private/SourceHut/token" }}' -set -gx GITHUB_AUTH_TOKEN '{{ onepasswordRead "op://Private/github.com/pac" }}' +set -x GITHUB_AUTH_TOKEN '{{ onepasswordRead "op://Private/github.com/pac" }}' -set -gx JIRA_API_TOKEN '{{ onepasswordRead "op://Private/Atlassian/jira key" }}' -set -gx KAGI_API_KEY '{{ onepasswordRead "op://Shared/Kagi/api_key" }}' +set -x JIRA_API_TOKEN '{{ onepasswordRead "op://Private/Atlassian/jira key" }}' +set -x KAGI_API_KEY '{{ onepasswordRead "op://Shared/Kagi/api_key" }}' # LLM Crap -set -gx OPENROUTER_API_KEY '{{ onepasswordRead "op://Shared/OpenRouter/keys/shell" }}' -set -gx OPENROUTER_KEY "$OPENROUTER_API_KEY" -set -gx PARALLEL_API_KEY '{{ onepasswordRead "op://Private/Parallel.ai/api key" }}' -set -gx PERPLEXITY_API_KEY '{{ onepasswordRead "op://Private/nkhcb2h2ecfh26hksdgpw5txfu/api keys/CLI" }}' -set -gx PERPLEXITY_LENSES '{{ onepasswordRead "op://Private/nkhcb2h2ecfh26hksdgpw5txfu/lenses/text" }}' -set -gx SYNTHETIC_API_KEY '{{ onepasswordRead "op://Private/Synthetic/keys/main" }}' -set -gx MINIMAX_API_KEY '{{ onepasswordRead "op://Private/MiniMax/api_key" }}' -set -gx OLLAMA_HOST '100.108.156.33:11434' +set -x OPENROUTER_API_KEY '{{ onepasswordRead "op://Shared/OpenRouter/keys/shell" }}' +set -x OPENROUTER_KEY "$OPENROUTER_API_KEY" +set -x PARALLEL_API_KEY '{{ onepasswordRead "op://Private/Parallel.ai/api key" }}' +set -x PERPLEXITY_API_KEY '{{ onepasswordRead "op://Private/nkhcb2h2ecfh26hksdgpw5txfu/api keys/CLI" }}' +set -x PERPLEXITY_LENSES '{{ onepasswordRead "op://Private/nkhcb2h2ecfh26hksdgpw5txfu/lenses/text" }}' +set -x SYNTHETIC_API_KEY '{{ onepasswordRead "op://Private/Synthetic/keys/main" }}' +set -x MINIMAX_API_KEY '{{ onepasswordRead "op://Private/MiniMax/api_key" }}' +set -x OLLAMA_HOST '100.108.156.33:11434' # PATHs fish_add_path "$XDG_DATA_HOME/npm-packages/bin" # Guix -set -gx GUIX_LOCPATH "$HOME/.guix-profile/lib/locale" -set -gx GUIX_PROFILE "$HOME/.guix-profile" +set -x GUIX_LOCPATH "$HOME/.guix-profile/lib/locale" +set -x GUIX_PROFILE "$HOME/.guix-profile" fish_add_path "$GUIX_PROFILE/bin" # ASDF configuration @@ -110,7 +110,16 @@ end set -U fish_greeting +# Fundle plugins +fundle plugin 'jethrokuan/z' +fundle plugin 'patrickf1/fzf.fish' +fundle plugin 'franciscolourenco/done' +fundle plugin 'agentsh' --url 'git@git.secluded.site:agentsh.git' +fundle init + if status is-interactive + if not functions -q fundle; eval (curl -sfL https://git.io/fundle-install); end + {{ if ne .chezmoi.hostname "sidhe" }} alias zed="zeditor" {{ end }} @@ -135,14 +144,13 @@ if status is-interactive alias soft="ssh git.secluded.site" alias g="git" - scheme set tomorrow starship init fish | source atuin init --disable-up-arrow fish | source enable_transience end if status is-login - set -q SSH_AUTH_SOCK; or set -gx SSH_AUTH_SOCK "$XDG_RUNTIME_DIR/ssh-agent.socket" + set -q SSH_AUTH_SOCK; or set -x SSH_AUTH_SOCK "$XDG_RUNTIME_DIR/ssh-agent.socket" ssh-add -l > /dev/null 2>&1 if test $status -ne 0 eval (ssh-agent -c -a "$SSH_AUTH_SOCK" > /dev/null) @@ -153,6 +161,6 @@ end # Do not use fish_add_path (added in Fish 3.2) because it # potentially changes the order of items in PATH if not contains $_asdf_shims $PATH - set -gx --prepend PATH $_asdf_shims + set -x --prepend PATH $_asdf_shims end set --erase _asdf_shims diff --git a/dot_config/private_fish/fish_plugins b/dot_config/private_fish/fish_plugins deleted file mode 100644 index b5ea50d34fa282715a5b7a69b82e6f21eac75a43..0000000000000000000000000000000000000000 --- a/dot_config/private_fish/fish_plugins +++ /dev/null @@ -1,6 +0,0 @@ -jorgebucaran/fisher -jethrokuan/z -patrickf1/fzf.fish -franciscolourenco/done -realiserad/fish-ai -h-matsuo/fish-color-scheme-switcher