rootiest/fish-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: rootiest/fish-config:9f524694cbc656f637c87e38899508113503aabb
Branches Tags
rootiest/fish-config:main
...
compare: rootiest/fish-config:4dff7632cd56bdf3f7afe6f48f2e4f4ccbb72a5e
Branches Tags
rootiest/fish-config:main

2 Commits
9f524694cb ... 4dff7632cd

Author SHA1 Message Date
rootiest 4dff7632cd Merge pull request 'refactor(config): use $__fish_config_dir, quote paths, add dot_fish var' (#11) from refactor/config-path-quoting-portability into main 
Reviewed-on: #11
 2026-05-08 20:30:02 +00:00
rootiest f70dccdc65 refactor(config): use \$__fish_config_dir, quote paths, add dot_fish var 
Replace hardcoded \$HOME/.config/fish paths with the canonical
\$__fish_config_dir variable for portability. Add proper quoting around
all path strings. Introduce a dot_fish local variable to reduce
repetition in user-dots sourcing blocks. Add LESS=-R for color support
in the pager.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-08 16:29:05 -04:00
1 changed files with 13 additions and 7 deletions
Expand all files Collapse all files
config.fish
+13 -7
View File
@@ -12,7 +12,7 @@ if test -f /usr/share/cachyos-fish-config/cachyos-config.fish
# Erase them and immediately source our versions. # Erase them and immediately source our versions.
for _fname in ls lt cleanup for _fname in ls lt cleanup
functions --erase $_fname functions --erase $_fname
source $__fish_config_dir/functions/$_fname.fish source "$__fish_config_dir/functions/$_fname.fish"
end end
end end
set --erase _fname set --erase _fname
@@ -43,6 +43,9 @@ set -gx NVIDIA_SETTINGS_RW_CONFIG_FILE "$XDG_CONFIG_HOME/nvidia/settings"
set -gx CODEIUM_HOME "$XDG_CONFIG_HOME/codeium" set -gx CODEIUM_HOME "$XDG_CONFIG_HOME/codeium"
set -gx WORDLIST "$XDG_CONFIG_HOME/hunspell_en_US" set -gx WORDLIST "$XDG_CONFIG_HOME/hunspell_en_US"
# ───────────────────── Misc Configuration variables ─────────────────────
set -gx LESS -R # Ensures colors render correctly in less pager
# ─────────────────────────── Editor variables ─────────────────────────── # ─────────────────────────── Editor variables ───────────────────────────
# Set Editor variables with fallback to vi if nvim isn't available. This ensures that # Set Editor variables with fallback to vi if nvim isn't available. This ensures that
# tools that rely on these variables (like git commit messages) will work out of the box, # tools that rely on these variables (like git commit messages) will work out of the box,
@@ -109,8 +112,8 @@ if status is-interactive
# ──────────────────────── Source FZF integration ──────────────────────── # ──────────────────────── Source FZF integration ────────────────────────
# Sources the FZF integration script, which provides enhanced command history # Sources the FZF integration script, which provides enhanced command history
# searching and file finding capabilities. # searching and file finding capabilities.
if test -f $HOME/.config/fish/integrations/fzf.fish if test -f "$__fish_config_dir/integrations/fzf.fish"
source $HOME/.config/fish/integrations/fzf.fish source "$__fish_config_dir/integrations/fzf.fish"
end end
# ──────────────────────────────── DirENV ──────────────────────────────── # ──────────────────────────────── DirENV ────────────────────────────────
@@ -140,14 +143,17 @@ if status is-interactive
# | Run these last so they can override any previous settings. | # | Run these last so they can override any previous settings. |
# | This is useful for machine-specific behavior or configurations. | # | This is useful for machine-specific behavior or configurations. |
# ╰────────────────────────────── OVERRIDES ─────────────────────────────╯ # ╰────────────────────────────── OVERRIDES ─────────────────────────────╯
#
# Define user-dots path variable for a more legible secrets/local config.
set -l dot_fish "$XDG_CONFIG_HOME/.user-dots/fish"
# ───────────────────────── Source user secrets ────────────────────────── # ───────────────────────── Source user secrets ──────────────────────────
# Sources a secrets.fish file if it exists, which can be used to store # Sources a secrets.fish file if it exists, which can be used to store
# sensitive environment variables and configurations that shouldn't be # sensitive environment variables and configurations that shouldn't be
# committed to version control. # committed to version control.
# This allows you to keep things like API keys, database credentials, # This allows you to keep things like API keys, database credentials,
# and other secrets out of your main config files and safely ignored by git. # and other secrets out of your main config files and safely ignored by git.
if test -f $HOME/.config/.user-dots/fish/secrets.fish if test -f "$dot_fish/secrets.fish"
source $HOME/.config/.user-dots/fish/secrets.fish source "$dot_fish/secrets.fish"
end end
# ─────────────────────── Source machine-local config ──────────────────── # ─────────────────────── Source machine-local config ────────────────────
@@ -156,8 +162,8 @@ if status is-interactive
# This allows you to have different settings on different machines without affecting # This allows you to have different settings on different machines without affecting
# your main config or secrets files. For example, you might want different PATH additions, # your main config or secrets files. For example, you might want different PATH additions,
# aliases, or environment variables on your work laptop vs. your home desktop. # aliases, or environment variables on your work laptop vs. your home desktop.
if test -f $HOME/.config/.user-dots/fish/local.fish if test -f "$dot_fish/local.fish"
source $HOME/.config/.user-dots/fish/local.fish source "$dot_fish/local.fish"
end end
# ╭──────────────────────────── END OVERRIDES ──────────────────────────╮ # ╭──────────────────────────── END OVERRIDES ──────────────────────────╮
# | End of override section. | # | End of override section. |