README.md

@@ -45,9 +45,10 @@ This config layers on top of the CachyOS base Fish configuration and adds:
 ├── conf.d/               # Auto-sourced configuration fragments
 │   ├── abbr.fish         # All abbreviations
 │   ├── cheat.fish        # cheat.sh completions
+│   ├── key_bindings.fish # Custom key bindings
 │   ├── fzf.fish          # FZF key binding initialization
-│   ├── keybindings.fish  # Custom key bindings
 │   ├── tailscale.fish    # Tailscale CLI completions
+│   ├── theme.fish        # Theme syntax highlighting colors
 │   ├── wakatime.fish     # WakaTime shell hook
 │   └── zoxide.fish       # Zoxide z/zi aliases
 ├── functions/            # Custom functions (one per file)
@@ -100,17 +101,7 @@ FZF is themed to Catppuccin Mocha with the following colors set via `FZF_DEFAULT
 - Foreground: `#CDD6F4`
 - Highlights: `#F38BA8` (red), `#CBA6F7` (mauve), `#B4BEFE` (lavender)
 
-**Key bindings** (from `fzf.fish`):
-
-| Binding | Action |
-|---|---|
-| `Ctrl+R` | Search command history |
-| `Ctrl+F` | Search directory files |
-| `Ctrl+Alt+F` | Search git-tracked files |
-| `Ctrl+Alt+L` | Search git log |
-| `Ctrl+Alt+S` | Search git status |
-| `Ctrl+V` | Search shell variables |
-| `Ctrl+Alt+P` | Search running processes |
+See [FZF Bindings](#fzf-bindings) under Key Bindings for the default FZF shortcuts.
 
 ---
 
@@ -118,7 +109,7 @@ FZF is themed to Catppuccin Mocha with the following colors set via `FZF_DEFAULT
 
 ### Zoxide
 
-Smart `cd` replacement. `z <keyword>` jumps to the best frecency match; `zi` opens an interactive selector.
+Smart `cd` replacement. `cd` (or `z`) `<keyword>` jumps to the best frecency match; `cdi` (or `zi`) opens an interactive selector.
 
 ### DirEnv
 
@@ -140,6 +131,21 @@ Full tab completion for the `tailscale` CLI is provided via `conf.d/tailscale.fi
 
 ## Key Bindings
 
+### FZF Bindings
+
+These are the default FZF bindings (from `fzf.fish`):
+
+| Binding | Action |
+|---|---|
+| `Ctrl+R` | Search command history |
+| `Ctrl+Alt+F` | Search git-tracked files |
+| `Ctrl+Alt+L` | Search git log |
+| `Ctrl+Alt+S` | Search git status |
+| `Ctrl+V` | Search shell variables |
+| `Ctrl+Alt+P` | Search running processes |
+
+### User Bindings
+
 Beyond standard shell and FZF bindings, these custom interactive shortcuts are available:
 
 | Binding | Action | Description |
@@ -212,6 +218,7 @@ rm -f file.txt  # Falls through to standard rm -f
 | `git-clean` | Fetch, prune, update current branch, delete orphaned local branches |
 | `git-clean --force` | Same but force-deletes unmerged orphaned branches |
 | `clone` | `clone-in-kitty` wrapper |
+| `gitui` | Fast terminal Git UI |
 
 ### Package Management (Arch / paru)
 
@@ -266,6 +273,14 @@ rm -f file.txt  # Falls through to standard rm -f
 | `swapstat` | Colorized zRAM compression ratio, swappiness, and swap priority report |
 | `monitors` | Open a 4-pane Kitty layout running `btop` locally and on remote servers |
 | `tmux-clean` | Kill all detached tmux sessions |
+| `limine-edit` | Safely edit and re-verify Limine bootloader configuration |
+
+### Media & Utilities
+
+| Function | Description |
+|---|---|
+| `dng2avif` | Convert DNG raw images to 10-bit HDR AVIF |
+| `steam-dl` | Run Steam while inhibiting system sleep |
 
 ### Editors & Development
 

conf.d/fish_frozen_key_bindings.fish

@@ -1,14 +0,0 @@
-# This file was created by fish when upgrading to version 4.3, to migrate
-# the 'fish_key_bindings' variable from its old default scope (universal)
-# to its new default scope (global).  We recommend you delete this file
-# and configure key bindings in ~/.config/fish/config.fish if needed.
-
-# set --global fish_key_bindings fish_default_key_bindings
-
-# Prior to version 4.3, fish shipped an event handler that runs
-# `set --universal fish_key_bindings fish_default_key_bindings`
-# whenever the fish_key_bindings variable is erased.
-# This means that as long as any fish < 4.3 is still running on this system,
-# we cannot complete the migration.
-# As a workaround, erase the universal variable at every shell startup.
-set --erase --universal fish_key_bindings

conf.d/keybindings.fish

@@ -1,11 +0,0 @@
-# Copyright (C) 2026 Rootiest
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-if not status is-interactive
-    exit
-end
-
-# Ctrl+Alt+U — strip the first command token and place cursor at start to retype it
-for mode in default insert
-    bind --mode $mode ctrl-alt-u _replace_command_token
-end

conf.d/theme.fish

@@ -1,12 +1,12 @@
-# This file was created by fish when upgrading to version 4.3, to migrate
-# theme variables from universal to global scope.
-# Don't edit this file, as it will be written by the web-config tool (`fish_config`).
-# To customize your theme, delete this file and see
-#     help interactive#syntax-highlighting
-# or
-#     man fish-interactive | less +/^SYNTAX.HIGHLIGHTING
-# for appropriate commands to add to ~/.config/fish/config.fish instead.
-# See also the release notes for fish 4.3.0 (run `help relnotes`).
+# Copyright (C) 2026 Rootiest
+# SPDX-License-Identifier: AGPL-3.0-or-later
+#
+#          ╭──────────────────────────────────────────────────────────╮
+#          │                       Fish Theme                         │
+#          ╰──────────────────────────────────────────────────────────╯
+#
+# Catppuccin Mocha syntax highlighting colors.
+# These variables were migrated from the universal scope to global scope.
 
 set --global fish_color_autosuggestion 6c7086
 set --global fish_color_cancel f38ba8

conf.d/zoxide.fish

@@ -92,9 +92,10 @@ alias z=__zoxide_z
 abbr --erase zi &>/dev/null
 alias zi=__zoxide_zi
 
+abbr --erase cdi &>/dev/null
+alias cdi=__zoxide_zi
+
 # =============================================================================
-#
-# To initialize zoxide, add this to your configuration (usually
-# ~/.config/fish/config.fish):
-#
-#   zoxide init fish | source
+# Initialize zoxide:
+
+zoxide init --cmd=cd fish | source