From 0a238c84a1b2956f77d1510f14f55e4cbdc82dd5 Mon Sep 17 00:00:00 2001 From: rootiest Date: Thu, 30 Apr 2026 19:44:26 -0400 Subject: [PATCH 1/4] feat: make zoxide the default cd provider - `cd` is now essentially aliased to `z` allowing frecency matching for `cd` commands. - `cdi` is now aliased to `zi` allowing interactive frecency matching for `cd` commands. --- README.md | 2 +- conf.d/zoxide.fish | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b63aff4..5ae7cbc 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ FZF is themed to Catppuccin Mocha with the following colors set via `FZF_DEFAULT ### Zoxide -Smart `cd` replacement. `z ` jumps to the best frecency match; `zi` opens an interactive selector. +Smart `cd` replacement. `cd` (or `z`) `` jumps to the best frecency match; `cdi` (or `zi`) opens an interactive selector. ### DirEnv diff --git a/conf.d/zoxide.fish b/conf.d/zoxide.fish index 1d10e44..2c29a00 100644 --- a/conf.d/zoxide.fish +++ b/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 From 3019fc6c614ba838b22299386bedbff90ec8ff9b Mon Sep 17 00:00:00 2001 From: rootiest Date: Thu, 30 Apr 2026 19:46:23 -0400 Subject: [PATCH 2/4] refactor: implement global syntax highlighting theme --- README.md | 1 + conf.d/{fish_frozen_theme.fish => theme.fish} | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) rename conf.d/{fish_frozen_theme.fish => theme.fish} (71%) diff --git a/README.md b/README.md index 5ae7cbc..6eb199c 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ This config layers on top of the CachyOS base Fish configuration and adds: │ ├── 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) diff --git a/conf.d/fish_frozen_theme.fish b/conf.d/theme.fish similarity index 71% rename from conf.d/fish_frozen_theme.fish rename to conf.d/theme.fish index 56502b4..c9a3a24 100644 --- a/conf.d/fish_frozen_theme.fish +++ b/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 From f9c53926b94c49591d7542353ba418d0b060f2a4 Mon Sep 17 00:00:00 2001 From: rootiest Date: Thu, 30 Apr 2026 19:47:42 -0400 Subject: [PATCH 3/4] refactor: clean up keybinding implementations - Cleans and organizes key binding definitions for plugins and user keybinds. - Update documentation for keybindings --- README.md | 29 +++++++++++-------- conf.d/fish_frozen_key_bindings.fish | 14 --------- ...er_key_bindings.fish => key_bindings.fish} | 0 conf.d/keybindings.fish | 11 ------- ...fer_fish_key_bindings.fish => puffer.fish} | 0 5 files changed, 17 insertions(+), 37 deletions(-) delete mode 100644 conf.d/fish_frozen_key_bindings.fish rename conf.d/{fish_user_key_bindings.fish => key_bindings.fish} (100%) delete mode 100644 conf.d/keybindings.fish rename conf.d/{puffer_fish_key_bindings.fish => puffer.fish} (100%) diff --git a/README.md b/README.md index 6eb199c..969e80f 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,8 @@ 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 @@ -101,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. --- @@ -141,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 | diff --git a/conf.d/fish_frozen_key_bindings.fish b/conf.d/fish_frozen_key_bindings.fish deleted file mode 100644 index 495aee9..0000000 --- a/conf.d/fish_frozen_key_bindings.fish +++ /dev/null @@ -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 diff --git a/conf.d/fish_user_key_bindings.fish b/conf.d/key_bindings.fish similarity index 100% rename from conf.d/fish_user_key_bindings.fish rename to conf.d/key_bindings.fish diff --git a/conf.d/keybindings.fish b/conf.d/keybindings.fish deleted file mode 100644 index 9c1c2e9..0000000 --- a/conf.d/keybindings.fish +++ /dev/null @@ -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 diff --git a/conf.d/puffer_fish_key_bindings.fish b/conf.d/puffer.fish similarity index 100% rename from conf.d/puffer_fish_key_bindings.fish rename to conf.d/puffer.fish From 43264fc6de7b43602fdd9cf072e74f45dda29b16 Mon Sep 17 00:00:00 2001 From: rootiest Date: Thu, 30 Apr 2026 19:50:20 -0400 Subject: [PATCH 4/4] docs: add undocumented functions to documentation --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 969e80f..f7430b3 100644 --- a/README.md +++ b/README.md @@ -218,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) @@ -272,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