Merge pull request 'feat(config): refactor config.fish, add XDG compliance, new functions, and keybindings' (#8) from feat/config-refactor-and-new-functions into main

Reviewed-on: #8

README.md

@@ -541,9 +541,6 @@ Use this file for paths and variables that are specific to one machine — thing
 ```fish
 # ~/.config/.user-dots/fish/local.fish
 
-# Project root for quick cd
-set -gx cdp /home/youruser/projects
-
 # CDPATH — directories searched by cd
 set -gx CDPATH . /home/youruser/projects /home/youruser
 

conf.d/abbr.fish

@@ -73,6 +73,7 @@ abbr -a g git
 abbr -a ag antigravity
 abbr -a ag. antigravity .
 # Quit
+abbr -a /exit exit
 if test "$TERM" = xterm-kitty
     abbr -a :q kitty @ close-window # Kitty (Closes the active split/pane)
     abbr -a :Q kitty @ close-tab # Kitty (Closes the whole tab)

conf.d/key_bindings.fish

@@ -36,6 +36,14 @@
 # If the current command text is empty, the previous command's first token will be used instead.
 # ──────────────────────────────────────────────────────────────────────
 
+# ────────────── Bind Quick Qalc Evaluation to Ctrl+Alt+= ──────────────
+# Passes the current command line buffer to the Qalculate! CLI (qalc)
+#
+# Example: If you type `150 * 1.08` and press Ctrl+Alt+=, 
+# it will print the result (162) and clear the command line.
+# This allows for rapid-fire math without leaving the current shell.
+# ──────────────────────────────────────────────────────────────────────
+
 function fish_user_key_bindings
 
     #   ───────────────────────────── Set Bindings ─────────────────────────────
@@ -44,6 +52,7 @@ function fish_user_key_bindings
     bind ctrl-g __insert_previous_path_head
     bind ctrl-f __interactive_history_sub
     bind ctrl-alt-u _replace_command_token
+    bind ctrl-alt-= qalc_eval
 
     # Set bindings for all Vi modes:
     # 'default' is Vi-Command, 'insert' is Vi-Insert, 'visual' is Vi-Visual
@@ -51,5 +60,6 @@ function fish_user_key_bindings
         bind --mode $mode ctrl-g __insert_previous_path_head
         bind --mode $mode ctrl-f __interactive_history_sub
         bind --mode $mode ctrl-alt-u _replace_command_token
+        bind --mode $mode ctrl-alt-= qalc_eval
     end
 end

conf.d/theme.fish

@@ -4,10 +4,9 @@
 #          ╭──────────────────────────────────────────────────────────╮
 #          │                       Fish Theme                         │
 #          ╰──────────────────────────────────────────────────────────╯
-#
+# Catppuccin Mocha
-# Catppuccin Mocha syntax highlighting colors.
-# These variables were migrated from the universal scope to global scope.
 
+#   ────────────────────── Syntax highlighting colors ──────────────────────
 set --global fish_color_autosuggestion 6c7086
 set --global fish_color_cancel f38ba8
 set --global fish_color_command 89b4fa
@@ -47,3 +46,11 @@ set --global fish_pager_color_selected_background
 set --global fish_pager_color_selected_completion
 set --global fish_pager_color_selected_description
 set --global fish_pager_color_selected_prefix
+
+#   ─────────────────────────── FZF theme colors ───────────────────────────
+set -Ux FZF_DEFAULT_OPTS "\
+--color=bg+:#313244,bg:#1E1E2E,spinner:#F5E0DC,hl:#F38BA8 \
+--color=fg:#CDD6F4,header:#F38BA8,info:#CBA6F7,pointer:#F5E0DC \
+--color=marker:#B4BEFE,fg+:#CDD6F4,prompt:#CBA6F7,hl+:#F38BA8 \
+--color=selected-bg:#45475A \
+--color=border:#6C7086,label:#CDD6F4"

config.fish

@@ -17,6 +17,72 @@ if test -f /usr/share/cachyos-fish-config/cachyos-config.fish
 end
 set --erase _fname
 
+#   ───────────────────────────── XDG variables ────────────────────────────
+# XDG Base Directory variables (standard practice)
+set -gx XDG_CONFIG_HOME $HOME/.config # Sets default config dir to ~/.config
+set -gx XDG_CACHE_HOME $HOME/.cache # Sets default cache dir to ~/.cache
+set -gx XDG_DATA_HOME $HOME/.local/share # Sets default data dir to ~/.local/share
+set -gx XDG_STATE_HOME $HOME/.local/state # Sets default state dir to ~/.local/state
+
+# Attempt to keep various config/cache files out of the home directory root
+set -gx RANDFILE "$XDG_STATE_HOME/rnd"
+set -gx WGETRC "$XDG_CONFIG_HOME/wget/wgetrc"
+set -gx WGET_HSTS_FILE "$XDG_CACHE_HOME/wget-hsts"
+set -gx NPM_CONFIG_PREFIX "$XDG_DATA_HOME/npm-global"
+set -gx NPM_CONFIG_USERCONFIG "$XDG_CONFIG_HOME/npm/npmrc"
+set -gx ANDROID_USER_HOME "$XDG_DATA_HOME/android"
+set -gx CARGO_HOME "$XDG_DATA_HOME/cargo"
+set -gx RUSTUP_HOME "$XDG_DATA_HOME/rustup"
+set -gx GOPATH "$XDG_DATA_HOME/go"
+set -gx BUN_INSTALL "$XDG_DATA_HOME/bun"
+set -gx GNUPGHOME "$XDG_CONFIG_HOME/gnupg"
+set -gx WAKATIME_HOME "$XDG_CONFIG_HOME/wakatime"
+set -gx HISTFILE "$XDG_STATE_HOME/bash_history"
+set -gx EXINIT "set viminfofile=$XDG_STATE_HOME/vim/viminfo | source $MYVIMRC"
+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"
+
+#   ─────────────────────────── 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,
+#   while still preferring nvim if it's installed.
+if type -q nvim
+    set -gx NVIM_APPNAME nvim
+    set -gx EDITOR (command -s nvim)
+else
+    set -gx EDITOR (command -s vi)
+end
+set -gx VISUAL $EDITOR
+set -gx SUDO_EDITOR $EDITOR
+
+#   ──────────────────────────── GPG variables ─────────────────────────────
+#   Helps ensure that GPG can prompt for passphrases correctly when invoked from the terminal.
+set -gx GPG_TTY (tty)
+
+#   ──────────────────────────── PATH variables ────────────────────────────
+#   Adds common user bin directories to the PATH. The -mg --move option for cargo ensures that
+#   the cargo bin directory is moved to the end of the PATH, which can help avoid conflicts
+#   with system-installed Rust tools while still allowing user-installed cargo binaries to be found.
+fish_add_path $HOME/.local/bin
+fish_add_path $HOME/Applications
+fish_add_path $HOME/scripts
+fish_add_path -mg --move $CARGO_HOME/bin
+fish_add_path $BUN_INSTALL/bin
+fish_add_path $XDG_DATA_HOME/npm-global/bin
+fish_add_path $HOME/.lmstudio/bin
+
+#   ───────────────────────── CDPATH projects dir ──────────────────────────
+# Allows cd-ing to directories within $HOME/projects or $HOME without needing to specify the full path.
+# For example, if you have a project at $HOME/projects/myproject,
+# you can simply run 'cd myproject' from anywhere and it will take you there.
+# 'cd' command prioritizes directories in CDPATH, so if you have a directory with
+# the same name in both $HOME/projects and $HOME, it will take you to the one in $HOME/projects first.
+# Additionally, directories inside the CWD will still take precedence over CDPATH,
+# so if you have a directory named 'myproject' in the current directory,
+# running 'cd myproject' will take you there instead of $HOME/projects/myproject.
+set -gx CDPATH . $HOME/projects $HOME
+
 #   ──────────────────────────── Bootstrap Fisher ──────────────────────────
 if not type -q fisher
     echo "Fisher plugin manager not found."
@@ -32,106 +98,68 @@ if not type -q fisher
     set --erase _fisher_reply
 end
 
-#   ───────────────────────── Source user secrets ──────────────────────────
+#   ─────────────────────── visual/interactive setup ───────────────────────
-if test -f $HOME/.config/.user-dots/fish/secrets.fish
+# Run only if we're in an interactive session (not a script or non-interactive shell)
-    source $HOME/.config/.user-dots/fish/secrets.fish
+if status is-interactive
-end
+    #   ────────────────────────────── Key bindings ────────────────────────────
+    #   Helps ensure that key bindings are consistent with the Vi editing mode set below.
+    #   This is optional but can improve the user experience for those who prefer Vi-style key bindings.
+    set -g fish_key_bindings fish_vi_key_bindings
 
-#   ─────────────────────── Source machine-local config ─────────────────────
+    #   ──────────────────────── Source FZF integration ────────────────────────
-if test -f $HOME/.config/.user-dots/fish/local.fish
+    #   Sources the FZF integration script, which provides enhanced command history
-    source $HOME/.config/.user-dots/fish/local.fish
+    #   searching and file finding capabilities.
-end
+    if test -f $HOME/.config/fish/integrations/fzf.fish
-
+        source $HOME/.config/fish/integrations/fzf.fish
-#   ──────────────────────────── PATH variables ────────────────────────────
-fish_add_path ~/.local/bin
-fish_add_path ~/Applications
-fish_add_path ~/scripts
-fish_add_path -mg --move ~/.cargo/bin
-fish_add_path ~/.npm-global/bin
-fish_add_path ~/.lmstudio/bin
-
-#   ─────────────────────────── Editor variables ───────────────────────────
-if command -v nvim >/dev/null
-    set -gx EDITOR (command -s nvim)
-else
-    set -gx EDITOR (command -s vi)
-end
-set -gx VISUAL $EDITOR
-set -gx SUDO_EDITOR $EDITOR
-
-#   ──────────────────────────── GPG variables ─────────────────────────────
-set -gx GPG_TTY (tty)
-
-#   ────────────────────────────── Key bindings ────────────────────────────
-set -g fish_key_bindings fish_vi_key_bindings
-
-#   ──────────────────────── Source FZF integration ────────────────────────
-source ~/.config/fish/integrations/fzf.fish
-# Configure FZF theme
-set -Ux FZF_DEFAULT_OPTS "\
---color=bg+:#313244,bg:#1E1E2E,spinner:#F5E0DC,hl:#F38BA8 \
---color=fg:#CDD6F4,header:#F38BA8,info:#CBA6F7,pointer:#F5E0DC \
---color=marker:#B4BEFE,fg+:#CDD6F4,prompt:#CBA6F7,hl+:#F38BA8 \
---color=selected-bg:#45475A \
---color=border:#6C7086,label:#CDD6F4"
-
-#   ──────────────────────────────── DirENV ────────────────────────────────
-# Tool to handle automatic environment loading in directories and their children
-# Use when children need to load venv as well.
-#
-# The Auto-Venv script above will ignore directories with a
-# .envrc file (direnv configuration) to prevent conflicts.
-if type -q direnv
-    direnv hook fish | source
-end
-
-#   ────────────────────────────── Auto-Venv ───────────────────────────────
-# Auto-activate Python venv on directory change
-function __auto_source_fallback_venv --on-variable PWD
-    status --is-command-substitution; and return
-
-    # 1. Skip if direnv is already managing this directory
-    if set -q DIRENV_DIR; or test -e ".envrc"
-        return
     end
 
-    # 2. If we are already in a venv, check if we've left its tree
+    #   ──────────────────────────────── DirENV ────────────────────────────────
-    if set -q VIRTUAL_ENV
+    # Tool to handle automatic environment loading in directories and their children
-        # Check if the current PWD is still within the directory that owns the venv
+    # Use when children need to load venv as well.
-        # (Assuming the venv is at the root of the project)
+    #
-        set -l venv_root (string replace -r '/.venv$' '' $VIRTUAL_ENV)
+    # The Auto-Venv script above will ignore directories with a
-        if not string match -q "$venv_root*" "$PWD"
+    # .envrc file (direnv configuration) to prevent conflicts.
-            type -q deactivate; and deactivate
+    if type -q direnv
-        end
+        direnv hook fish | source
-        return
     end
 
-    # 3. Only source the venv if we aren't already in one
+    #   Helps ensure that Claude Code's terminal output is clean and doesn't have flickering issues.
-    if test -e ".venv/bin/activate.fish"
+    set -gx CLAUDE_CODE_NO_FLICKER 1
-        source .venv/bin/activate.fish
+
+    #   ─────────────────────────── Starship prompt ────────────────────────────
+    #   Initializes the Starship prompt, which provides a highly customizable and informative command prompt.
+    #   This is wrapped in a check to ensure that it only runs if Starship is installed,
+    #   preventing errors if it's not available.
+    if type -q starship
+        # STARSHIP_START
+        starship init fish | source
+        # STARSHIP_END
     end
+
+    #   ╭────────────────────────────── OVERRIDES ─────────────────────────────╮
+    #   |       Run these last so they can override any previous settings.     |
+    #   |    This is useful for machine-specific behavior or configurations.   |
+    #   ╰────────────────────────────── OVERRIDES ─────────────────────────────╯
+    #   ───────────────────────── 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
+    end
+
+    #   ─────────────────────── Source machine-local config ────────────────────
+    #   Sources a local.fish file if it exists, which can be used for machine-specific
+    #   variables and configurations that shouldn't be shared across machines.
+    #   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
+    end
+    #    ╭──────────────────────────── END OVERRIDES ──────────────────────────╮
+    #    |                        End of override section.                     |
+    #    ╰──────────────────────────── END OVERRIDES ──────────────────────────╯
 end
-
-#   ──────────────────── Docker Contexts for LazyDocker ────────────────────
-function ld --description 'Run lazydocker on the current Docker context'
-    # Fetch the host endpoint of the currently active Docker context
-    set -l current_host (docker context inspect --format '{{.Endpoints.docker.Host}}')
-
-    # Run lazydocker with the DOCKER_HOST variable set for this command only
-    env DOCKER_HOST=$current_host lazydocker
-end
-
-#   ────────────────────── Claude Code Env Variables ───────────────────────
-set -gx CLAUDE_CODE_NO_FLICKER 1
-
-#   ───────────────────── Directory shortcut variables ─────────────────────
-set -U cdp ~/projects
-
-#   ───────────────────────── CDPATH projects dir ──────────────────────────
-# Allows cd-ing to projects automatically from anywhere
-set -U CDPATH . ~/projects ~
-
-#   ─────────────────────────── Starship prompt ────────────────────────────
-# STARSHIP_START
-starship init fish | source
-# STARSHIP_END

functions/__auto_source_fallback_venv.fish

@@ -0,0 +1,27 @@
+# Copyright (C) 2026 Rootiest
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+function __auto_source_fallback_venv --on-variable PWD
+    status --is-command-substitution; and return
+    
+    # 1. Skip if direnv is already managing this directory
+    if set -q DIRENV_DIR; or test -e ".envrc"
+        return
+    end
+    
+    # 2. If we are already in a venv, check if we've left its tree
+        if set -q VIRTUAL_ENV
+                # Check if the current PWD is still within the directory that owns the venv
+                # (Assuming the venv is at the root of the project)
+                set -l venv_root (string replace -r '/.venv$' '' $VIRTUAL_ENV)
+                if not string match -q "$venv_root*" "$PWD"
+                        type -q deactivate; and deactivate
+                end
+                return
+        end
+    
+        # 3. Only source the venv if we aren't already in one
+    if test -e ".venv/bin/activate.fish"
+        source .venv/bin/activate.fish
+    end
+end

functions/bash.fish

@@ -4,6 +4,6 @@
 # bash switches to bash shell
 function bash --wraps='bash' --description 'bash switches to bash shell'
     set SHELL $(which bash) # Set shell to bash
-    command bash $argv # run bash
+    command bash --rcfile "$XDG_CONFIG_HOME/bash/bashrc" $argv # Run bash
     set SHELL $(which fish) # Reset shell
 end

functions/cat.fish

@@ -1,8 +1,18 @@
 # Copyright (C) 2026 Rootiest
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-# alias cat=bat
+function cat --wraps='bat' --description 'Use bat for files and ls for directories'
-function cat --wraps='bat' --description 'alias cat=bat'
+    # If no arguments are provided, cat usually waits for stdin. 
+    # We'll maintain that behavior by skipping the directory check if $argv is empty.
+    if set -q argv[1]
+        if test -d $argv[1]
+            # If it's a directory, run your custom ls function
+            ls $argv
+            return
+        end
+    end
+
+    # Fallback to bat or standard cat
     if type -q bat
         bat --plain --no-pager $argv
     else

functions/joplin.fish

@@ -0,0 +1,13 @@
+# Copyright (C) 2026 Rootiest
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# Run joplin CLI without Node deprecation warnings
+function joplin --description 'Run Joplin CLI without Node deprecation warnings'
+    set -l joplin_path (command -v joplin)
+    if test -n "$joplin_path"
+        NODE_OPTIONS="--no-deprecation" $joplin_path $argv
+    else
+        echo "Error: joplin binary not found in PATH" >&2
+        return 1
+    end
+end

functions/ld.fish

@@ -0,0 +1,10 @@
+# Copyright (C) 2026 Rootiest
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+function ld --description 'Run lazydocker on the current Docker context'
+    # Fetch the host endpoint of the currently active Docker context
+    set -l current_host (docker context inspect --format '{{.Endpoints.docker.Host}}')
+
+    # Run lazydocker with the DOCKER_HOST variable set for this command only
+    env DOCKER_HOST=$current_host lazydocker
+end

functions/qalc_eval.fish

@@ -0,0 +1,19 @@
+# Copyright (C) 2026 Rootiest
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+function qalc_eval
+    # Get the current command line buffer
+    set -l cmd (commandline)
+
+    # If the buffer isn't empty, run it through qalc
+    if test -n "$cmd"
+        echo
+        # Passes the buffer to qalc
+        # -t (terse) is optional, remove it if you want the full verbose output
+        echo "$cmd" | qalc
+
+        # Clear the command line for the next task
+        commandline -r ""
+        commandline -f repaint
+    end
+end