From f70dccdc6582daaa398c8d8222616d3d61246c6f Mon Sep 17 00:00:00 2001
From: rootiest <chris@rootiest.com>
Date: Fri, 8 May 2026 16:29:05 -0400
Subject: [PATCH] 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>
---
 config.fish | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/config.fish b/config.fish
index 4adfc2d..d799324 100644
--- a/config.fish
+++ b/config.fish
@@ -12,7 +12,7 @@ if test -f /usr/share/cachyos-fish-config/cachyos-config.fish
     # Erase them and immediately source our versions.
     for _fname in ls lt cleanup
         functions --erase $_fname
-        source $__fish_config_dir/functions/$_fname.fish
+        source "$__fish_config_dir/functions/$_fname.fish"
     end
 end
 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 WORDLIST "$XDG_CONFIG_HOME/hunspell_en_US"
 
+#   ───────────────────── Misc Configuration variables ─────────────────────
+set -gx LESS -R # Ensures colors render correctly in less pager
+
 #   ─────────────────────────── Editor variables ───────────────────────────
 #   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,
@@ -109,8 +112,8 @@ if status is-interactive
     #   ──────────────────────── Source FZF integration ────────────────────────
     #   Sources the FZF integration script, which provides enhanced command history
     #   searching and file finding capabilities.
-    if test -f $HOME/.config/fish/integrations/fzf.fish
-        source $HOME/.config/fish/integrations/fzf.fish
+    if test -f "$__fish_config_dir/integrations/fzf.fish"
+        source "$__fish_config_dir/integrations/fzf.fish"
     end
 
     #   ──────────────────────────────── DirENV ────────────────────────────────
@@ -140,14 +143,17 @@ if status is-interactive
     #   |       Run these last so they can override any previous settings.     |
     #   |    This is useful for machine-specific behavior or configurations.   |
     #   ╰────────────────────────────── 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 ──────────────────────────
     #   Sources a secrets.fish file if it exists, which can be used to store
     #   sensitive environment variables and configurations that shouldn't be
     #   committed to version control.
     #   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.
-    if test -f $HOME/.config/.user-dots/fish/secrets.fish
-        source $HOME/.config/.user-dots/fish/secrets.fish
+    if test -f "$dot_fish/secrets.fish"
+        source "$dot_fish/secrets.fish"
     end
 
     #   ─────────────────────── Source machine-local config ────────────────────
@@ -156,8 +162,8 @@ if status is-interactive
     #   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,
     #   aliases, or environment variables on your work laptop vs. your home desktop.
-    if test -f $HOME/.config/.user-dots/fish/local.fish
-        source $HOME/.config/.user-dots/fish/local.fish
+    if test -f "$dot_fish/local.fish"
+        source "$dot_fish/local.fish"
     end
     #    ╭──────────────────────────── END OVERRIDES ──────────────────────────╮
     #    |                        End of override section.                     |
-- 
2.52.0