docs: update CLAUDE.md with biome migrate command and gotchas

Add fish-validate skill for syntax checking and formatting .fish files,
lua-format skill for stylua formatting, and fish_indent PostToolUse hook.

.claude/settings.json

@@ -0,0 +1,30 @@
+{
+  "hooks": {
+    "PreToolUse": [
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "fp=$(cat | jq -r '.tool_input.file_path // empty') && [ -n \"$fp\" ] && case \"$fp\" in */fzf-tmux|*/yarn.lock|*/.yarn/*) echo \"BLOCKED: $fp is a vendor/lock file — do not edit directly\" >&2; exit 2;; esac; exit 0"
+          }
+        ]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "fp=$(cat | jq -r '.tool_input.file_path // empty') && [ -n \"$fp\" ] && [ -f \"$fp\" ] && case \"$fp\" in *.sh|*/bin/*) head -1 \"$fp\" | grep -qE '^#!.*(ba)?sh' && command -v shfmt > /dev/null && shfmt -i 2 -bn -ci -sr -fn -w \"$fp\";; esac; exit 0"
+          },
+          {
+            "type": "command",
+            "command": "fp=$(cat | jq -r '.tool_input.file_path // empty') && [ -n \"$fp\" ] && [ -f \"$fp\" ] && case \"$fp\" in *.fish) command -v fish_indent > /dev/null && fish_indent -w \"$fp\";; esac; exit 0"
+          }
+        ]
+      }
+    ]
+  }
+}

.claude/skills/fish-validate/SKILL.md

@@ -0,0 +1,38 @@
+---
+name: fish-validate
+description: >-
+  Validate fish scripts after editing.
+  Apply when writing or modifying any .fish file
+  in config/fish/.
+user-invocable: false
+allowed-tools: Bash, Read
+---
+
+After editing any `.fish` file in `config/fish/`, validate it:
+
+## 1. Syntax check
+
+```bash
+fish --no-execute <file>
+```
+
+If syntax check fails, fix the issue before proceeding.
+
+## 2. Format check
+
+Run `fish_indent` to verify formatting:
+
+```bash
+fish_indent --check <file>
+```
+
+If formatting differs, apply it:
+
+```bash
+fish_indent -w <file>
+```
+
+## Key files to never validate
+
+- Files inside `config/fish/functions/` prefixed with `_tide_`
+  (managed by the tide prompt plugin)

.claude/skills/lua-format/SKILL.md

@@ -0,0 +1,22 @@
+---
+name: lua-format
+description: >-
+  Format Lua files after editing.
+  Apply when writing or modifying any .lua file.
+user-invocable: false
+allowed-tools: Bash
+---
+
+After editing any `.lua` file, format it with stylua:
+
+```bash
+stylua <file>
+```
+
+Project settings are in `stylua.toml` (90-char line length).
+
+If stylua is not available, skip formatting silently.
+
+## Files to never format
+
+- Files inside `config/nvim/` managed by plugins (lazy.nvim lockfile)

.claude/skills/shell-validate/SKILL.md

@@ -0,0 +1,44 @@
+---
+name: shell-validate
+description: >-
+  Validate shell scripts after editing.
+  Apply when writing or modifying any shell script
+  in local/bin/ or scripts/.
+user-invocable: false
+allowed-tools: Bash, Read, Grep
+---
+
+After editing any shell script in `local/bin/`, `scripts/`, or `config/`
+(files with a `#!` shebang or `# shellcheck shell=` directive),
+validate it:
+
+## 1. Determine the shell
+
+- `/bin/sh` or `#!/usr/bin/env sh` shebang -> POSIX, use `sh -n`
+- `/bin/bash` or `#!/usr/bin/env bash` shebang -> Bash, use `bash -n`
+- `# shellcheck shell=bash` directive (no shebang) -> use `bash -n`
+- `# shellcheck shell=sh` directive (no shebang) -> use `sh -n`
+- No shebang and no directive -> default to `bash -n`
+
+## 2. Syntax check
+
+Run the appropriate syntax checker:
+
+```bash
+bash -n <file>   # for bash scripts
+sh -n <file>     # for POSIX sh scripts
+```
+
+If syntax check fails, fix the issue before proceeding.
+
+## 3. ShellCheck
+
+Run `shellcheck <file>`. The project `.shellcheckrc` already
+disables SC2039, SC2166, SC2154, SC1091, SC2174, SC2016.
+Only report and fix warnings that are NOT in that exclude list.
+
+## Key files to never validate (not shell scripts)
+
+- `local/bin/fzf-tmux` (vendor file)
+- `*.md` files
+- `*.bats` test files (Bats, not plain shell)

.editorconfig

@@ -8,6 +8,10 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.py]
+indent_size = 4
+max_line_length = 120
+
 [*.fish]
 max_line_length = 120
 

.github/README.md

@@ -37,7 +37,7 @@ see what interesting stuff you've done with it. Sharing is caring.
 ### Interesting folders
 
 | Path                | Description                                  |
-| ------------------- | -------------------------------------------- |
+|---------------------|----------------------------------------------|
 | `.github`           | GitHub Repository configuration files, meta. |
 | `hosts/{hostname}/` | Configs that should apply to that host only. |
 | `local/bin`         | Helper scripts that I've collected or wrote. |
@@ -52,7 +52,7 @@ is processed by Dotbot during installation.
 ### dotfile folders
 
 | Repo      | Destination | Description                                 |
-| --------- | ----------- | ------------------------------------------- |
+|-----------|-------------|---------------------------------------------|
 | `base/`   | `.*`        | `$HOME` level files.                        |
 | `config/` | `.config/`  | Configurations for applications.            |
 | `local/`  | `.local/`   | XDG Base folder: `bin`, `share` and `state` |
@@ -86,7 +86,7 @@ The folder structure follows [XDG Base Directory Specification][xdg] where possi
 ### XDG Variables
 
 | Env                | Default              | Short description                              |
-| ------------------ | -------------------- | ---------------------------------------------- |
+|--------------------|----------------------|------------------------------------------------|
 | `$XDG_BIN_HOME`    | `$HOME/.local/bin`   | Local binaries                                 |
 | `$XDG_CONFIG_HOME` | `$HOME/.config`      | User-specific configs                          |
 | `$XDG_DATA_HOME`   | `$HOME/.local/share` | User-specific data files                       |

.github/workflows/changelog.yml

@@ -9,13 +9,15 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions: read-all
+permissions:
+  contents: read
 
 jobs:
   debug-changelog:
     runs-on: ubuntu-latest
 
-    permissions: write-all
+    permissions:
+      contents: read
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -27,7 +29,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           config_file: .github/tag-changelog-config.js
 
-      - name: 'Echo results'
+      - name: "Echo results"
         id: output-changelog
         run: |
           echo "${{ steps.changelog.outputs.changes }}"

.github/workflows/linters.yml

@@ -11,7 +11,8 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions: read-all
+permissions:
+  contents: read
 
 jobs:
   Linter:
@@ -30,9 +31,9 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Yarn Lock Changes
-        uses: Simek/yarn-lock-changes@c7543145aaafdd8fc925cea5d85b2bd5a73091f8 # v0.14.0
+        uses: Simek/yarn-lock-changes@59f47ee499424d2c2437c5aebf863b5c6d50a5bc # v0.14.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run PR Lint
-        uses: ivuorinen/actions/pr-lint@f98ae7cd7d0feb1f9d6b01de0addbb11414cfc73 # v2026.01.21
+        uses: ivuorinen/actions/pr-lint@8faacf8a1cae049c1471708dcb408a167e91afaf # v2026.02.24

.github/workflows/new-release.yml

@@ -5,19 +5,21 @@ name: Release Daily State
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 21 * * *' # 00:00 at Europe/Helsinki
+    - cron: "0 21 * * *" # 00:00 at Europe/Helsinki
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions: read-all
+permissions:
+  contents: read
 
 jobs:
   new-daily-release:
     runs-on: ubuntu-latest
 
-    permissions: write-all
+    permissions:
+      contents: write
 
     outputs:
       created: ${{ steps.daily-version.outputs.created }}

.github/workflows/pre-commit-autoupdate.yml

@@ -5,14 +5,15 @@ name: Pre-commit autoupdate
 on:
   schedule:
     # At 04:00 on Monday and Thursday.
-    - cron: '0 4 * * 1,4'
+    - cron: "0 4 * * 1,4"
   workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions: read-all
+permissions:
+  contents: read
 
 jobs:
   auto-update:
@@ -33,6 +34,6 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update/pre-commit-hooks
-          title: 'chore: update pre-commit hooks'
+          title: "chore: update pre-commit hooks"
-          commit-message: 'chore: update pre-commit hooks'
+          commit-message: "chore: update pre-commit hooks"
           body: Update versions of pre-commit hooks to latest version.

.github/workflows/semantic-pr.yml

@@ -14,7 +14,8 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions: read-all
+permissions:
+  pull-requests: read
 
 jobs:
   semantic-pr:

.github/workflows/sync-labels.yml

@@ -11,7 +11,7 @@ on:
       - .github/workflows/sync-labels.yml
       - .github/labels.yml
   schedule:
-    - cron: '34 5 * * *'
+    - cron: "34 5 * * *"
   workflow_call:
   workflow_dispatch:
 
@@ -19,7 +19,8 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions: read-all
+permissions:
+  contents: read
 
 jobs:
   SyncLabels:
@@ -29,4 +30,4 @@ jobs:
       issues: write
 
     steps:
-      - uses: ivuorinen/actions/sync-labels@f98ae7cd7d0feb1f9d6b01de0addbb11414cfc73 # v2026.01.21
+      - uses: ivuorinen/actions/sync-labels@8faacf8a1cae049c1471708dcb408a167e91afaf # v2026.02.24

.github/workflows/update-submodules.yml

@@ -5,20 +5,22 @@ name: Update submodules
 on:
   schedule:
     # At 04:00 on Monday and Thursday.
-    - cron: '0 4 * * 1'
+    - cron: "0 4 * * 1"
   workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions: read-all
+permissions:
+  contents: read
 
 jobs:
   update-submodules:
     runs-on: ubuntu-latest
 
-    permissions: write-all
+    permissions:
+      contents: write
 
     steps:
       - name: Checkout repository

.gitignore

@@ -56,5 +56,6 @@ local/man/yabai.1
 local/share/fonts/*
 lock
 node_modules
+__pycache__
 ssh/local.d/*
 config/fish/fish_variables*

.gitmodules

@@ -4,11 +4,6 @@
 	url = https://github.com/anishathalye/dotbot.git
 	ignore = dirty
 
-[submodule "dotbot-brew"]
-	path = tools/dotbot-brew
-	url = https://github.com/wren/dotbot-brew.git
-	ignore = dirty
-
 [submodule "dotbot-include"]
 	path = tools/dotbot-include
 	url = https://gitlab.com/gnfzdz/dotbot-include.git
@@ -29,11 +24,6 @@
 	url = https://github.com/tmux-plugins/tmux-sessionist.git
 	ignore = dirty
 
-[submodule "dotbot-pip"]
-	path = tools/dotbot-pip
-	url = https://github.com/sobolevn/dotbot-pip.git
-	ignore = dirty
-
 [submodule "tmux/tmux-suspend"]
 	path = config/tmux/plugins/tmux-suspend
 	url = https://github.com/MunifTanjim/tmux-suspend.git
@@ -63,6 +53,8 @@
 [submodule "tmux/tmux-resurrect"]
 	path = config/tmux/plugins/tmux-resurrect
 	url = https://github.com/tmux-plugins/tmux-resurrect.git
+	ignore = dirty
 [submodule "tmux/catppuccin"]
 	path = config/tmux/plugins/catppuccin
 	url = https://github.com/catppuccin/tmux.git
+	ignore = dirty

.ignore

@@ -6,6 +6,5 @@ config/tmux/plugins/**
 config/vim/plugged/**
 node_modules
 tools/antidote/**
-tools/dotbot-brew/**
 tools/dotbot-include/**
 tools/dotbot/**

.mega-linter.yml

@@ -9,16 +9,21 @@ VALIDATE_ALL_CODEBASE: true
 FILEIO_REPORTER: false # Generate file.io report
 GITHUB_STATUS_REPORTER: true # Generate GitHub status report
 IGNORE_GENERATED_FILES: true # Ignore generated files
-JAVASCRIPT_DEFAULT_STYLE: prettier # Default style for JavaScript
 PRINT_ALPACA: false # Print Alpaca logo in console
 SARIF_REPORTER: true # Generate SARIF report
 SHOW_SKIPPED_LINTERS: false # Show skipped linters in MegaLinter log
-TYPESCRIPT_DEFAULT_STYLE: prettier # Default style for TypeScript
 DISABLE_LINTERS:
   - REPOSITORY_DEVSKIM
   - JAVASCRIPT_ES # using biome
   - JAVASCRIPT_PRETTIER # using biome
+  - TYPESCRIPT_PRETTIER # using biome
+  - JSON_PRETTIER # using biome
+  - PYTHON_BLACK # using ruff
+  - PYTHON_FLAKE8 # using ruff
+  - PYTHON_PYLINT # using ruff
+  - PYTHON_ISORT # using ruff (I rules)
 YAML_YAMLLINT_CONFIG_FILE: .yamllint.yml
 REPOSITORY_GIT_DIFF_DISABLE_ERRORS: true
+BASH_SHFMT_ARGUMENTS: -i 2 -bn -ci -sr -fn
 FILTER_REGEX_EXCLUDE: >
   (node_modules|tools|config/cheat/cheatsheets/community|config/cheat/cheatsheets/tldr|config/fzf|config/zsh|config/tmux/plugins)

.nvmrc

@@ -1 +1 @@
-24.13.0
+24.14.0

.pre-commit-config.yaml

@@ -28,12 +28,25 @@ repos:
         entry: yarn biome check --write --files-ignore-unknown=true --no-errors-on-unmatched
         language: system
         files: \.(js|ts|jsx|tsx|json|md)$
+      - id: markdown-table-formatter
+        name: Markdown Table Formatter
+        entry: yarn markdown-table-formatter
+        language: system
+        types: [markdown]
 
   - repo: https://github.com/adrienverge/yamllint
     rev: v1.38.0
     hooks:
       - id: yamllint
 
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v4.0.0-alpha.8
+    hooks:
+      - id: prettier
+        types_or: [yaml]
+        additional_dependencies:
+          - prettier@3.8.1
+
   - repo: https://github.com/shellcheck-py/shellcheck-py
     rev: v0.11.0.1
     hooks:
@@ -43,9 +56,10 @@ repos:
     rev: v3.12.0-2
     hooks:
       - id: shfmt
+        args: [-i, "2", -bn, -ci, -sr, -fn, -w]
 
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.10
+    rev: v1.7.11
     hooks:
       - id: actionlint
 
@@ -60,3 +74,10 @@ repos:
     hooks:
       - id: fish_syntax
       - id: fish_indent
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.4
+    hooks:
+      - id: ruff-check
+        args: [--fix]
+      - id: ruff-format

.prettierignore

@@ -0,0 +1,19 @@
+node_modules
+.yarn
+.pnp.*
+.mypy_cache
+Brewfile.lock.json
+lazy-lock.json
+config/cheat/cheatsheets/community
+config/cheat/cheatsheets/tldr
+config/fzf
+config/nvim
+config/op/plugins/used_plugins
+config/tmux/plugins
+config/vim/plugged
+config/zsh
+local/bin/antigen.zsh
+local/bin/asdf
+tools
+docs/plans
+config/gh/hosts.yml

.prettierrc.json

@@ -0,0 +1,9 @@
+{
+  "$schema": "https://json.schemastore.org/prettierrc",
+  "printWidth": 200,
+  "tabWidth": 2,
+  "useTabs": false,
+  "endOfLine": "lf",
+  "singleQuote": false,
+  "proseWrap": "preserve"
+}

.python-version

@@ -1 +1 @@
-3.14.2
+3.14.3

.serena/project.yml

@@ -13,11 +13,11 @@ ignore_all_files_in_gitignore: true
 # Was previously called `ignored_dirs`, please update your config if you are using that.
 # Added (renamed) on 2025-04-07
 ignored_paths:
-  - '*.swp'
+  - "*.swp"
-  - '*.tmp'
+  - "*.tmp"
-  - '*.tmp.*'
+  - "*.tmp.*"
-  - '.DS_Store'
+  - ".DS_Store"
-  - '.git/**'
+  - ".git/**"
   - /config/cheat/cheatsheets/community/**
   - /config/cheat/cheatsheets/pure-bash-bible/**
   - /config/cheat/cheatsheets/tldr/**
@@ -85,6 +85,6 @@ excluded_tools: []
 
 # initial prompt for the project. It will always be given to the LLM upon activating the project
 # (contrary to the memories, which are loaded on demand).
-initial_prompt: ''
+initial_prompt: ""
 
-project_name: '.dotfiles'
+project_name: ".dotfiles"

CLAUDE.md

@@ -0,0 +1,162 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code)
+when working with code in this repository.
+
+## Repository Overview
+
+Personal dotfiles repository for Ismo Vuorinen.
+Uses **Dotbot** (not GNU Stow) to symlink configuration files into place.
+The directory layout follows the XDG Base Directory Specification.
+
+## Directory Layout and Linking
+
+| Source              | Destination       | Notes                                     |
+|---------------------|-------------------|-------------------------------------------|
+| `base/*`            | `~/.*`            | Home-level dotfiles (`.` added by Dotbot) |
+| `config/*`          | `~/.config/`      | Application configurations                |
+| `local/bin/*`       | `~/.local/bin/`   | Helper scripts and utilities              |
+| `local/share/*`     | `~/.local/share/` | Data files                                |
+| `local/man/**`      | `~/.local/man/`   | Manual pages                              |
+| `ssh/*`             | `~/.ssh/`         | SSH configuration (mode 0600)             |
+| `hosts/<hostname>/` | Overlays          | Host-specific overrides                   |
+
+Installation: `./install` runs Dotbot with `install.conf.yaml`,
+then applies `hosts/<hostname>/install.conf.yaml` if it exists.
+
+## Commands
+
+```bash
+# Install dependencies (required before lint/test)
+yarn install
+
+# Linting
+yarn lint              # Run biome + prettier + editorconfig-checker
+yarn lint:biome        # Biome only
+yarn lint:ec           # EditorConfig checker only
+yarn lint:md-table     # Markdown table formatting check
+yarn fix:md-table      # Auto-fix markdown tables
+
+# Formatting
+yarn fix:biome         # Autofix with biome (JS/TS/JSON/MD)
+yarn fix:prettier      # Autofix with prettier (YAML)
+yarn format            # Format with biome
+yarn format:yaml       # Format YAML files with prettier
+
+# Testing (Bats - Bash Automated Testing System)
+yarn test              # Run all tests in tests/
+# Run a single test file:
+./node_modules/.bin/bats tests/dfm.bats
+
+# Shell linting
+shellcheck <script>    # Lint shell scripts
+
+# Tooling maintenance
+yarn biome migrate --write  # Update biome schema version
+```
+
+## Pre-commit Hooks
+
+Configured in `.pre-commit-config.yaml`: shellcheck, shfmt, biome,
+yamllint, prettier, actionlint, stylua, fish_syntax/fish_indent.
+Run `pre-commit run --all-files` to check everything.
+
+## Commit Convention
+
+Semantic Commit messages: `type(scope): summary`
+(e.g., `fix(tmux): correct prefix binding`).
+Enforced by commitlint extending `@ivuorinen/commitlint-config`.
+
+## Architecture
+
+### Shell Configuration Chain
+
+Both `base/bashrc` and `base/zshrc` source `config/shared.sh`,
+which loads:
+- `config/exports` — environment variables, XDG dirs, PATH
+- `config/alias` — shell aliases
+
+Zsh additionally uses **antidote** (in `tools/antidote/`)
+for plugin management and **oh-my-posh** for the prompt.
+
+### msgr — Messaging Helper
+
+`local/bin/msgr` provides colored output functions (`msgr msg`,
+`msgr run`, `msgr yay`, `msgr err`, `msgr warn`). Sourced by `dfm`
+and most scripts in `local/bin/`.
+
+### dfm — Dotfiles Manager
+
+`local/bin/dfm` is the main management script. Key commands:
+- `dfm install all` — install everything in tiered stages
+- `dfm brew install` / `dfm brew update` — Homebrew management
+- `dfm apt upkeep` — APT package maintenance (Debian/Ubuntu)
+- `dfm dotfiles fmt` / `dfm dotfiles shfmt` — format configs/scripts
+- `dfm helpers <name>` — inspect aliases, colors, env, functions, path
+- `dfm docs all` — regenerate documentation under `docs/`
+- `dfm check arch` / `dfm check host` — system info
+- `dfm scripts` — run scripts from `scripts/` (discovered via `@description` tags)
+- `dfm tests` — test visualization helpers
+
+### Submodules
+
+External dependencies are git submodules (Dotbot, plugins,
+tmux plugins, cheatsheets, antidote).
+Managed by `add-submodules.sh`. All set to `ignore = dirty`.
+Updated automatically via GitHub Actions on a schedule.
+
+### Host-specific Configs
+
+Machine-specific overrides live in `hosts/<hostname>/`
+with their own `base/`, `config/`, and `install.conf.yaml`.
+These are layered on top of the global config during installation.
+
+## Code Style
+
+- **EditorConfig**: 2-space indent, UTF-8, LF line endings.
+  See `.editorconfig` for per-filetype overrides
+  (4-space for PHP/fish, tabs for git config).
+- **Shell scripts**: Must have a shebang or
+  `# shellcheck shell=bash` directive.
+  Follow shfmt settings in `.editorconfig`
+  (2-space indent, `binary_next_line`,
+  `switch_case_indent`, `space_redirects`, `function_next_line`).
+- **Lua** (neovim config): Formatted with stylua (`stylua.toml`),
+  90-char line length.
+- **JSON/JS/TS/Markdown**: Formatted with Biome (`biome.json`),
+  80-char width.
+- **YAML**: Formatted with Prettier (`.prettierrc.json`),
+  validated with yamllint (`.yamllint.yml`).
+
+## ShellCheck Disabled Rules
+
+Defined in `.shellcheckrc`:
+SC2039 (POSIX `local`), SC2166 (`-o` in test),
+SC2154 (unassigned variables), SC1091 (source following),
+SC2174 (mkdir -p -m), SC2016 (single-quote expressions).
+
+## Gotchas
+
+- **POSIX scripts**: `x-ssh-audit`, `x-codeql`, `x-until-error`,
+  `x-until-success`, `x-ssl-expiry-date` use `/bin/sh`.
+  Validate with `sh -n`, not `bash -n`.
+- **Vendor file**: `local/bin/fzf-tmux` is vendored from
+  junegunn/fzf — do not modify.
+- **Fish config**: `config/fish/` has its own config chain
+  (`config.fish`, `exports.fish`, `alias.fish`) plus 60+ functions.
+- **gh CLI config**: `config/gh/hosts.yml` is managed by `gh` CLI
+  and excluded from prettier (see `.prettierignore`).
+- **Python**: Two scripts (`x-compare-versions.py`,
+  `x-git-largest-files.py`) linted by Ruff (config in `pyproject.toml`).
+
+## Claude Code Configuration
+
+- **Hooks** (`.claude/settings.json`):
+  - *PreToolUse*: Blocks edits to `fzf-tmux`, `yarn.lock`, `.yarn/`
+  - *PostToolUse*: Auto-runs `shfmt` on shell scripts after Edit/Write
+- **Skills** (`.claude/skills/`):
+  - `shell-validate`: Auto-validates shell scripts (syntax + shellcheck)
+
+## Package Manager
+
+Yarn (v4.12.0) is the package manager. Do not use npm.

add-submodules.sh

@@ -5,12 +5,8 @@ git submodule sync --recursive
 # dotbot and plugins
 git submodule add --name dotbot \
   -f https://github.com/anishathalye/dotbot.git tools/dotbot
-git submodule add --name dotbot-brew \
-  -f https://github.com/wren/dotbot-brew.git tools/dotbot-brew
 git submodule add --name dotbot-include \
   -f https://gitlab.com/gnfzdz/dotbot-include.git tools/dotbot-include
-git submodule add --name dotbot-pip \
-  -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip
 
 # other repos
 git submodule add --name cheat-community \
@@ -46,26 +42,70 @@ done
 # Mark certain repositories shallow
 git config -f .gitmodules submodule.antidote.shallow true
 
-# remove old submodules
+# Log a message using msgr if available, else echo
-folders=(
+_log()
-  "config/tmux/plugins/tpm"
+{
-  "config/tmux/plugins/tmux"
+  local msg="$1"
-  "config/tmux/plugins/tmux-menus"
+  if command -v msgr > /dev/null 2>&1; then
-  "tools/dotbot-crontab"
+    msgr run_done "$msg"
-  "tools/dotbot-snap"
+  else
-  "config/tmux/plugins/tmux-window-name"
+    echo "  [ok] $msg"
-  "config/tmux/plugins/tmux-sensible"
+  fi
-  "config/tmux/plugins/tmux-mode-indicator"
+  return 0
-  "config/tmux/plugins/tmux-yank"
+}
-  "config/tmux/plugins/tmux-fzf-url"
+
-  "config/nvim-kickstart"
+# Remove a stale git submodule and clean up references
-  "local/bin/asdf"
+remove_old_submodule()
-  "local/asdf"
+{
-  "tools/dotbot-asdf"
+  local name="$1" path="$2"
+
+  # Remove working tree
+  if [[ -d "$path" ]]; then
+    rm -rf "$path"
+    _log "Removed $path"
+  fi
+
+  # Remove stale git index entry
+  git rm --cached "$path" 2> /dev/null || true
+
+  # Remove .git/config section keyed by path
+  git config --remove-section "submodule.$path" 2> /dev/null || true
+
+  # Skip name-based cleanup if no submodule name provided
+  [[ -z "$name" ]] && return 0
+
+  # Remove .git/config section keyed by name
+  git config --remove-section "submodule.$name" 2> /dev/null || true
+
+  # Remove .git/modules/<name>/ cached repository
+  if [[ -d ".git/modules/$name" ]]; then
+    rm -rf ".git/modules/$name"
+    _log "Removed .git/modules/$name"
+  fi
+}
+
+# remove old submodules (name:path pairs)
+old_submodules=(
+  "tmux/tpm:config/tmux/plugins/tpm"
+  ":config/tmux/plugins/tmux"
+  "tmux/tmux-menus:config/tmux/plugins/tmux-menus"
+  "dotbot-crontab:tools/dotbot-crontab"
+  "dotbot-snap:tools/dotbot-snap"
+  "tmux/tmux-window-name:config/tmux/plugins/tmux-window-name"
+  "tmux/tmux-sensible:config/tmux/plugins/tmux-sensible"
+  "tmux/tmux-mode-indicator:config/tmux/plugins/tmux-mode-indicator"
+  "tmux/tmux-yank:config/tmux/plugins/tmux-yank"
+  ":config/tmux/plugins/tmux-fzf-url"
+  "nvim-kickstart:config/nvim-kickstart"
+  "asdf:local/bin/asdf"
+  "asdf:local/asdf"
+  "dotbot-asdf:tools/dotbot-asdf"
+  "dotbot-pip:tools/dotbot-pip"
+  "dotbot-brew:tools/dotbot-brew"
 )
 
-for folder in "${folders[@]}"; do
+for entry in "${old_submodules[@]}"; do
-  [ -d "$folder" ] \
+  name="${entry%%:*}"
-    && rm -rf "$folder" \
+  path="${entry#*:}"
-    && msgr run_done "Removed old submodule $folder"
+  remove_old_submodule "$name" "$path"
 done

base/bashrc

@@ -2,20 +2,17 @@
 # shellcheck shell=bash
 
 export DOTFILES="$HOME/.dotfiles"
+# Minimal PATH for x-have and utilities; full PATH set in shared.sh/exports
 export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$PATH"
 export SHARED_SCRIPTS_SOURCED=0
 
 source "$DOTFILES/config/shared.sh"
 
-if [ -n "${GHOSTTY_RESOURCES_DIR}" ]; then
-  builtin source "${GHOSTTY_RESOURCES_DIR}/shell-integration/bash/ghostty.bash"
-fi
-
 # shellcheck source=../config/fzf/fzf.bash
 [ -f "${DOTFILES}/config/fzf/fzf.bash" ] &&
   source "${DOTFILES}/config/fzf/fzf.bash"
 
-# Import ssh keys in keychain
+# Import ssh keys in keychain (macOS-specific -A flag, silently fails on Linux)
 ssh-add -A 2>/dev/null
 
 x-have antidot && {
@@ -25,6 +22,3 @@ x-have antidot && {
 PROMPT_DIRTRIM=3
 PROMPT_COMMAND='PS1_CMD1=$(git branch --show-current 2>/dev/null)'
 PS1='\[\e[95m\]\u\[\e[0m\]@\[\e[38;5;22;2m\]\h\[\e[0m\] \[\e[38;5;33m\]\w\[\e[0m\] \[\e[92;2m\]${PS1_CMD1}\n\[\e[39m\]➜\[\e[0m\] '
-
-# Added by LM Studio CLI (lms)
-export PATH="$PATH:$HOME/.lmstudio/bin"

base/envrc

@@ -1 +0,0 @@
-use node

base/hammerspoon/.luacheckrc

@@ -2,14 +2,14 @@
 -- These globals can be set and accessed:
 --
 globals = {
-	"rawrequire",
+  "rawrequire",
 }
 
 --
 -- These globals can only be accessed:
 --
 read_globals = {
-	"hs",
+  "hs",
-	"ls",
+  "ls",
-	"spoon",
+  "spoon",
 }

base/zshrc

@@ -7,18 +7,13 @@
 autoload -U promptinit; promptinit
 
 export DOTFILES="$HOME/.dotfiles"
-LOCAL_SHARE="$HOME/.local/share"
+# Minimal PATH for x-have and utilities; full PATH set in shared.sh/exports
-export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$LOCAL_SHARE/nvim/mason/bin:$LOCAL_SHARE/bob/nvim-bin:$LOCAL_SHARE/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
+export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$PATH"
 export SHARED_SCRIPTS_SOURCED=0
 
 source "$DOTFILES/config/shared.sh"
 
-# zsh completions directory
+# zsh completions directory (ZSH_CUSTOM_COMPLETION_PATH set in shared.sh)
-[ -z "$ZSH_COMPLETIONS" ] && export ZSH_COMPLETIONS="$XDG_CONFIG_HOME/zsh/completion"
-
-# Add zsh completions to FPATH, compinit will be called later
-FPATH="$ZSH_COMPLETIONS:$FPATH"
-
 ZSH_COMPDUMP="$XDG_CACHE_HOME/zsh/zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
 
 source "$DOTFILES/config/zsh/antidote.zsh"
@@ -37,12 +32,9 @@ source_fzf_config
 x-have antidot && eval "$(antidot init)"
 
 autoload -Uz compinit bashcompinit
-compinit -d $ZSH_COMPDUMP
+compinit -d "$ZSH_COMPDUMP"
 bashcompinit
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 export P10K_CONFIG="$DOTFILES/config/zsh/p10k.zsh"
 [[ ! -f "$P10K_CONFIG" ]] || source "$P10K_CONFIG"
-
-# Added by LM Studio CLI (lms)
-export PATH="$PATH:$HOME/.lmstudio/bin"

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.3.1/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.4.4/schema.json",
   "vcs": {
     "enabled": true,
     "clientKind": "git",

config/aerospace/aerospace.toml

@@ -1,251 +0,0 @@
-# Start AeroSpace at login
-start-at-login = false
-
-# Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide#normalization
-enable-normalization-flatten-containers = true
-enable-normalization-opposite-orientation-for-nested-containers = true
-
-# See: https://nikitabobko.github.io/AeroSpace/guide#layouts
-# The 'accordion-padding' specifies the size of accordion padding
-# You can set 0 to disable the padding feature
-accordion-padding = 10
-
-# Possible values: tiles|accordion
-default-root-container-layout = 'tiles'
-
-# Possible values: horizontal|vertical|auto
-# 'auto' means: wide monitor (anything wider than high) gets horizontal orientation,
-#               tall monitor (anything higher than wide) gets vertical orientation
-default-root-container-orientation = 'auto'
-
-# Mouse follows focus when focused monitor changes
-# Drop it from your config, if you don't like this behavior
-# See https://nikitabobko.github.io/AeroSpace/guide#on-focus-changed-callbacks
-# See https://nikitabobko.github.io/AeroSpace/commands#move-mouse
-# Fallback value (if you omit the key): on-focused-monitor-changed = []
-on-focused-monitor-changed = ['move-mouse monitor-lazy-center']
-
-# You can effectively turn off macOS "Hide application" (cmd-h) feature by toggling this flag
-# Useful if you don't use this macOS feature, but accidentally hit cmd-h or cmd-alt-h key
-# Also see: https://nikitabobko.github.io/AeroSpace/goodness#disable-hide-app
-automatically-unhide-macos-hidden-apps = true
-
-# [[on-window-detected]]
-# if.app-id = 'com.apple.systempreferences'
-# if.app-name-regex-substring = 'settings'
-# if.window-title-regex-substring = 'substring'
-# if.workspace = 'workspace-name'
-# if.during-aerospace-startup = true
-# check-further-callbacks = true
-# run = ['layout floating', 'move-node-to-workspace S']  # The callback itself
-
-[[on-window-detected]]
-if.app-name-regex-substring = 'settings' # All settings
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.apple.systempreferences' # macOS System Preferences
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.1password.1password' # 1Password
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'org.ferdium.ferdium-app' # Ferdium, has WhatsApp etc.
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.jetbrains.PhpStorm' # PhpStorm
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.apple.finder' # Finder
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.apple.Preview' # Preview
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.apple.mail' # Mail
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.DanPristupov.Fork' # Fork
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.flexibits.fantastical2.mac' # Fantastical
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'org.whispersystems.signal-desktop' # Signal
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.tidal.desktop' # TIDAL
-run = ['layout floating', 'move-node-to-workspace 2'] # Float and move to workspace 2
-
-[[on-window-detected]]
-if.app-id = 'com.apple.TV' # Apple TV app
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.setapp.DesktopClient' # Setapp
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.electron.dockerdesktop' # Docker Desktop
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.tinyspeck.slackmacgap' # Slack
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'md.obsidia' # Obsidian
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.todoist.mac.Todoist' # Todoist
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.apple.backup.launcher' # TimeMachine
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.philipyoungg.session-setapp' # Session app (Setapp)
-run = ['layout floating']
-
-[[on-window-detected]]
-if.app-id = 'com.microsoft.rdc.macos' # Remote Desktop
-run = ['layout floating']
-
-# Possible values: (qwerty|dvorak)
-# See https://nikitabobko.github.io/AeroSpace/guide#key-mapping
-[key-mapping]
-preset = 'qwerty'
-
-# Gaps between windows (inner-*) and between monitor edges (outer-*).
-# Possible values:
-# - Constant:     gaps.outer.top = 8
-# - Per monitor:  gaps.outer.top = [{ monitor.main = 16 }, { monitor."some-pattern" = 32 }, 24]
-#                 In this example, 24 is a default value when there is no match.
-#                 Monitor pattern is the same as for 'workspace-to-monitor-force-assignment'.
-#                 See: https://nikitabobko.github.io/AeroSpace/guide#assign-workspaces-to-monitors
-[gaps]
-inner.horizontal = 5
-inner.vertical =   5
-outer.top = [{ monitor.'^built-in retina display$' = 0 }, 0]
-outer.right =      0
-outer.bottom =     0
-outer.left =       0
-
-# 'main' binding mode declaration
-# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes
-# 'main' binding mode must be always presented
-# Fallback value (if you omit the key): mode.main.binding = {}
-[mode.main.binding]
-
-cmd-h = [] # Disable "hide application"
-cmd-alt-h = [] # Disable "hide others"
-
-# All possible keys:
-# - Letters.        a, b, c, ..., z
-# - Numbers.        0, 1, 2, ..., 9
-# - Keypad numbers. keypad0, keypad1, keypad2, ..., keypad9
-# - F-keys.         f1, f2, ..., f20
-# - Special keys.   minus, equal, period, comma, slash, backslash, quote, semicolon, backtick,
-#                   leftSquareBracket, rightSquareBracket, space, enter, esc, backspace, tab
-# - Keypad special. keypadClear, keypadDecimalMark, keypadDivide, keypadEnter, keypadEqual,
-#                   keypadMinus, keypadMultiply, keypadPlus
-# - Arrows.         left, down, up, right
-
-# All possible modifiers: cmd, alt, ctrl, shift
-
-# All possible commands: https://nikitabobko.github.io/AeroSpace/commands
-
-# See: https://nikitabobko.github.io/AeroSpace/commands#exec-and-forget
-# You can uncomment the following lines to open up terminal with alt + enter shortcut (like in i3)
-# alt-enter = '''exec-and-forget osascript -e '
-# tell application "Terminal"
-#     do script
-#     activate
-# end tell'
-# '''
-
-# alt-cmd-shift-f = 'fullscreen'
-# alt-shift-f = 'layout floating'
-# alt-shift-tab = 'move-workspace-to-monitor --wrap-around next'
-
-# See: https://nikitabobko.github.io/AeroSpace/commands#focus
-alt-h = 'focus left'
-alt-j = 'focus down'
-alt-k = 'focus up'
-alt-l = 'focus right'
-
-# See: https://nikitabobko.github.io/AeroSpace/commands#workspace
-alt-shift-1 = 'workspace 1' # Main
-alt-shift-2 = 'workspace 2' # Media
-ctrl-shift-1 = 'move-node-to-workspace 1' # Move node to Main
-ctrl-shift-2 = 'move-node-to-workspace 2' # Move node to Media
-
-alt-shift-tab = 'workspace-back-and-forth' # Switch between workspaces
-ctrl-shift-tab = 'move-workspace-to-monitor --wrap-around prev'
-
-# See: https://nikitabobko.github.io/AeroSpace/commands#mode
-# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes
-alt-a = 'mode apps'
-alt-s = 'mode service'
-alt-m = 'mode move'
-
-# ╭──────────────────────────────────────────────────────────╮
-# │                          alt-m                           │
-# ╰──────────────────────────────────────────────────────────╯
-[mode.move.binding]
-esc = ['reload-config', 'mode main']
-# See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace
-1 = ['move-node-to-workspace 1 --focus-follows-window']
-2 = ['move-node-to-workspace 2 --focus-follows-window']
-# See: https://nikitabobko.github.io/AeroSpace/commands#move
-h = 'move left'
-j = 'move down'
-k = 'move up'
-l = 'move right'
-# See: https://nikitabobko.github.io/AeroSpace/commands#join-with
-shift-h = 'join-with left'
-shift-j = 'join-with down'
-shift-k = 'join-with up'
-shift-l = 'join-with right'
-# https://nikitabobko.github.io/AeroSpace/commands#resize
-ctrl-h = 'resize smart -70'
-ctrl-l = 'resize smart +70'
-shift-left = 'resize smart +70'
-shift-right = 'resize smart -70'
-# https://nikitabobko.github.io/AeroSpace/commands#flatten-workspace-tree
-r = ['flatten-workspace-tree', 'mode main'] # reset layout
-
-# ╭──────────────────────────────────────────────────────────╮
-# │                          alt-a                           │
-# ╰──────────────────────────────────────────────────────────╯
-[mode.apps.binding]
-esc = ['reload-config', 'mode main']
-b = ['exec-and-forget open -a /Applications/Brave Browser.app', 'mode main'] # Browser
-c = ['exec-and-forget open -a /Applications/Ferdium.app', 'mode main'] # Chat
-g = ['exec-and-forget open -a /Applications/Ghostty.app', 'mode main'] # Ghostty
-o = ['exec-and-forget open -a /Applications/Obsidian.app', 'mode main'] # Obsidian
-s = ['exec-and-forget open -a /Applications/Slack.app', 'mode main'] # Slack
-t = ['exec-and-forget open -a /Applications/TIDAL.app', 'mode main'] # Tidal
-w = ['exec-and-forget open -a /Applications/WezTerm.app', 'mode main'] # WezTerm
-
-# ╭──────────────────────────────────────────────────────────╮
-# │                          alt-s                           │
-# ╰──────────────────────────────────────────────────────────╯
-[mode.service.binding]
-esc = ['reload-config', 'mode main'] # reload config
-r = ['flatten-workspace-tree', 'mode main'] # reset layout
-# See: https://nikitabobko.github.io/AeroSpace/commands#layout
-f = ['layout floating tiling', 'mode main'] # Toggle between floating and tiling layout
-backspace = ['close-all-windows-but-current', 'mode main']

config/alias

@@ -7,8 +7,6 @@ x-have eza && {
   alias ls="eza -h -s=type --git --icons --group-directories-first"
 }
 
-alias vim='vim -u "$XDG_CONFIG_HOME/vim/vimrc"'
-
 # Easier navigation: .., ..., ....
 alias ..="cd .."
 alias ...="cd ../.."

config/amethyst/amethyst.yml

@@ -93,13 +93,13 @@ expand-main:
 # Note that not all layouts respond to this command.
 increase-main:
   mod: mod1
-  key: ','
+  key: ","
 
 # Decrease the number of windows in the main pane.
 # Note that not all layouts respond to this command.
 decrease-main:
   mod: mod1
-  key: '.'
+  key: "."
 
 # General purpose command for custom layouts.
 # Functionality is layout-dependent.

config/aqua/aqua.yaml

@@ -1,15 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/aqua-yaml.json
-# aqua - Declarative CLI Version Manager
-# https://aquaproj.github.io/
-# checksum:
-#   enabled: true
-#   require_checksum: true
-#   supported_envs:
-#   - all
-registries:
-  - type: standard
-    ref: v4.346.0 # renovate: depName=aquaproj/aqua-registry
-packages:
-  - name: cli/cli
-    version: 'v2.69.0'

config/asdf/asdfrc

@@ -1,5 +0,0 @@
-# See the docs for explanations: https://asdf-vm.com/manage/configuration.html
-
-legacy_version_file=yes
-use_release_candidates=no
-concurrency=auto

config/asdf/gem-packages

@@ -1 +0,0 @@
-bundler

config/asdf/plugin-versions

@@ -1,20 +0,0 @@
-1password-cli         https://github.com/NeoHsu/asdf-1password-cli.git            f5d5aab
-age                   https://github.com/threkk/asdf-age.git                      396bdf6
-asdf-plugin-manager   https://github.com/asdf-community/asdf-plugin-manager.git   b5862c1
-direnv                https://github.com/asdf-community/asdf-direnv.git           6ff3dbe
-dotenv-linter         https://github.com/wesleimp/asdf-dotenv-linter.git          1369f53
-editorconfig-checker  https://github.com/gabitchov/asdf-editorconfig-checker.git  585c1d5
-fd                    https://gitlab.com/wt0f/asdf-fd.git                         17d56e0
-github-cli            https://github.com/bartlomiejdanek/asdf-github-cli.git      e0605b7
-golang                https://github.com/asdf-community/asdf-golang.git           e2527a3
-hadolint              https://github.com/devlincashman/asdf-hadolint.git          c8eb88b
-kubectl               https://github.com/asdf-community/asdf-kubectl.git          2fb3b57
-pre-commit            https://github.com/jonathanmorley/asdf-pre-commit.git       26bfc42
-ripgrep               https://gitlab.com/wt0f/asdf-ripgrep.git                    e836665
-rust                  https://github.com/code-lever/asdf-rust.git                 95acf4f
-shellcheck            https://github.com/luizm/asdf-shellcheck.git                66200ff
-shfmt                 https://github.com/luizm/asdf-shfmt.git                     a42c5ff
-terragrunt            https://github.com/ohmer/asdf-terragrunt.git                29f2935
-tf-summarize          https://github.com/adamcrews/asdf-tf-summarize.git          880ad26
-yamllint              https://github.com/ericcornelissen/asdf-yamllint.git        e4cfb17
-yq                    https://github.com/sudermanjr/asdf-yq.git                   772992f

config/direnv/direnv.toml

@@ -1,12 +0,0 @@
-[global]
-disable_stdin = false
-load_dotenv = true
-hide_env_diff = false
-
-[whitelist]
-prefix = [
-  "~/Code/"
-]
-exact = [
-  "~/.dotfiles/.envrc"
-]

config/direnv/lib/use_asdf.sh

@@ -1,6 +0,0 @@
-### Do not edit. This was autogenerated by 'asdf direnv setup' ###
-# shellcheck shell=bash
-use_asdf()
-{
-  source_env "$(asdf direnv envrc "$@")"
-}

config/exports

@@ -4,15 +4,15 @@
 
 # Set XDG directories if not already set
 # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-[ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME="$HOME/.config"
+[ -z "${XDG_CONFIG_HOME:-}" ] && export XDG_CONFIG_HOME="$HOME/.config"
-[ -z "$XDG_DATA_HOME" ] && export XDG_DATA_HOME="$HOME/.local/share"
+[ -z "${XDG_DATA_HOME:-}" ] && export XDG_DATA_HOME="$HOME/.local/share"
-[ -z "$XDG_CACHE_HOME" ] && export XDG_CACHE_HOME="$HOME/.cache"
+[ -z "${XDG_CACHE_HOME:-}" ] && export XDG_CACHE_HOME="$HOME/.cache"
-[ -z "$XDG_STATE_HOME" ] && export XDG_STATE_HOME="$HOME/.local/state"
+[ -z "${XDG_STATE_HOME:-}" ] && export XDG_STATE_HOME="$HOME/.local/state"
-[ -z "$XDG_BIN_HOME" ] && export XDG_BIN_HOME="$HOME/.local/bin"
+[ -z "${XDG_BIN_HOME:-}" ] && export XDG_BIN_HOME="$HOME/.local/bin"
-[ -z "$XDG_RUNTIME_DIR" ] && export XDG_RUNTIME_DIR="$HOME/.local/run"
+[ -z "${XDG_RUNTIME_DIR:-}" ] && export XDG_RUNTIME_DIR="$HOME/.local/run"
 
 # if DOTFILES is not set, set it to the default location
-[ -z "$DOTFILES" ] && export DOTFILES="$HOME/.dotfiles"
+[ -z "${DOTFILES:-}" ] && export DOTFILES="$HOME/.dotfiles"
 
 export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$XDG_DATA_HOME/bob/nvim-bin:$XDG_DATA_HOME/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
 
@@ -150,6 +150,7 @@ commit()
   git commit -a -m "$commitMessage"
 }
 
+# Run Laravel scheduler in a loop
 scheduler()
 {
   while :; do
@@ -282,7 +283,8 @@ export LESSHISTFILE="$XDG_STATE_HOME"/less/history
 export MANPAGER="less -X"
 
 # Always enable colored `grep` output
-export GREP_OPTIONS="--color=auto"
+# Note: GREP_OPTIONS is deprecated since GNU grep 2.21
+# Color is handled via alias in config/alias
 
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
@@ -348,12 +350,6 @@ export COMPOSER_HOME="$XDG_STATE_HOME/composer"
 export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
 export PATH="$COMPOSER_BIN:$PATH"
 
-# direnv, https://direnv.net/
-# https://direnv.net/docs/hook.html
-# Set the hook to show the direnv message in a different color
-# export DIRENV_LOG_FORMAT=$'\033[2mdirenv: %s\033[0m'
-export DIRENV_LOG_FORMAT=
-
 # docker, https://docs.docker.com/engine/reference/commandline/cli/
 msg "Setting up Docker configuration"
 export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker"
@@ -410,11 +406,6 @@ x-have pyenv && eval "$(pyenv init -)"
 msg "Setting up Rust/Cargo configuration"
 export RUST_WITHOUT=rust-docs
 
-# screen
-# https://www.gnu.org/software/screen/manual/screen.html
-msg "Setting up screen configuration"
-export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
-
 # sonarlint
 # https://www.sonarlint.org/
 msg "Setting up Sonarlint configuration"
@@ -442,23 +433,24 @@ export ZSH_TMUX_UNICODE=true
 export ZSH_TMUX_AUTOQUIT=false
 export ZSH_TMUX_DEFAULT_SESSION_NAME=main
 
-# tms, https://github.com/jrmoulton/tmux-sessionizer
-export TMS_CONFIG_FILE="${XDG_CONFIG_HOME}/tms/config.toml"
-
 # wakatime, https://github.com/wakatime/wakatime-cli
 msg "Setting up Wakatime configuration"
 export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"
 x-dc "$WAKATIME_HOME"
 
+# LM Studio CLI
+msg "Setting up LM Studio configuration"
+export PATH="$PATH:$HOME/.lmstudio/bin"
+
 # Misc
 msg "Setting up miscellaneous configuration"
 export ZSHZ_DATA="$XDG_STATE_HOME/z"
 export CHEAT_USE_FZF=true
 export SQLITE_HISTORY="${XDG_CACHE_HOME}/sqlite_history"
 
-[ -f "$XDG_CONFIG_HOME/exports-secret" ] && source "$XDG_CONFIG_HOME/exports-secret"
+if [ -f "$XDG_CONFIG_HOME/exports-secret" ]; then source "$XDG_CONFIG_HOME/exports-secret"; fi
-[ -f "$XDG_CONFIG_HOME/exports-local" ] && source "$XDG_CONFIG_HOME/exports-local"
+if [ -f "$XDG_CONFIG_HOME/exports-local" ]; then source "$XDG_CONFIG_HOME/exports-local"; fi
 # shellcheck source=./exports-lakka
-[ -f "$XDG_CONFIG_HOME/exports-$(hostname)" ] && source "$XDG_CONFIG_HOME/exports-$(hostname)"
+if [ -f "$XDG_CONFIG_HOME/exports-$(hostname)" ]; then source "$XDG_CONFIG_HOME/exports-$(hostname)"; fi
 # shellcheck source=./exports-lakka-secret
-[ -f "$XDG_CONFIG_HOME/exports-$(hostname)-secret" ] && source "$XDG_CONFIG_HOME/exports-$(hostname)-secret"
+if [ -f "$XDG_CONFIG_HOME/exports-$(hostname)-secret" ]; then source "$XDG_CONFIG_HOME/exports-$(hostname)-secret"; fi

config/exports-lakka

@@ -8,7 +8,6 @@ fi
 export PATH="$HOME/.local/go/bin:$PATH"
 
 alias logrotate='/usr/sbin/logrotate -s "$HOME/logs/state"'
-alias nano='nano -wS -$'
 alias gpg=gpg2
 
 ACME_PATH="$HOME/.acme.sh"

config/fish/completions/kubectl.fish

@@ -1 +0,0 @@
-/Applications/OrbStack.app/Contents/MacOS/../Resources/completions/fish/kubectl.fish

config/fish/completions/orbctl.fish

@@ -1 +0,0 @@
-/Applications/OrbStack.app/Contents/MacOS/../Resources/completions/fish/orbctl.fish

config/fish/completions/phpenv.fish

@@ -2,21 +2,21 @@
 # Place in ~/.config/fish/completions/phpenv.fish
 
 # Complete main commands
-complete -c phpenv -f -n "__fish_use_subcommand" -a "install" -d "Install a PHP version"
+complete -c phpenv -f -n __fish_use_subcommand -a install -d "Install a PHP version"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "uninstall" -d "Uninstall a PHP version"
+complete -c phpenv -f -n __fish_use_subcommand -a uninstall -d "Uninstall a PHP version"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "use" -d "Use PHP version for current shell"
+complete -c phpenv -f -n __fish_use_subcommand -a use -d "Use PHP version for current shell"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "local" -d "Set PHP version for current project"
+complete -c phpenv -f -n __fish_use_subcommand -a local -d "Set PHP version for current project"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "global" -d "Set global PHP version"
+complete -c phpenv -f -n __fish_use_subcommand -a global -d "Set global PHP version"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "list" -d "List installed PHP versions"
+complete -c phpenv -f -n __fish_use_subcommand -a list -d "List installed PHP versions"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "ls" -d "List installed PHP versions"
+complete -c phpenv -f -n __fish_use_subcommand -a ls -d "List installed PHP versions"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "current" -d "Show current PHP version"
+complete -c phpenv -f -n __fish_use_subcommand -a current -d "Show current PHP version"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "which" -d "Show path to PHP binary"
+complete -c phpenv -f -n __fish_use_subcommand -a which -d "Show path to PHP binary"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "versions" -d "Show all available versions"
+complete -c phpenv -f -n __fish_use_subcommand -a versions -d "Show all available versions"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "doctor" -d "Check phpenv installation"
+complete -c phpenv -f -n __fish_use_subcommand -a doctor -d "Check phpenv installation"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "config" -d "Manage configuration"
+complete -c phpenv -f -n __fish_use_subcommand -a config -d "Manage configuration"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "extensions" -d "Manage PHP extensions"
+complete -c phpenv -f -n __fish_use_subcommand -a extensions -d "Manage PHP extensions"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "ext" -d "Manage PHP extensions"
+complete -c phpenv -f -n __fish_use_subcommand -a ext -d "Manage PHP extensions"
-complete -c phpenv -f -n "__fish_use_subcommand" -a "help" -d "Show help"
+complete -c phpenv -f -n __fish_use_subcommand -a help -d "Show help"
 
 # Helper functions for completions
 function __phpenv_complete_installed_versions
@@ -26,13 +26,13 @@ end
 function __phpenv_complete_available_versions
     # Try to get dynamic versions first
     if command -q curl -a command -q jq; and functions -q __phpenv_parse_version_field
-        echo "latest"
+        echo latest
-        echo "nightly"
+        echo nightly
         echo "5.x"
         echo "7.x"
         echo "8.x"
-        __phpenv_parse_version_field "latest" "8.4"
+        __phpenv_parse_version_field latest "8.4"
-        __phpenv_parse_version_field "nightly" "8.5"
+        __phpenv_parse_version_field nightly "8.5"
         __phpenv_parse_version_field "5.x" "5.6"
         __phpenv_parse_version_field "7.x" "7.4"
         __phpenv_parse_version_field "8.x" "8.4"
@@ -64,18 +64,18 @@ complete -c phpenv -f -n "__fish_seen_subcommand_from uninstall use local global
     -a "(__phpenv_complete_installed_versions)" -d "Installed PHP version"
 
 # Add system option for use command
-complete -c phpenv -f -n "__fish_seen_subcommand_from use" -a "system" -d "Use system PHP"
+complete -c phpenv -f -n "__fish_seen_subcommand_from use" -a system -d "Use system PHP"
 
 # Complete binaries for which command
 complete -c phpenv -f -n "__fish_seen_subcommand_from which" -a "(__phpenv_complete_binaries)" -d "PHP binary"
 
 # Complete config subcommands
 complete -c phpenv -f -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from get set list" \
-    -a "get" -d "Get configuration value"
+    -a get -d "Get configuration value"
 complete -c phpenv -f -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from get set list" \
-    -a "set" -d "Set configuration value"
+    -a set -d "Set configuration value"
 complete -c phpenv -f -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from get set list" \
-    -a "list" -d "List all configuration"
+    -a list -d "List all configuration"
 
 # Complete config keys
 complete -c phpenv -f -n "__fish_seen_subcommand_from config; and __fish_seen_subcommand_from get set" \
@@ -91,27 +91,27 @@ complete -c phpenv -f \
 complete -c phpenv -f \
     -n "__fish_seen_subcommand_from extensions ext" \
     -n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
-    -a "install" -d "Install PHP extension"
+    -a install -d "Install PHP extension"
 complete -c phpenv -f \
     -n "__fish_seen_subcommand_from extensions ext" \
     -n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
-    -a "uninstall" -d "Uninstall PHP extension"
+    -a uninstall -d "Uninstall PHP extension"
 complete -c phpenv -f \
     -n "__fish_seen_subcommand_from extensions ext" \
     -n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
-    -a "remove" -d "Remove PHP extension"
+    -a remove -d "Remove PHP extension"
 complete -c phpenv -f \
     -n "__fish_seen_subcommand_from extensions ext" \
     -n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
-    -a "list" -d "List installed extensions"
+    -a list -d "List installed extensions"
 complete -c phpenv -f \
     -n "__fish_seen_subcommand_from extensions ext" \
     -n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
-    -a "ls" -d "List installed extensions"
+    -a ls -d "List installed extensions"
 complete -c phpenv -f \
     -n "__fish_seen_subcommand_from extensions ext" \
     -n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
-    -a "available" -d "Show available extensions"
+    -a available -d "Show available extensions"
 
 # Complete extension names
 complete -c phpenv -f \

config/fish/conf.d/phpenv.fish

@@ -23,7 +23,7 @@ if not set -q PHPENV_AUTO_SWITCH
 end
 
 if not set -q PHPENV_DEFAULT_EXTENSIONS
-    set -g PHPENV_DEFAULT_EXTENSIONS "opcache"
+    set -g PHPENV_DEFAULT_EXTENSIONS opcache
 end
 
 # Initialize PATH on shell startup if global version is set (less aggressive)

config/fish/conf.d/rustup.fish

@@ -0,0 +1 @@
+source "/home/ivuorinen/.local/share/cargo/env.fish"

config/fish/config.fish

@@ -21,6 +21,7 @@ if status is-interactive
         source "$HOME/.config/op/plugins.sh"
 
     # version manager initializers
+    type -q mise; and source (mise activate fish|psub)
     type -q rbenv; and source (rbenv init -|psub)
     type -q pyenv; and source (pyenv init -|psub)
     type -q pyenv; and source (pyenv virtualenv-init -|psub)

config/fish/exports.fish

@@ -17,6 +17,9 @@ set -q HOSTNAME; or set -x HOSTNAME (hostname -s)
 # Add local bin to path
 fish_add_path "$XDG_BIN_HOME"
 
+# Add mise shims to path
+fish_add_path "$XDG_DATA_HOME/mise/shims"
+
 # Add cargo bin to path
 fish_add_path "$XDG_SHARE_HOME/cargo/bin"
 

config/fish/functions/__bass.py

@@ -7,65 +7,67 @@ To be used with a companion fish function like this:
 
 """
 
-from __future__ import print_function
-
 import json
 import os
 import signal
 import subprocess
 import sys
-import traceback
 
-
+BASH = "bash"
-BASH = 'bash'
 
 FISH_READONLY = [
-    'PWD', 'SHLVL', 'history', 'pipestatus', 'status', 'version',
+    "PWD",
-    'FISH_VERSION', 'fish_pid', 'hostname', '_', 'fish_private_mode'
+    "SHLVL",
+    "history",
+    "pipestatus",
+    "status",
+    "version",
+    "FISH_VERSION",
+    "fish_pid",
+    "hostname",
+    "_",
+    "fish_private_mode",
 ]
 
-IGNORED = [
+IGNORED = ["PS1", "XPC_SERVICE_NAME"]
- 'PS1', 'XPC_SERVICE_NAME'
+
-]
 
 def ignored(name):
-    if name == 'PWD':  # this is read only, but has special handling
+    if name == "PWD":  # this is read only, but has special handling
         return False
     # ignore other read only variables
     if name in FISH_READONLY:
         return True
     if name in IGNORED or name.startswith("BASH_FUNC"):
         return True
-    if name.startswith('%'):
+    return name.startswith("%")
-        return True
+
-    return False
 
 def escape(string):
     # use json.dumps to reliably escape quotes and backslashes
-    return json.dumps(string).replace(r'$', r'\$')
+    return json.dumps(string).replace(r"$", r"\$")
+
 
 def escape_identifier(word):
-    return escape(word.replace('?', '\\?'))
+    return escape(word.replace("?", "\\?"))
+
 
 def comment(string):
-    return '\n'.join(['# ' + line for line in string.split('\n')])
+    return "\n".join(["# " + line for line in string.split("\n")])
+
 
 def gen_script():
     # Use the following instead of /usr/bin/env to read environment so we can
     # deal with multi-line environment variables (and other odd cases).
-    env_reader = "%s -c 'import os,json; print(json.dumps({k:v for k,v in os.environ.items()}))'" % (sys.executable)
+    env_reader = f"{sys.executable} -c 'import os,json; print(json.dumps({{k:v for k,v in os.environ.items()}}))'"
-    args = [BASH, '-c', env_reader]
+    args = [BASH, "-c", env_reader]
     output = subprocess.check_output(args, universal_newlines=True)
     old_env = output.strip()
 
     pipe_r, pipe_w = os.pipe()
-    if sys.version_info >= (3, 4):
+    os.set_inheritable(pipe_w, True)
-      os.set_inheritable(pipe_w, True)
+    command = f"eval $1 && ({env_reader}; alias) >&{pipe_w}"
-    command = 'eval $1 && ({}; alias) >&{}'.format(
+    args = [BASH, "-c", command, "bass", " ".join(sys.argv[1:])]
-        env_reader,
-        pipe_w
-    )
-    args = [BASH, '-c', command, 'bass', ' '.join(sys.argv[1:])]
     p = subprocess.Popen(args, universal_newlines=True, close_fds=False)
     os.close(pipe_w)
     with os.fdopen(pipe_r) as f:
@@ -73,9 +75,7 @@ def gen_script():
         alias_str = f.read()
     if p.wait() != 0:
         raise subprocess.CalledProcessError(
-            returncode=p.returncode,
+            returncode=p.returncode, cmd=" ".join(sys.argv[1:]), output=new_env + alias_str
-            cmd=' '.join(sys.argv[1:]),
-            output=new_env + alias_str
         )
     new_env = new_env.strip()
 
@@ -89,41 +89,41 @@ def gen_script():
             continue
         v1 = old_env.get(k)
         if not v1:
-            script_lines.append(comment('adding %s=%s' % (k, v)))
+            script_lines.append(comment(f"adding {k}={v}"))
         elif v1 != v:
-            script_lines.append(comment('updating %s=%s -> %s' % (k, v1, v)))
+            script_lines.append(comment(f"updating {k}={v1} -> {v}"))
             # process special variables
-            if k == 'PWD':
+            if k == "PWD":
-                script_lines.append('cd %s' % escape(v))
+                script_lines.append(f"cd {escape(v)}")
                 continue
         else:
             continue
-        if k == 'PATH':
+        if k == "PATH":  # noqa: SIM108
-            value = ' '.join([escape(directory)
+            value = " ".join([escape(directory) for directory in v.split(":")])
-                              for directory in v.split(':')])
         else:
             value = escape(v)
-        script_lines.append('set -g -x %s %s' % (k, value))
+        script_lines.append(f"set -g -x {k} {value}")
 
     for var in set(old_env.keys()) - set(new_env.keys()):
-        script_lines.append(comment('removing %s' % var))
+        script_lines.append(comment(f"removing {var}"))
-        script_lines.append('set -e %s' % var)
+        script_lines.append(f"set -e {var}")
 
-    script = '\n'.join(script_lines)
+    script = "\n".join(script_lines)
 
     alias_lines = []
     for line in alias_str.splitlines():
         _, rest = line.split(None, 1)
         k, v = rest.split("=", 1)
         alias_lines.append("alias " + escape_identifier(k) + "=" + v)
-    alias = '\n'.join(alias_lines)
+    alias = "\n".join(alias_lines)
 
-    return script + '\n' + alias
+    return script + "\n" + alias
 
-script_file = os.fdopen(3, 'w')
+
+script_file = os.fdopen(3, "w")
 
 if not sys.argv[1:]:
-    print('__bass_usage', file=script_file, end='')
+    print("__bass_usage", file=script_file, end="")
     sys.exit(0)
 
 try:
@@ -131,8 +131,8 @@ try:
 except subprocess.CalledProcessError as e:
     sys.exit(e.returncode)
 except Exception:
-    print('Bass internal error!', file=sys.stderr)
+    print("Bass internal error!", file=sys.stderr)
-    raise # traceback will output to stderr
+    raise  # traceback will output to stderr
 except KeyboardInterrupt:
     signal.signal(signal.SIGINT, signal.SIG_DFL)
     os.kill(os.getpid(), signal.SIGINT)

config/fish/functions/fisher.fish

@@ -8,8 +8,8 @@ function fisher --argument-names cmd --description "A plugin manager for Fish"
             echo "fisher, version $fisher_version"
         case "" -h --help
             echo "Usage: fisher install   <plugins...>  Install plugins"
-            echo "       fisher remove    <plugins...>  Remove installed plugins" 
+            echo "       fisher remove    <plugins...>  Remove installed plugins"
-            echo "       fisher uninstall <plugins...>  Remove installed plugins (alias)" 
+            echo "       fisher uninstall <plugins...>  Remove installed plugins (alias)"
             echo "       fisher update    <plugins...>  Update installed plugins"
             echo "       fisher update                  Update all installed plugins"
             echo "       fisher list    [<regex>]       List installed plugins matching regex"
@@ -41,7 +41,7 @@ function fisher --argument-names cmd --description "A plugin manager for Fish"
                     echo "fisher: \"$fish_plugins\" file not found: \"$cmd\"" >&2 && return 1
                 end
                 set arg_plugins $file_plugins
-            else if test "$cmd" = install && ! set --query old_plugins[1] 
+            else if test "$cmd" = install && ! set --query old_plugins[1]
                 set --append arg_plugins $file_plugins
             end
 

config/fish/functions/phpenv.fish

@@ -103,7 +103,7 @@ end
 
 function __phpenv_find_version_file -a phpenv_filename
     set -l phpenv_dir (pwd)
-    while test "$phpenv_dir" != "/"
+    while test "$phpenv_dir" != /
         if test -f "$phpenv_dir/$phpenv_filename"
             echo "$phpenv_dir/$phpenv_filename"
             return
@@ -130,13 +130,13 @@ function __phpenv_parse_composer_version
     end
 
     set -l phpenv_platform_php (jq -r '.config.platform.php // empty' composer.json 2>/dev/null)
-    if test $status -eq 0 -a -n "$phpenv_platform_php" -a "$phpenv_platform_php" != "null"
+    if test $status -eq 0 -a -n "$phpenv_platform_php" -a "$phpenv_platform_php" != null
         echo $phpenv_platform_php
         return
     end
 
     set -l phpenv_require_php (jq -r '.require.php // empty' composer.json 2>/dev/null)
-    if test $status -eq 0 -a -n "$phpenv_require_php" -a "$phpenv_require_php" != "null"
+    if test $status -eq 0 -a -n "$phpenv_require_php" -a "$phpenv_require_php" != null
         __phpenv_parse_semver_constraint $phpenv_require_php
         return
     end
@@ -196,7 +196,7 @@ set -g __phpenv_version_cache_time 0
 
 function __phpenv_get_version_info
     set -l current_time (date +%s)
-    set -l cache_duration 300  # 5 minutes
+    set -l cache_duration 300 # 5 minutes
 
     # Return cached version if still valid
     if test -n "$__phpenv_version_cache"
@@ -236,12 +236,12 @@ end
 # Check if Ondřej PPA is configured on the system
 function __phpenv_has_ondrej_ppa
     if test -d /etc/apt/sources.list.d
-        if grep -rq "ondrej/php" /etc/apt/sources.list.d/ 2>/dev/null
+        if grep -rq ondrej/php /etc/apt/sources.list.d/ 2>/dev/null
             return 0
         end
     end
     if test -f /etc/apt/sources.list
-        if grep -q "ondrej/php" /etc/apt/sources.list 2>/dev/null
+        if grep -q ondrej/php /etc/apt/sources.list 2>/dev/null
             return 0
         end
     end
@@ -262,34 +262,34 @@ function __phpenv_get_provider
     end
 
     # macOS always uses Homebrew
-    if test (uname -s) = "Darwin"
+    if test (uname -s) = Darwin
-        echo "homebrew"
+        echo homebrew
         return 0
     end
 
     # Linux: check for apt with Ondřej PPA first
-    if test (uname -s) = "Linux"
+    if test (uname -s) = Linux
         if command -q apt-get; and __phpenv_has_ondrej_ppa
-            echo "apt"
+            echo apt
             return 0
         end
 
         # Fall back to Homebrew (Linuxbrew) if available
         if command -q brew
-            echo "homebrew"
+            echo homebrew
             return 0
         end
 
         # If apt is available but no PPA yet, still use apt provider
         # (it will prompt to add the PPA when needed)
         if command -q apt-get
-            echo "apt"
+            echo apt
             return 0
         end
     end
 
     # Default fallback
-    echo "homebrew"
+    echo homebrew
     return 0
 end
 
@@ -319,7 +319,7 @@ function __phpenv_provider_homebrew_ensure_source
     end
 
     # Check and add required taps only if missing
-    set -l required_taps "shivammathur/php" "shivammathur/extensions"
+    set -l required_taps shivammathur/php shivammathur/extensions
     for tap in $required_taps
         if not brew tap | grep -qx $tap 2>/dev/null
             if not brew tap $tap 2>/dev/null
@@ -343,7 +343,7 @@ function __phpenv_provider_homebrew_list_installed
                     continue
                 end
 
-                if test "$phpenv_basename" = "php"
+                if test "$phpenv_basename" = php
                     set -l phpenv_latest (__phpenv_parse_version_field "latest" "8.4")
                     set -a phpenv_versions $phpenv_latest
                 else if echo $phpenv_basename | grep -qE '^php@[0-9]+\.[0-9]+$'
@@ -375,7 +375,7 @@ function __phpenv_provider_homebrew_list_available
             continue
         end
 
-        if test "$phpenv_clean_name" = "php"
+        if test "$phpenv_clean_name" = php
             set -a phpenv_versions "$phpenv_latest_version (latest)"
         else if echo $phpenv_clean_name | grep -qE '^php@[0-9]+\.[0-9]+$'
             set -l phpenv_version (echo $phpenv_clean_name | sed 's/php@//')
@@ -502,7 +502,7 @@ function __phpenv_provider_homebrew_ext_list -a phpenv_version
         for phpenv_ext_dir in $phpenv_cellar_path/*@$phpenv_version
             if test -d $phpenv_ext_dir
                 set -l phpenv_ext_name (basename $phpenv_ext_dir | sed "s/@$phpenv_version//")
-                if test "$phpenv_ext_name" != "php"
+                if test "$phpenv_ext_name" != php
                     echo $phpenv_ext_name
                 end
             end
@@ -574,7 +574,7 @@ function __phpenv_provider_apt_ensure_source
     echo ""
     read -P "Add ppa:ondrej/php? [y/N] " -l confirm
 
-    if test "$confirm" = "y" -o "$confirm" = "Y"
+    if test "$confirm" = y -o "$confirm" = Y
         echo "Adding ppa:ondrej/php..."
         if command -q add-apt-repository
             if sudo add-apt-repository -y ppa:ondrej/php
@@ -603,8 +603,7 @@ function __phpenv_provider_apt_list_installed
         return 1
     end
 
-    dpkg -l 'php[0-9]*-cli' 2>/dev/null | grep '^ii' | \
+    dpkg -l 'php[0-9]*-cli' 2>/dev/null | grep '^ii' | sed -E 's/^ii\s+php([0-9]+\.[0-9]+)-cli.*/\1/' | sort -V | uniq
-        sed -E 's/^ii\s+php([0-9]+\.[0-9]+)-cli.*/\1/' | sort -V | uniq
 end
 
 function __phpenv_provider_apt_list_available
@@ -613,8 +612,7 @@ function __phpenv_provider_apt_list_available
         return
     end
 
-    apt-cache search '^php[0-9]+\.[0-9]+-cli$' 2>/dev/null | \
+    apt-cache search '^php[0-9]+\.[0-9]+-cli$' 2>/dev/null | sed -E 's/^php([0-9]+\.[0-9]+)-cli.*/\1/' | sort -V | uniq
-        sed -E 's/^php([0-9]+\.[0-9]+)-cli.*/\1/' | sort -V | uniq
 end
 
 function __phpenv_provider_apt_get_php_path -a phpenv_version
@@ -644,7 +642,7 @@ function __phpenv_provider_apt_get_php_path -a phpenv_version
             set -l temp_link "$target.$fish_pid"
             ln -s "$source" "$temp_link" 2>/dev/null
             and mv -f "$temp_link" "$target" 2>/dev/null
-        else if test "$binary" = "phar"; and test -x "/usr/bin/phar$phpenv_version"
+        else if test "$binary" = phar; and test -x "/usr/bin/phar$phpenv_version"
             set -l temp_link "$target.$fish_pid"
             ln -s "/usr/bin/phar$phpenv_version" "$temp_link" 2>/dev/null
             and mv -f "$temp_link" "$target" 2>/dev/null
@@ -819,8 +817,7 @@ function __phpenv_provider_apt_ext_list -a phpenv_version
     # Filter out core packages (cli, common, etc.)
     set -l core_packages cli common opcache fpm cgi phpdbg
 
-    dpkg -l "php$phpenv_version-*" 2>/dev/null | grep '^ii' | awk '{print $2}' | \
+    dpkg -l "php$phpenv_version-*" 2>/dev/null | grep '^ii' | awk '{print $2}' | sed "s/php$phpenv_version-//" | while read ext
-        sed "s/php$phpenv_version-//" | while read ext
         # Skip core packages
         set -l is_core 0
         for core in $core_packages
@@ -837,9 +834,7 @@ end
 
 function __phpenv_provider_apt_ext_available -a phpenv_version
     # List available extensions from apt cache
-    apt-cache search "^php$phpenv_version-" 2>/dev/null | \
+    apt-cache search "^php$phpenv_version-" 2>/dev/null | sed "s/php$phpenv_version-//" | awk '{print $1}' | grep -v -E '^(cli|common|fpm|cgi|phpdbg|dev)$' | sort | uniq
-        sed "s/php$phpenv_version-//" | awk '{print $1}' | \
-        grep -v -E '^(cli|common|fpm|cgi|phpdbg|dev)$' | sort | uniq
 end
 
 function __phpenv_provider_apt_get_path_pattern
@@ -979,9 +974,9 @@ end
 function __phpenv_resolve_version_alias -a phpenv_version
     switch $phpenv_version
         case latest
-            __phpenv_parse_version_field "latest" "8.4"
+            __phpenv_parse_version_field latest "8.4"
         case nightly
-            __phpenv_parse_version_field "nightly" "8.5"
+            __phpenv_parse_version_field nightly "8.5"
         case '8.x'
             __phpenv_parse_version_field "8.x" "8.4"
         case '7.x'
@@ -997,7 +992,7 @@ function __phpenv_get_formula_name -a phpenv_version
     set -l phpenv_latest_version (__phpenv_parse_version_field "latest" "8.4")
 
     if test "$phpenv_version" = "$phpenv_latest_version"
-        echo "shivammathur/php/php"
+        echo shivammathur/php/php
     else
         echo "shivammathur/php/php@$phpenv_version"
     end
@@ -1140,7 +1135,7 @@ function __phpenv_use
     set -l phpenv_version $argv[1]
 
     # Handle special case: restore system PHP
-    if test "$phpenv_version" = "system"
+    if test "$phpenv_version" = system
         __phpenv_restore_system_path
         echo "Restored system PHP"
         return 0
@@ -1157,7 +1152,7 @@ function __phpenv_use
     end
 
     if not __phpenv_is_version_installed $phpenv_version
-        if test "$(__phpenv_config_get auto-install)" = "true"
+        if test "$(__phpenv_config_get auto-install)" = true
             __phpenv_install $phpenv_version
         else
             echo "PHP $phpenv_version is not installed. Install with: phpenv install $phpenv_version"
@@ -1179,7 +1174,7 @@ function __phpenv_local -a phpenv_version
         return 1
     end
 
-    echo $phpenv_version > .php-version
+    echo $phpenv_version >.php-version
     echo "Set local PHP version to $phpenv_version"
 end
 
@@ -1272,7 +1267,7 @@ function __phpenv_get_tap_versions
             continue
         end
 
-        if test "$phpenv_clean_name" = "php"
+        if test "$phpenv_clean_name" = php
             set -a phpenv_versions "$phpenv_latest_version (latest)"
         else if echo $phpenv_clean_name | grep -qE '^php@[0-9]+\.[0-9]+$'
             set -l phpenv_version (echo $phpenv_clean_name | sed 's/php@//')
@@ -1310,7 +1305,7 @@ function __phpenv_doctor
 
     # Show provider information
     set -l provider (__phpenv_get_provider)
-    set -l provider_source "auto-detected"
+    set -l provider_source auto-detected
     if set -q PHPENV_PROVIDER; and test -n "$PHPENV_PROVIDER"
         set provider_source "PHPENV_PROVIDER override"
     end
@@ -1429,7 +1424,7 @@ function __phpenv_config_get -a phpenv_key
         end
     end
 
-    if test "$argv[2]" = "--verbose"
+    if test "$argv[2]" = --verbose
         if test -n "$phpenv_value"
             echo "$phpenv_key = $phpenv_value (from $phpenv_source)"
         else
@@ -1581,19 +1576,18 @@ function __phpenv_get_tap_formulas -a tap_name
         return 1
     end
 
-    brew tap-info $tap_name --json 2>/dev/null | \
+    brew tap-info $tap_name --json 2>/dev/null | jq -r '.[]|(.formula_names[]?)' 2>/dev/null
-        jq -r '.[]|(.formula_names[]?)' 2>/dev/null
 end
 
 function __phpenv_get_available_extensions
-    __phpenv_get_tap_formulas "shivammathur/extensions"
+    __phpenv_get_tap_formulas shivammathur/extensions
 end
 
 function __phpenv_extension_available -a phpenv_extension phpenv_version
     set -l phpenv_available_extensions (__phpenv_get_available_extensions)
 
     if test -z "$phpenv_available_extensions"
-        return 0  # Assume available if can't check
+        return 0 # Assume available if can't check
     end
 
     for phpenv_ext_formula in $phpenv_available_extensions
@@ -1695,7 +1689,7 @@ function __phpenv_auto_switch --on-variable PWD
     end
 
     set -l phpenv_auto_switch (__phpenv_config_get auto-switch)
-    if test "$phpenv_auto_switch" = "false"
+    if test "$phpenv_auto_switch" = false
         return 0
     end
 
@@ -1718,7 +1712,7 @@ function __phpenv_auto_switch --on-variable PWD
         set -g PHPENV_LAST_SWITCH_TIME $phpenv_current_time
     else
         set -l phpenv_auto_install (__phpenv_config_get auto-install)
-        if test "$phpenv_auto_install" = "true"
+        if test "$phpenv_auto_install" = true
             echo "Auto-installing PHP $phpenv_new_version..."
             if phpenv install "$phpenv_new_version"
                 set -g PHPENV_LAST_SWITCH_TIME $phpenv_current_time
@@ -1771,7 +1765,7 @@ function __phpenv_help
 end
 
 function __phpenv_validate_boolean -a phpenv_value
-    test "$phpenv_value" = "true" -o "$phpenv_value" = "false"
+    test "$phpenv_value" = true -o "$phpenv_value" = false
 end
 
 function __phpenv_validate_version -a phpenv_version

config/fish/themes/Catppuccin Frappe.theme

@@ -58,4 +58,3 @@ fish_pager_color_progress 737994
 fish_pager_color_prefix f4b8e4
 fish_pager_color_completion c6d0f5
 fish_pager_color_description 737994
-

config/fish/themes/Catppuccin Macchiato.theme

@@ -58,4 +58,3 @@ fish_pager_color_progress 6e738d
 fish_pager_color_prefix f5bde6
 fish_pager_color_completion cad3f5
 fish_pager_color_description 6e738d
-

config/fish/themes/Catppuccin Mocha.theme

@@ -58,4 +58,3 @@ fish_pager_color_progress 6c7086
 fish_pager_color_prefix f5c2e7
 fish_pager_color_completion cdd6f4
 fish_pager_color_description 6c7086
-

config/flipperdevices.com/qFlipper.ini

@@ -1,6 +0,0 @@
-[General]
-ApplicationUpdateChannel=release
-CheckApplicatonUpdates=true
-FirmwareUpdateChannel=release
-LastFolderUrl=/Users/ivuorinen
-ShowHiddenFiles=false

config/fzf/completion.bash

@@ -13,32 +13,37 @@
 if [[ $- =~ i ]]; then
 
   # To use custom commands instead of find, override _fzf_compgen_{path,dir}
-  if ! declare -f _fzf_compgen_path >/dev/null; then
+  if ! declare -f _fzf_compgen_path > /dev/null; then
-    _fzf_compgen_path() {
+    _fzf_compgen_path()
+    {
       echo "$1"
       command find -L "$1" \
         -name .git -prune -o -name .hg -prune -o -name .svn -prune -o \( -type d -o -type f -o -type l \) \
-        -a -not -path "$1" -print 2>/dev/null | sed 's@^\./@@'
+        -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@'
     }
   fi
 
-  if ! declare -f _fzf_compgen_dir >/dev/null; then
+  if ! declare -f _fzf_compgen_dir > /dev/null; then
-    _fzf_compgen_dir() {
+    _fzf_compgen_dir()
+    {
       command find -L "$1" \
         -name .git -prune -o -name .hg -prune -o -name .svn -prune -o -type d \
-        -a -not -path "$1" -print 2>/dev/null | sed 's@^\./@@'
+        -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@'
     }
   fi
 
   ###########################################################
 
   # To redraw line after fzf closes (printf '\e[5n')
-  bind '"\e[0n": redraw-current-line' 2>/dev/null
+  bind '"\e[0n": redraw-current-line' 2> /dev/null
 
-  __fzf_comprun() {
+  __fzf_comprun()
+  {
     if [[ "$(type -t _fzf_comprun 2>&1)" = function ]]; then
       _fzf_comprun "$@"
-    elif [[ -n "${TMUX_PANE-}" ]] && { [[ "${FZF_TMUX:-0}" != 0 ]] || [[ -n "${FZF_TMUX_OPTS-}" ]]; }; then
+    elif [[ -n "${TMUX_PANE-}" ]] && {
+      [[ "${FZF_TMUX:-0}" != 0 ]] || [[ -n "${FZF_TMUX_OPTS-}" ]]
+    }; then
       shift
       fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- "$@"
     else
@@ -47,7 +52,8 @@ if [[ $- =~ i ]]; then
     fi
   }
 
-  __fzf_orig_completion() {
+  __fzf_orig_completion()
+  {
     local l comp f cmd
     while read -r l; do
       if [[ "$l" =~ ^(.*\ -F)\ *([^ ]*).*\ ([^ ]*)$ ]]; then
@@ -63,7 +69,8 @@ if [[ $- =~ i ]]; then
     done
   }
 
-  _fzf_opts_completion() {
+  _fzf_opts_completion()
+  {
     local cur prev opts
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
@@ -112,18 +119,18 @@ if [[ $- =~ i ]]; then
     --sync"
 
     case "${prev}" in
-    --tiebreak)
+      --tiebreak)
-      COMPREPLY=($(compgen -W "length begin end index" -- "$cur"))
+        COMPREPLY=($(compgen -W "length begin end index" -- "$cur"))
-      return 0
+        return 0
-      ;;
+        ;;
-    --color)
+      --color)
-      COMPREPLY=($(compgen -W "dark light 16 bw" -- "$cur"))
+        COMPREPLY=($(compgen -W "dark light 16 bw" -- "$cur"))
-      return 0
+        return 0
-      ;;
+        ;;
-    --history)
+      --history)
-      COMPREPLY=()
+        COMPREPLY=()
-      return 0
+        return 0
-      ;;
+        ;;
     esac
 
     if [[ "$cur" =~ ^-|\+ ]]; then
@@ -134,7 +141,8 @@ if [[ $- =~ i ]]; then
     return 0
   }
 
-  _fzf_handle_dynamic_completion() {
+  _fzf_handle_dynamic_completion()
+  {
     local cmd orig_var orig ret orig_cmd orig_complete
     cmd="$1"
     shift
@@ -142,15 +150,15 @@ if [[ $- =~ i ]]; then
     orig_var="_fzf_orig_completion_$cmd"
     orig="${!orig_var-}"
     orig="${orig##*#}"
-    if [[ -n "$orig" ]] && type "$orig" >/dev/null 2>&1; then
+    if [[ -n "$orig" ]] && type "$orig" > /dev/null 2>&1; then
       $orig "$@"
     elif [[ -n "${_fzf_completion_loader-}" ]]; then
-      orig_complete=$(complete -p "$orig_cmd" 2>/dev/null)
+      orig_complete=$(complete -p "$orig_cmd" 2> /dev/null)
       _completion_loader "$@"
       ret=$?
       # _completion_loader may not have updated completion for the command
-      if [[ "$(complete -p "$orig_cmd" 2>/dev/null)" != "$orig_complete" ]]; then
+      if [[ "$(complete -p "$orig_cmd" 2> /dev/null)" != "$orig_complete" ]]; then
-        __fzf_orig_completion < <(complete -p "$orig_cmd" 2>/dev/null)
+        __fzf_orig_completion < <(complete -p "$orig_cmd" 2> /dev/null)
         if [[ "${__fzf_nospace_commands-}" = *" $orig_cmd "* ]]; then
           eval "${orig_complete/ -F / -o nospace -F }"
         else
@@ -161,7 +169,8 @@ if [[ $- =~ i ]]; then
     fi
   }
 
-  __fzf_generic_path_completion() {
+  __fzf_generic_path_completion()
+  {
     local cur base dir leftover matches trigger cmd
     cmd="${COMP_WORDS[0]}"
     if [[ $cmd == \\* ]]; then
@@ -207,7 +216,8 @@ if [[ $- =~ i ]]; then
     fi
   }
 
-  _fzf_complete() {
+  _fzf_complete()
+  {
     # Split arguments around --
     local args rest str_arg i sep
     args=("$@")
@@ -231,7 +241,7 @@ if [[ $- =~ i ]]; then
 
     local cur selected trigger cmd post
     post="$(caller 0 | awk '{print $2}')_post"
-    type -t "$post" >/dev/null 2>&1 || post=cat
+    type -t "$post" > /dev/null 2>&1 || post=cat
 
     cmd="${COMP_WORDS[0]//[^A-Za-z0-9_=]/_}"
     trigger=${FZF_COMPLETION_TRIGGER-'**'}
@@ -253,50 +263,59 @@ if [[ $- =~ i ]]; then
     fi
   }
 
-  _fzf_path_completion() {
+  _fzf_path_completion()
+  {
     __fzf_generic_path_completion _fzf_compgen_path "-m" "" "$@"
   }
 
   # Deprecated. No file only completion.
-  _fzf_file_completion() {
+  _fzf_file_completion()
+  {
     _fzf_path_completion "$@"
   }
 
-  _fzf_dir_completion() {
+  _fzf_dir_completion()
+  {
     __fzf_generic_path_completion _fzf_compgen_dir "" "/" "$@"
   }
 
-  _fzf_complete_kill() {
+  _fzf_complete_kill()
+  {
     _fzf_proc_completion "$@"
   }
 
-  _fzf_proc_completion() {
+  _fzf_proc_completion()
+  {
     _fzf_complete -m --header-lines=1 --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <(
-      command ps -eo user,pid,ppid,start,time,command 2>/dev/null ||
+      command ps -eo user,pid,ppid,start,time,command 2> /dev/null \
-        command ps -eo user,pid,ppid,time,args # For BusyBox
+        || command ps -eo user,pid,ppid,time,args # For BusyBox
     )
   }
 
-  _fzf_proc_completion_post() {
+  _fzf_proc_completion_post()
+  {
     awk '{print $2}'
   }
 
-  _fzf_host_completion() {
+  _fzf_host_completion()
+  {
     _fzf_complete +m -- "$@" < <(
-      command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2>/dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?%]') \
+      command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?%]') \
         <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \
-        <(command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0') |
+        <(command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0') \
-        awk '{if (length($2) > 0) {print $2}}' | sort -u
+        | awk '{if (length($2) > 0) {print $2}}' | sort -u
     )
   }
 
-  _fzf_var_completion() {
+  _fzf_var_completion()
+  {
     _fzf_complete -m -- "$@" < <(
       declare -xp | sed -En 's|^declare [^ ]+ ([^=]+).*|\1|p'
     )
   }
 
-  _fzf_alias_completion() {
+  _fzf_alias_completion()
+  {
     _fzf_complete -m -- "$@" < <(
       alias | sed -En 's|^alias ([^=]+).*|\1|p'
     )
@@ -321,13 +340,14 @@ if [[ $- =~ i ]]; then
   svn tar unzip zip"
 
   # Preserve existing completion
-  __fzf_orig_completion < <(complete -p $d_cmds $a_cmds 2>/dev/null)
+  __fzf_orig_completion < <(complete -p $d_cmds $a_cmds 2> /dev/null)
 
-  if type _completion_loader >/dev/null 2>&1; then
+  if type _completion_loader > /dev/null 2>&1; then
     _fzf_completion_loader=1
   fi
 
-  __fzf_defc() {
+  __fzf_defc()
+  {
     local cmd func opts orig_var orig def
     cmd="$1"
     func="$2"
@@ -354,22 +374,23 @@ if [[ $- =~ i ]]; then
 
   unset cmd d_cmds a_cmds
 
-  _fzf_setup_completion() {
+  _fzf_setup_completion()
+  {
     local kind fn cmd
     kind=$1
     fn=_fzf_${1}_completion
-    if [[ $# -lt 2 ]] || ! type -t "$fn" >/dev/null; then
+    if [[ $# -lt 2 ]] || ! type -t "$fn" > /dev/null; then
       echo "usage: ${FUNCNAME[0]} path|dir|var|alias|host|proc COMMANDS..."
       return 1
     fi
     shift
-    __fzf_orig_completion < <(complete -p "$@" 2>/dev/null)
+    __fzf_orig_completion < <(complete -p "$@" 2> /dev/null)
     for cmd in "$@"; do
       case "$kind" in
-      dir) __fzf_defc "$cmd" "$fn" "-o nospace -o dirnames" ;;
+        dir) __fzf_defc "$cmd" "$fn" "-o nospace -o dirnames" ;;
-      var) __fzf_defc "$cmd" "$fn" "-o default -o nospace -v" ;;
+        var) __fzf_defc "$cmd" "$fn" "-o default -o nospace -v" ;;
-      alias) __fzf_defc "$cmd" "$fn" "-a" ;;
+        alias) __fzf_defc "$cmd" "$fn" "-a" ;;
-      *) __fzf_defc "$cmd" "$fn" "-o default -o bashdefault" ;;
+        *) __fzf_defc "$cmd" "$fn" "-o default -o bashdefault" ;;
       esac
     done
   }

config/fzf/fzf.bash

@@ -4,7 +4,7 @@
 # Auto-completion
 # ---------------
 # shellcheck source=completion.bash
-[[ $- == *i* ]] && source "$HOME/.dotfiles/config/fzf/completion.bash" 2>/dev/null
+[[ $- == *i* ]] && source "$HOME/.dotfiles/config/fzf/completion.bash" 2> /dev/null
 
 # Key bindings
 # ------------

config/fzf/key-bindings.bash

@@ -13,7 +13,8 @@
 
 # Key bindings
 # ------------
-__fzf_select__() {
+__fzf_select__()
+{
   local cmd opts
   cmd="${FZF_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
     -o -type f -print \
@@ -21,27 +22,32 @@ __fzf_select__() {
     -o -type l -print 2> /dev/null | cut -b3-"}"
   opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore --reverse ${FZF_DEFAULT_OPTS-} ${FZF_CTRL_T_OPTS-} -m"
   # shellcheck disable=SC2091 # Intentionally execute output of __fzfcmd
-  eval "$cmd" | FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) "$@" |
+  eval "$cmd" | FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) "$@" \
-    while read -r item; do
+    | while read -r item; do
       printf '%q ' "$item" # escape special chars
     done
 }
 
 if [[ $- =~ i ]]; then
 
-  __fzfcmd() {
+  __fzfcmd()
-    [[ -n "${TMUX_PANE-}" ]] && { [[ "${FZF_TMUX:-0}" != 0 ]] || [[ -n "${FZF_TMUX_OPTS-}" ]]; } &&
+  {
-      echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf"
+    [[ -n "${TMUX_PANE-}" ]] && {
+      [[ "${FZF_TMUX:-0}" != 0 ]] || [[ -n "${FZF_TMUX_OPTS-}" ]]
+    } \
+      && echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf"
   }
 
-  fzf-file-widget() {
+  fzf-file-widget()
+  {
     local selected
     selected="$(__fzf_select__ "$@")"
     READLINE_LINE="${READLINE_LINE:0:$READLINE_POINT}$selected${READLINE_LINE:$READLINE_POINT}"
     READLINE_POINT=$((READLINE_POINT + ${#selected}))
   }
 
-  __fzf_cd__() {
+  __fzf_cd__()
+  {
     local cmd opts dir
     cmd="${FZF_ALT_C_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
     -o -type d -print 2> /dev/null | cut -b3-"}"
@@ -53,16 +59,17 @@ if [[ $- =~ i ]]; then
     ) && printf 'builtin cd -- %q' "$dir"
   }
 
-  __fzf_history__() {
+  __fzf_history__()
+  {
     local output opts script
     opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} -n2..,.. --scheme=history --bind=ctrl-r:toggle-sort ${FZF_CTRL_R_OPTS-} +m --read0"
     script='BEGIN { getc; $/ = "\n\t"; $HISTCOUNT = $ENV{last_hist} + 1 } s/^[ *]//; print $HISTCOUNT - $. . "\t$_" if !$seen{$_}++'
     # shellcheck disable=SC2091 # Intentionally execute output of __fzfcmd
     output=$(
       set +o pipefail
-      builtin fc -lnr -2147483648 |
+      builtin fc -lnr -2147483648 \
-        last_hist=$(HISTTIMEFORMAT='' builtin history 1) perl -n -l0 -e "$script" |
+        | last_hist=$(HISTTIMEFORMAT='' builtin history 1) perl -n -l0 -e "$script" \
-        FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) --query "$READLINE_LINE"
+        | FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) --query "$READLINE_LINE"
     ) || return
     READLINE_LINE=${output#*$'\t'}
     if [[ -z "$READLINE_POINT" ]]; then

config/gh-dash/config.yml

@@ -52,4 +52,4 @@ keybindings:
   prs: []
 repoPaths: {}
 pager:
-  diff: ''
+  diff: ""

config/gh/config.yml

@@ -1,3 +1,3 @@
 ---
 git_protocol: https
-version: '1'
+version: "1"

config/gh/hosts.yml

@@ -1,6 +1,5 @@
----
 github.com:
-  git_protocol: https
+    git_protocol: ssh
-  users:
+    users:
-    ivuorinen:
+        ivuorinen:
-  user: ivuorinen
+    user: ivuorinen

config/ghostty/config

@@ -1,15 +0,0 @@
-# vim: ft=ghostty
-theme = "light:tokyonight-day,dark:tokyonight-storm"
-font-family = "JetBrainsMono Nerd Font Mono"
-
-background-blur-radius = 15
-background-opacity = 0.95
-
-clipboard-read = allow
-clipboard-write = allow
-cursor-style = bar
-custom-shader-animation = true
-gtk-single-instance = true
-mouse-hide-while-typing = true
-shell-integration-features = true
-window-theme = system

config/homebrew/Brewfile

@@ -260,8 +260,6 @@ brew "php@8.2", link: true
 brew "php@8.3"
 # Pins GitHub Actions to full hashes and versions
 brew "pinact"
-# Execute binaries from Python packages in isolated environments
-brew "pipx"
 # Python version management
 brew "pyenv"
 # Migrate pip packages from one Python version to another

config/htop/htoprc

@@ -1,54 +0,0 @@
-# Beware! This file is rewritten by htop when settings are changed in the interface.
-# The parser is also very primitive, and not human-friendly.
-htop_version=3.4.1
-config_reader_min_version=3
-fields=0 48 17 18 38 39 2 46 47 49 1
-hide_kernel_threads=1
-hide_userland_threads=0
-hide_running_in_container=0
-shadow_other_users=0
-show_thread_names=0
-show_program_path=1
-highlight_base_name=0
-highlight_deleted_exe=1
-shadow_distribution_path_prefix=0
-highlight_megabytes=1
-highlight_threads=1
-highlight_changes=0
-highlight_changes_delay_secs=5
-find_comm_in_cmdline=1
-strip_exe_from_cmdline=1
-show_merged_command=0
-header_margin=1
-screen_tabs=1
-detailed_cpu_time=0
-cpu_count_from_one=0
-show_cpu_usage=1
-show_cpu_frequency=0
-show_cached_memory=1
-update_process_names=0
-account_guest_in_cpu_meter=0
-color_scheme=0
-enable_mouse=1
-delay=15
-hide_function_bar=0
-header_layout=two_50_50
-column_meters_0=LeftCPUs2 Memory Swap
-column_meter_modes_0=1 1 1
-column_meters_1=RightCPUs2 Tasks LoadAverage Uptime
-column_meter_modes_1=1 2 2 2
-tree_view=0
-sort_key=46
-tree_sort_key=0
-sort_direction=-1
-tree_sort_direction=1
-tree_view_always_by_pid=0
-all_branches_collapsed=0
-screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command
-.sort_key=PERCENT_CPU
-.tree_sort_key=PID
-.tree_view_always_by_pid=0
-.tree_view=0
-.sort_direction=-1
-.tree_sort_direction=1
-.all_branches_collapsed=0

config/husky/init.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
-[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.config/nvm"
+[[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.config/nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+[[ -s "$NVM_DIR/nvm.sh" ]] && \. "$NVM_DIR/nvm.sh" # This loads nvm

config/misc/screenrc

@@ -1,15 +0,0 @@
-# Disable the startup message
-startup_message off
-
-# Set a large scrollback buffer
-defscrollback 32000
-
-# Always start `screen` with UTF-8 enabled (`screen -U`)
-defutf8 on
-
-# Scroll with mouse wheel (http://stackoverflow.com/a/1125947)
-termcapinfo xterm* ti@:te@
-
-# Some settings for screen + vim
-term xterm-256color
-maptimeout 10

config/nano/nanorc

@@ -1 +0,0 @@
-set tabsize 2

config/nbrc

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-###############################################################################
-# .nbrc
-#
-# Configuration file for `nb`, a command line note-taking, bookmarking,
-# and knowledge base application with encryption, search, Git-backed syncing,
-# and more in a single portable script.
-#
-# Edit this file manually or manage settings using the `nb settings`
-# subcommand. Configuration options are set as environment variables, eg:
-#   export NB_ENCRYPTION_TOOL=gpg
-#
-# https://github.com/xwmx/nb
-###############################################################################
-
-export NB_DIR="${NB_DIR:-$HOME/.local/state/nb}" # Set by `nb` • Mon May  8 15:25:12 EEST 2023
-
-export NB_COLOR_THEME="${NB_COLOR_THEME:-unicorn}" # Set by `nb` • Mon May  8 15:41:22 EEST 2023

config/nvim/lua/plugins/ui.lua

@@ -40,7 +40,8 @@ return {
           operators = {},
           -- miscs = {}, -- Uncomment to turn off hard-coded styles
         },
-        lsp_styles = { -- Handles the style of specific lsp hl groups (see `:h lsp-highlight`).
+        -- Style of specific lsp hl groups (`:h lsp-highlight`)
+        lsp_styles = {
           virtual_text = {
             errors = { 'italic' },
             hints = { 'italic' },
@@ -72,7 +73,8 @@ return {
             enabled = true,
             indentscope_color = '',
           },
-          -- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations)
+          -- More integrations:
+          -- github.com/catppuccin/nvim#integrations
         },
       }
 
@@ -115,7 +117,8 @@ return {
   {
     'dmtrKovalenko/fff.nvim',
     build = function()
-      -- this will download prebuild binary or try to use existing rustup toolchain to build from source
+      -- Downloads prebuild binary or uses rustup
+      -- toolchain to build from source
       -- (if you are using lazy you can use gb for rebuilding a plugin if needed)
       require('fff.download').download_or_build_binary()
     end,
@@ -124,7 +127,8 @@ return {
     opts = { -- (optional)
       debug = {
         enabled = true, -- we expect your collaboration at least during the beta
-        show_scores = true, -- to help us optimize the scoring system, feel free to share your scores!
+        -- Share scores to help optimize scoring
+        show_scores = true,
       },
     },
     -- No need to lazy-load with lazy.nvim.

config/shared.sh

@@ -5,7 +5,7 @@
 # shellcheck shell=bash
 
 # Defaults
-[ -z "$DOTFILES" ] && export DOTFILES="$HOME/.dotfiles"
+[[ -z "${DOTFILES:-}" ]] && export DOTFILES="$HOME/.dotfiles"
 DOTFILES_CURRENT_SHELL=$(basename "$SHELL")
 export DOTFILES_CURRENT_SHELL
 
@@ -15,7 +15,7 @@ VERBOSE="${VERBOSE:-0}"
 DEBUG="${DEBUG:-0}"
 
 # Enable debugging with DEBUG=1
-[ "${DEBUG:-0}" -eq 1 ] && set -x
+[[ "${DEBUG:-0}" -eq 1 ]] && set -x
 
 # Detect the current shell
 CURRENT_SHELL=$(ps -p $$ -ocomm= | awk -F/ '{print $NF}')
@@ -33,9 +33,10 @@ x-path-prepend()
       ;;
     *)
       echo "Unsupported shell: $CURRENT_SHELL"
-      exit 1
+      return 1
       ;;
   esac
+  return 0
 }
 
 # Function to set environment variables based on the shell
@@ -52,9 +53,10 @@ x-set-env()
       ;;
     *)
       echo "Unsupported shell: $CURRENT_SHELL"
-      exit 1
+      return 1
       ;;
   esac
+  return 0
 }
 
 # Explicitly set XDG folders, if not already set
@@ -74,16 +76,17 @@ x-path-prepend "$DOTFILES/local/bin"
 x-path-prepend "$XDG_BIN_HOME"
 
 # Custom completion paths
-[ -z "$ZSH_CUSTOM_COMPLETION_PATH" ] && export ZSH_CUSTOM_COMPLETION_PATH="$XDG_CONFIG_HOME/zsh/completion"
+[[ -z "${ZSH_CUSTOM_COMPLETION_PATH:-}" ]] && export ZSH_CUSTOM_COMPLETION_PATH="$XDG_CONFIG_HOME/zsh/completion"
 x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
-export FPATH="$ZSH_CUSTOM_COMPLETION_PATH:$FPATH"
+export FPATH="$ZSH_CUSTOM_COMPLETION_PATH:${FPATH:-}"
 
 if ! declare -f msg > /dev/null; then
   # Function to print messages if VERBOSE is enabled
   # $1 - message (string)
   msg()
   {
-    [ "$VERBOSE" -eq 1 ] && msgr msg "$1"
+    local message="$1"
+    [[ "$VERBOSE" -eq 1 ]] && msgr msg "$message"
     return 0
   }
   msg "msg was not defined, defined it now"
@@ -95,7 +98,8 @@ if ! declare -f msg_err > /dev/null; then
   # $1 - error message (string)
   msg_err()
   {
-    msgr err "$1" >&2
+    local message="$1"
+    msgr err "$message" >&2
     exit 1
   }
 fi
@@ -106,7 +110,8 @@ if ! declare -f msg_done > /dev/null; then
   # $1 - message (string)
   msg_done()
   {
-    msgr "done" "$1"
+    local message="$1"
+    msgr "done" "$message"
     return 0
   }
 fi
@@ -117,7 +122,8 @@ if ! declare -f msg_run > /dev/null; then
   # $1 - message (string)
   msg_run()
   {
-    msgr run "$1"
+    local message="$1"
+    msgr run "$message"
     return 0
   }
 fi
@@ -128,7 +134,8 @@ if ! declare -f msg_ok > /dev/null; then
   # $1 - message (string)
   msg_ok()
   {
-    msgr ok "$1"
+    local message="$1"
+    msgr ok "$message"
     return 0
   }
 fi
@@ -143,12 +150,16 @@ if ! declare -f array_diff > /dev/null; then
   # Source: https://stackoverflow.com/a/42399479/594940
   array_diff()
   {
+    local result_var="$1"
+    local arr1_name="$2"
+    local arr2_name="$3"
     # shellcheck disable=SC1083,SC2086
-    eval local ARR1=\(\"\${$2[@]}\"\)
+    eval local ARR1=\(\"\${${arr1_name}[@]}\"\)
     # shellcheck disable=SC1083,SC2086
-    eval local ARR2=\(\"\${$3[@]}\"\)
+    eval local ARR2=\(\"\${${arr2_name}[@]}\"\)
     local IFS=$'\n'
-    mapfile -t "$1" < <(comm -23 <(echo "${ARR1[*]}" | sort) <(echo "${ARR2[*]}" | sort))
+    mapfile -t "$result_var" < <(comm -23 <(echo "${ARR1[*]}" | sort) <(echo "${ARR2[*]}" | sort))
+    return 0
   }
 fi
 

config/starship.toml

@@ -1,154 +0,0 @@
-# Get editor completions based on the config schema
-"$schema" = 'https://starship.rs/config-schema.json'
-
-format = """
-$os\
-$directory\
-$git_branch\
-$git_state\
-$git_status\
-$fill \
-$battery\
-$username\
-$hostname\
-$aws\
-$gcloud\
-$conda\
-$golang\
-$nodejs\
-$php\
-$python\
-$package\
-$line_break\
-$character"""
-
-# Timeout for commands executed by starship (in milliseconds).
-command_timeout = 1500
-
-[character]
-success_symbol = "[→](bold green)"
-error_symbol   = "[→](red)"
-vimcmd_symbol  = "[←](green)"
-
-[aws]
-symbol = "  "
-format = '[$symbol($profile )(\($region\) )(\[$duration\] )]($style)'
-
-[cmd_duration]
-disabled = true
-
-[directory]
-read_only = " 󰌾"
-style = "blue"
-before_repo_root_style = "white"
-truncation_symbol = "…/"
-
-[docker_context]
-symbol = " "
-format = '[$symbol$context]($style) '
-
-[fill]
-symbol = '·'
-style = 'bold black'
-
-[gcloud]
-format = '[($symbol)$account(@$domain)(\($region\))]($style) '
-
-[git_branch]
-symbol = " "
-format = '[$symbol$branch(:$remote_branch)]($style) '
-truncation_length = 20
-truncation_symbol = '…'
-ignore_branches = ['master', 'main']
-
-[git_status]
-up_to_date = '✓'
-staged = '[++\($count\)](green)'
-
-[git_state]
-format = '\([$state( $progress_current/$progress_total)]($style)\) '
-style = "bright-black"
-
-[git_metrics]
-added_style = 'bold blue'
-format = '[+$added]($added_style)/[-$deleted]($deleted_style) '
-disabled = false
-
-[golang]
-symbol = " "
-format = '[$symbol($version )]($style) '
-
-[hostname]
-ssh_symbol = " "
-ssh_only = false
-format = '[$ssh_symbol](bold blue)[$hostname](bold red) '
-
-[lua]
-format = '[$symbol($version )]($style)'
-
-[nodejs]
-symbol = " "
-format = '[$symbol($version )]($style)'
-version_format = '${major}.${minor}'
-
-[os]
-format = "[$symbol]($style) "
-style = "bold blue"
-disabled = false
-
-[os.symbols]
-Alpaquita = " "
-Alpine = " "
-Amazon = " "
-Android = " "
-Arch = " "
-Artix = " "
-CentOS = " "
-Debian = " "
-DragonFly = " "
-Emscripten = " "
-EndeavourOS = " "
-Fedora = " "
-FreeBSD = " "
-Garuda = "󰛓 "
-Gentoo = " "
-HardenedBSD = "󰞌 "
-Illumos = "󰈸 "
-Linux = " "
-Mabox = " "
-Macos = " "
-Manjaro = " "
-Mariner = " "
-MidnightBSD = " "
-Mint = " "
-NetBSD = " "
-NixOS = " "
-OpenBSD = "󰈺 "
-openSUSE = " "
-OracleLinux = "󰌷 "
-Pop = " "
-Raspbian = " "
-Redhat = " "
-RedHatEnterprise = " "
-Redox = "󰀘 "
-Solus = "󰠳 "
-SUSE = " "
-Ubuntu = " "
-Unknown = " "
-Windows = "󰍲 "
-
-[package]
-symbol = "󰏗 "
-format = '[$symbol($version )]($style)'
-version_format = '${major}.${minor}'
-
-[php]
-format = '[$symbol($version )]($style)'
-version_format = '${major}.${minor}'
-
-[python]
-symbol = " "
-format = "[$virtualenv]($style) "
-
-[username]
-format = "[$user]($style) "

config/task/taskrc

@@ -1,81 +0,0 @@
-# [Created by task 2.6.2 5/11/2023 09:33:14]
-# Taskwarrior program configuration file.
-# For more documentation, see https://taskwarrior.org or try 'man task', 'man task-color',
-# 'man task-sync' or 'man taskrc'
-
-# Here is an example of entries that use the default, override and blank values
-#   variable=foo   -- By specifying a value, this overrides the default
-#   variable=      -- By specifying no value, this means no default
-#   #variable=foo  -- By commenting out the line, or deleting it, this uses the default
-
-# You can also refence environment variables:
-#   variable=$HOME/task
-#   variable=$VALUE
-
-# Use the command 'task show' to see all defaults and overrides
-
-# Files
-data.location=$XDG_DATA_HOME/task/
-
-# To use the default location of the XDG directories,
-# move this configuration file from ~/.taskrc to ~/.config/task/taskrc and uncomment below
-
-#data.location=$XDG_DATA_HOME/task
-#hooks.location=~/.config/task/hooks
-
-# Color theme (uncomment one to use)
-#include light-16.theme
-#include light-256.theme
-#include dark-16.theme
-#include dark-256.theme
-#include dark-red-256.theme
-#include dark-green-256.theme
-#include dark-blue-256.theme
-#include dark-violets-256.theme
-#include dark-yellow-green.theme
-#include dark-gray-256.theme
-#include dark-gray-blue-256.theme
-#include solarized-dark-256.theme
-#include solarized-light-256.theme
-#include no-color.theme
-
-weekstart=monday
-
-news.version=2.6.0
-
-default.project=Inbox
-calendar.details=full
-calendar.holidays=sparse
-recurrence=on
-
-uda.taskwarrior-tui.keyconfig.quit=q
-uda.taskwarrior-tui.keyconfig.refresh=r
-uda.taskwarrior-tui.keyconfig.go-to-bottom=G
-uda.taskwarrior-tui.keyconfig.go-to-top=g
-uda.taskwarrior-tui.keyconfig.down=j
-uda.taskwarrior-tui.keyconfig.up=k
-uda.taskwarrior-tui.keyconfig.page-down=J
-uda.taskwarrior-tui.keyconfig.page-up=K
-uda.taskwarrior-tui.keyconfig.delete=x
-uda.taskwarrior-tui.keyconfig.done=d
-uda.taskwarrior-tui.keyconfig.start-stop=s
-uda.taskwarrior-tui.keyconfig.quick-tag=t
-uda.taskwarrior-tui.keyconfig.undo=u
-uda.taskwarrior-tui.keyconfig.edit=e
-uda.taskwarrior-tui.keyconfig.modify=m
-uda.taskwarrior-tui.keyconfig.shell=!
-uda.taskwarrior-tui.keyconfig.log=l
-uda.taskwarrior-tui.keyconfig.add=a
-uda.taskwarrior-tui.keyconfig.annotate=A
-uda.taskwarrior-tui.keyconfig.filter=/
-uda.taskwarrior-tui.keyconfig.zoom=z
-uda.taskwarrior-tui.keyconfig.context-menu=c
-uda.taskwarrior-tui.keyconfig.next-tab=.
-uda.taskwarrior-tui.keyconfig.previous-tab=,
-
-taskd.certificate=$XDG_DATA_HOME/task/private.certificate.pem
-taskd.key=$XDG_DATA_HOME/task/private.key.pem
-taskd.ca=$XDG_DATA_HOME/task/ca.cert.pem
-taskd.server=inthe.am:53589
-taskd.credentials=inthe_am/ivuorinen/b99a4970-94fb-4fb8-b9fe-e1a8140dd44d
-taskd.trust=strict

config/tealdeer/config.toml

@@ -1,38 +0,0 @@
-[style.description]
-underline = false
-bold = false
-italic = false
-
-[style.command_name]
-foreground = "cyan"
-underline = false
-bold = false
-italic = false
-
-[style.example_text]
-foreground = "green"
-underline = false
-bold = false
-italic = false
-
-[style.example_code]
-foreground = "cyan"
-underline = false
-bold = false
-italic = false
-
-[style.example_variable]
-foreground = "cyan"
-underline = true
-bold = false
-italic = false
-
-[display]
-compact = false
-use_pager = false
-
-[updates]
-auto_update = false
-auto_update_interval_hours = 720
-
-[directories]

config/tms/config.toml

@@ -1,11 +0,0 @@
-default_session = "main"
-display_full_path = true
-
-[[search_dirs]]
-path = "~/Code"
-depth = 3
-
-[picker_colors]
-highlight_color = "#31748f"
-highlight_text_color = "#e0def4"
-border_color = "#524F67"

config/tmux/rename-session.sh

@@ -7,13 +7,13 @@ DEFAULT_NAME="main"
 CURRENT_SESSION=$(tmux display-message -p "#{session_name}")
 
 # Check that the session has a name
-if [ "$CURRENT_SESSION" = "#{session_name}" ] || [ "$CURRENT_SESSION" = "0" ]; then
+if [[ "$CURRENT_SESSION" = "#{session_name}" ]] || [[ "$CURRENT_SESSION" = "0" ]]; then
   # Check if the default name is already in use
   if tmux has-session -t "$DEFAULT_NAME" 2> /dev/null; then
     # Query the user for a new name
     echo "Session name '$DEFAULT_NAME' is already in use. Enter a new name:"
     read -r NEW_NAME
-    while tmux has-session -t "$NEW_NAME" 2> /dev/null || [ -z "$NEW_NAME" ]; do
+    while tmux has-session -t "$NEW_NAME" 2> /dev/null || [[ -z "$NEW_NAME" ]]; do
       echo "Name '$NEW_NAME' is invalid or already in use. Enter a new name:"
       read -r NEW_NAME
     done

config/tmux/sesh.sh

@@ -8,12 +8,14 @@
 set -euo pipefail
 
 # Fall back to native tmux session picker if sesh is not installed
-if ! command -v sesh &>/dev/null; then
+if ! command -v sesh &> /dev/null; then
   tmux choose-tree -Zs
   exit 0
 fi
 
-pick_with_gum() {
+# Pick a sesh session using gum filter
+pick_with_gum()
+{
   sesh list -i \
     | gum filter \
       --limit 1 \
@@ -22,6 +24,7 @@ pick_with_gum() {
       --placeholder 'Pick a sesh' \
       --height 50 \
       --prompt='⚡'
+  return 0
 }
 
 FZF_COMMON_OPTS=(
@@ -40,15 +43,23 @@ FZF_COMMON_OPTS=(
   --preview 'sesh preview {}'
 )
 
-pick_with_fzf_tmux() {
+# Pick a sesh session using fzf-tmux popup
+pick_with_fzf_tmux()
+{
   sesh list --icons | fzf-tmux -p 80%,70% "${FZF_COMMON_OPTS[@]}"
+  return 0
 }
 
-pick_with_fzf() {
+# Pick a sesh session using fzf inline
+pick_with_fzf()
+{
   sesh list --icons | fzf "${FZF_COMMON_OPTS[@]}"
+  return 0
 }
 
-pick_with_select() {
+# Pick a sesh session using bash select menu
+pick_with_select()
+{
   local sessions
   mapfile -t sessions < <(sesh list)
   if [[ ${#sessions[@]} -eq 0 ]]; then
@@ -64,11 +75,11 @@ pick_with_select() {
 }
 
 # Cascading tool detection
-if command -v gum &>/dev/null; then
+if command -v gum &> /dev/null; then
   selection=$(pick_with_gum)
-elif command -v fzf-tmux &>/dev/null; then
+elif command -v fzf-tmux &> /dev/null; then
   selection=$(pick_with_fzf_tmux)
-elif command -v fzf &>/dev/null; then
+elif command -v fzf &> /dev/null; then
   selection=$(pick_with_fzf)
 else
   selection=$(pick_with_select)

config/wezterm/wezterm.lua

@@ -10,7 +10,7 @@ config.color_scheme_dirs = {
 }
 
 -- Font and font size
-config.font_size = 16
+config.font_size = 12
 config.font = wezterm.font_with_fallback {
   {
     family = 'Monaspace Argon NF',
@@ -48,9 +48,9 @@ config.window_background_opacity = 0.97
 config.window_decorations = 'RESIZE'
 config.macos_window_background_blur = 10
 config.window_padding = {
-  left = 5,
+  left = 10,
-  right = 5,
+  right = 10,
-  top = 5,
+  top = 10,
   bottom = 5,
 }
 

config/wtf/config.yml

@@ -1,181 +0,0 @@
----
-wtf:
-  colors:
-    background: black
-    border:
-      focusable: darkslateblue
-      focused: orange
-      normal: gray
-    checked: yellow
-    highlight:
-      fore: black
-      back: gray
-    rows:
-      even: yellow
-      odd: white
-  grid:
-    # How _wide_ the columns are, in terminal characters. In this case we have
-    # four columns, each of which are 35 characters wide.
-    columns: [35, 35, 30, 20]
-    # How _high_ the rows are, in terminal lines. In this case we have four rows
-    # that support ten line of text and one of four.
-    rows: [10, 10, 10, 20, 10, 4]
-  refreshInterval: 1
-  openFileUtil: 'open'
-  mods:
-    # You can have multiple widgets of the same type.
-    # The "key" is the name of the widget and the type is the actual
-    # widget you want to implement.
-    europe_time:
-      title: 'Europe'
-      type: clocks
-      colors:
-        rows:
-          even: 'lightblue'
-          odd: 'white'
-      enabled: true
-      locations:
-        GMT: 'Etc/GMT'
-        Amsterdam: 'Europe/Amsterdam'
-        Berlin: 'Europe/Berlin'
-        Barcelona: 'Europe/Madrid'
-        Copenhagen: 'Europe/Copenhagen'
-        London: 'Europe/London'
-        Rome: 'Europe/Rome'
-        Stockholm: 'Europe/Stockholm'
-      position:
-        top: 0
-        left: 0
-        height: 1
-        width: 1
-      refreshInterval: 15
-      sort: 'alphabetical'
-    americas_time:
-      title: 'Americas'
-      type: clocks
-      colors:
-        rows:
-          even: 'lightblue'
-          odd: 'white'
-      enabled: true
-      locations:
-        UTC: 'Etc/UTC'
-        Vancouver: 'America/Vancouver'
-        New_York: 'America/New_York'
-        Sao_Paulo: 'America/Sao_Paulo'
-        Denver: 'America/Denver'
-        Iqaluit: 'America/Iqaluit'
-        Bahamas: 'America/Nassau'
-        Chicago: 'America/Chicago'
-      position:
-        top: 0
-        left: 1
-        height: 1
-        width: 1
-      refreshInterval: 15
-      sort: 'alphabetical'
-    battery:
-      type: power
-      title: '⚡️'
-      enabled: true
-      position:
-        top: 1
-        left: 2
-        height: 1
-        width: 2
-      refreshInterval: 15
-    todolist:
-      type: todo
-      checkedIcon: 'X'
-      colors:
-        checked: gray
-        highlight:
-          fore: 'black'
-          back: 'orange'
-      enabled: true
-      filename: 'todo.yml'
-      position:
-        top: 1
-        left: 0
-        height: 2
-        width: 1
-      refreshInterval: 3600
-    ip:
-      type: ipinfo
-      title: 'My IP'
-      colors:
-        name: 'lightblue'
-        value: 'white'
-      enabled: true
-      position:
-        top: 0
-        left: 2
-        height: 1
-        width: 2
-      refreshInterval: 150
-    security_info:
-      type: security
-      title: 'Staying safe'
-      enabled: true
-      position:
-        top: 1
-        left: 1
-        height: 1
-        width: 1
-      refreshInterval: 3600
-    readme:
-      type: textfile
-      enabled: true
-      filePaths:
-        - '~/.config/wtf/config.yml'
-      format: true
-      formatStyle: 'monokai'
-      position:
-        top: 3
-        left: 0
-        height: 1
-        width: 1
-      refreshInterval: 15
-    news:
-      type: hackernews
-      title: 'HackerNews'
-      enabled: true
-      numberOfStories: 10
-      position:
-        top: 3
-        left: 1
-        height: 1
-        width: 3
-      storyType: top
-      refreshInterval: 900
-    resources:
-      type: resourceusage
-      enabled: true
-      position:
-        top: 4
-        left: 0
-        height: 2
-        width: 1
-      refreshInterval: 1
-    uptime:
-      type: cmdrunner
-      args: []
-      cmd: 'uptime'
-      enabled: true
-      position:
-        top: 5
-        left: 1
-        height: 1
-        width: 3
-      refreshInterval: 30
-    disks:
-      type: cmdrunner
-      cmd: 'df'
-      args: ['-h']
-      enabled: true
-      position:
-        top: 4
-        left: 1
-        height: 1
-        width: 3
-      refreshInterval: 3600

config/yabai/yabairc

@@ -20,7 +20,6 @@ yabai -m config \
   window_shadow float
 
 # apps to not manage (ignore)
-# TODO: add apps from aerospace config to here
 # list active apps:
 # > yabai -m query --windows | jq .[].app | sort | uniq
 yabai -m rule --add app="1Password" manage=off

config/yamlfmt/.yamlfmt

@@ -1,8 +0,0 @@
-formatter:
-  type: basic
-  indent: 2
-  retain_line_breaks: false
-  disallow_anchors: false
-  max_line_length: 0
-  scan_folded_as_literal: false
-  indentless_arrays: false

config/yamllint/config

@@ -1,31 +0,0 @@
----
-extends: default
-
-ignore-from-file: [.gitignore, .yamlignore]
-
-rules:
-  braces:
-    level: warning
-    max-spaces-inside: 1
-  brackets:
-    level: warning
-    max-spaces-inside: 1
-  colons:
-    level: warning
-  commas:
-    level: warning
-  comments: disable
-  comments-indentation: disable
-  document-start: disable
-  empty-lines:
-    level: warning
-  hyphens:
-    level: warning
-  indentation:
-    level: warning
-    indent-sequences: consistent
-  line-length:
-    level: warning
-    allow-non-breakable-inline-mappings: true
-    max: 120
-  truthy: disable

config/zsh/antidote_plugins.txt

@@ -37,7 +37,6 @@ zdharma-continuum/fast-syntax-highlighting
 
 # Add some plugins that are not in OMZ
 jreese/zsh-titles
-yuki-ycino/tms
 
 # This needs to be last bundle
 # zsh-users/zsh-syntax-highlighting

config/zsh/completion/_dfm

@@ -28,7 +28,6 @@ _dfm()
 
   sections=(
     'install:Installation commands'
-    'asdf:ASDF version manager commands'
     'brew:Homebrew package manager commands'
     'check:System check commands'
     'dotfiles:Dotfiles management commands'
@@ -69,24 +68,6 @@ _dfm()
           _describe 'install commands' install_cmds
           ;;
 
-        asdf)
-          local -a asdf_cmds
-          asdf_cmds=(
-            'current:Show current versions'
-            'global:Show global versions'
-            'installed:Show installed versions'
-            'plugins-update:Update all plugins'
-            'plugins-install:Install plugins from configuration'
-            'plugins-remove:Remove installed plugins'
-            'reset:Reset plugins'
-            'fix-tool-versions:Remove uninstalled plugins from .tool-versions'
-            'versions:Show versions'
-            'where:Show where'
-            'which:Show which'
-          )
-          _describe 'asdf commands' asdf_cmds
-          ;;
-
         brew)
           local -a brew_cmds
           brew_cmds=(

docs/aerospace-keybindings.md

@@ -1,66 +0,0 @@
-# aerospace keybindings
-
-## main
-
-| Key            | Command(s) and actions                       |
-| -------------- | -------------------------------------------- |
-| alt-a          | mode apps                                    |
-| alt-h          | focus left                                   |
-| alt-j          | focus down                                   |
-| alt-k          | focus up                                     |
-| alt-l          | focus right                                  |
-| alt-m          | mode move                                    |
-| alt-s          | mode service                                 |
-| alt-shift-1    | workspace 1                                  |
-| alt-shift-2    | workspace 2                                  |
-| alt-shift-tab  | workspace-back-and-forth                     |
-| ctrl-shift-1   | move-node-to-workspace 1                     |
-| ctrl-shift-2   | move-node-to-workspace 2                     |
-| ctrl-shift-tab | move-workspace-to-monitor --wrap-around prev |
-
-## apps
-
-| Key | Command(s) and actions                                             |
-| --- | ------------------------------------------------------------------ |
-| b   | exec-and-forget open -a /Applications/Brave Browser.app; mode main |
-| c   | exec-and-forget open -a /Applications/Ferdium.app; mode main       |
-| esc | reload-config; mode main                                           |
-| g   | exec-and-forget open -a /Applications/Ghostty.app; mode main       |
-| o   | exec-and-forget open -a /Applications/Obsidian.app; mode main      |
-| s   | exec-and-forget open -a /Applications/Slack.app; mode main         |
-| t   | exec-and-forget open -a /Applications/TIDAL.app; mode main         |
-| w   | exec-and-forget open -a /Applications/WezTerm.app; mode main       |
-
-## move
-
-| Key         | Command(s) and actions                          |
-| ----------- | ----------------------------------------------- |
-| 1           | move-node-to-workspace 1 --focus-follows-window |
-| 2           | move-node-to-workspace 2 --focus-follows-window |
-| ctrl-h      | resize smart -70                                |
-| ctrl-l      | resize smart +70                                |
-| esc         | reload-config; mode main                        |
-| h           | move left                                       |
-| j           | move down                                       |
-| k           | move up                                         |
-| l           | move right                                      |
-| r           | flatten-workspace-tree; mode main               |
-| shift-h     | join-with left                                  |
-| shift-j     | join-with down                                  |
-| shift-k     | join-with up                                    |
-| shift-l     | join-with right                                 |
-| shift-left  | resize smart +70                                |
-| shift-right | resize smart -70                                |
-
-## service
-
-| Key       | Command(s) and actions                   |
-| --------- | ---------------------------------------- |
-| backspace | close-all-windows-but-current; mode main |
-| esc       | reload-config; mode main                 |
-| f         | layout floating tiling; mode main        |
-| r         | flatten-workspace-tree; mode main        |
-
-File generated: 2025-01-15 13:32:41
-
-Config file: [config/aerospace/aerospace.toml](./../config/aerospace/aerospace.toml)

docs/plans/2026-02-04-cargo-skip-installed-design.md

@@ -0,0 +1,40 @@
+# Skip Already-Installed Cargo Packages
+
+## Problem
+
+`install-cargo-packages.sh` runs `cargo install-update -a` to update installed
+packages, then runs `cargo install` for every package in the list — including
+ones that are already installed and up-to-date. This wastes time rebuilding
+packages that don't need it.
+
+## Solution
+
+Capture the `cargo install-update -a` output, parse installed package names,
+and skip `cargo install` for any package that appeared in the update output.
+
+## Changes
+
+**File:** `scripts/install-cargo-packages.sh`
+
+1. Declare an associative array `installed_packages` at the top.
+2. In the `cargo-install-update` section, capture output with `tee /dev/stderr`
+   so it displays in real-time while also being stored in a variable.
+3. Parse the captured output with `awk` — extract the first column from lines
+   matching a version pattern (`v[0-9]+\.[0-9]+`), skipping the header.
+4. Populate `installed_packages` associative array from parsed names.
+5. In `install_packages()`, check each package against the array. If found, log
+   a skip message via `msgr` and continue. If not found, install as before.
+6. If `cargo-install-update` is not available, the array stays empty and all
+   packages install normally (preserves existing behavior).
+
+## Output Parsing
+
+The `cargo install-update -a` output format:
+
+```text
+Package           Installed  Latest   Needs update
+zoxide            v0.9.8     v0.9.9   Yes
+bkt               v0.8.2     v0.8.2   No
+```
+
+Extraction: `awk '/v[0-9]+\.[0-9]+/ { print $1 }'` gets package names.

docs/plans/2026-02-05-dfm-cleanup-design.md

@@ -0,0 +1,55 @@
+# dfm Cleanup Design
+
+## Summary
+
+Clean up `local/bin/dfm` to fix bugs, remove dead code, improve
+cross-platform portability, and make error handling consistent.
+
+## Changes
+
+### 1. Bash Version Bootstrap
+
+Add a check at the top of the script (after variable declarations)
+that requires bash 4.0+. On macOS, if bash is too old, install
+Homebrew (if missing) and bash, then print instructions and exit.
+The check itself uses only bash 3.2-compatible syntax.
+
+### 2. Remove Fish Dead Code
+
+Remove `CURRENT_SHELL` detection, `source_file()` function, and all
+fish branches. Replace `source_file` calls with direct `source`.
+The script has a bash shebang — fish handling was unreachable.
+
+### 3. Bug Fixes
+
+- Remove `ntfy` from install menu (no install script exists)
+- Fix `msg)` → `msgr)` case label in `section_tests`
+- Guard all `shift` calls against empty argument lists
+- Quote `$width` in `menu_builder` seq calls
+- Fix `$"..."` locale string → `"..."` in `usage()`
+- Fix `exit 0` on apt.txt error → `return 1`
+
+### 4. Replace `declare -A` in `section_scripts`
+
+Replace associative array with indexed `"name:desc"` array,
+matching the pattern used everywhere else in the script.
+Move `get_script_description()` to top-level (out of the function).
+
+### 5. Early-Return Guards & exit → return
+
+- `section_brew()`: Early return with `msgr warn` if brew unavailable.
+  Remove duplicate `! x-have brew` check.
+- `section_apt()`: Same pattern for apt.
+- `section_check()`: Replace `exit` with `return`.
+- `section_apt() install`: Replace `exit` with `return`.
+- `section_brew() untracked`: Replace `exit` with `return`.
+
+## Files Changed
+
+- `local/bin/dfm` (all changes)
+
+## Verification
+
+- `yarn test` (existing bats test)
+- `shellcheck local/bin/dfm`
+- `bash -n local/bin/dfm` (syntax check)

docs/plans/2026-02-05-x-scripts-cleanup-design.md

@@ -0,0 +1,46 @@
+# x-* Scripts Cleanup Design
+
+## Summary
+
+Comprehensive cleanup of all 34 x-* utility scripts in `local/bin/`.
+Fix critical bugs, consolidate duplicates, standardize patterns.
+
+## Changes
+
+### Removals
+
+- `x-mkd`, `x-mkd.md`, `tests/x-mkd.bats` — unused, cd-in-subshell broken
+- `x-validate-sha256sum.sh`, `x-validate-sha256sum.sh.md` — duplicates x-sha256sum-matcher
+
+### Thin Wrappers (delegate to x-path)
+
+- `x-path-append` → calls `x-path append "$@"`
+- `x-path-prepend` → calls `x-path prepend "$@"`
+- `x-path-remove` → calls `x-path remove "$@"`
+
+### Critical Fixes
+
+- `x-clean-vendordirs`: call msgr as command (it's in PATH)
+- `x-foreach`: replace eval with direct "$@" execution
+- `x-ip`: add error handling, curl check
+
+### Consistency Fixes
+
+- Fix `#!/bin/bash` → `#!/usr/bin/env bash` (x-env-list, x-localip)
+- POSIX scripts keep `#!/bin/sh`
+- Add `set -euo pipefail` where missing in bash scripts
+- Use XDG variables instead of hardcoded paths (x-change-alacritty-theme)
+- Quote unquoted variables
+
+### Minor Fixes
+
+- `x-multi-ping`: remove unused VERBOSE variable
+- `x-when-down`, `x-when-up`: add error handling
+- `x-term-colors`: add usage message
+- `x-record`: fix undefined notify-call reference
+
+## Verification
+
+- `yarn test` — ensure remaining tests pass
+- `shellcheck` on modified scripts
+- `bash -n` syntax check on all modified bash scripts

hosts/air/install.conf.yaml

@@ -1,5 +1,5 @@
 ---
-- include: 'tools/dotbot-defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 - shell:
     - echo "Configuring air"
 - link:
@@ -7,7 +7,7 @@
       force: true
       glob: true
       path: hosts/air/base/**
-      prefix: '.'
+      prefix: "."
     ~/.config/:
       glob: true
       force: true

hosts/lakka/install.conf.yaml

@@ -1,5 +1,5 @@
 ---
-- include: 'tools/dotbot-defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 - shell:
     - echo "Configuring lakka"
 - link:
@@ -7,7 +7,7 @@
       force: true
       glob: true
       path: hosts/lakka/base/**
-      prefix: '.'
+      prefix: "."
     ~/.config/:
       glob: true
       force: true

hosts/s/install.conf.yaml

@@ -1,5 +1,5 @@
 ---
-- include: 'tools/dotbot-defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 - shell:
     - echo "Configuring s"
 - link:
@@ -7,7 +7,7 @@
       force: true
       glob: true
       path: hosts/s/base/**
-      prefix: '.'
+      prefix: "."
     ~/.config/:
       glob: true
       force: true

hosts/tunkki/install.conf.yaml

@@ -1,5 +1,5 @@
 ---
-- include: 'tools/dotbot-defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 - shell:
     - echo "Configuring tunkki"
 - link:
@@ -7,7 +7,7 @@
       force: true
       glob: true
       path: hosts/tunkki/base/**
-      prefix: '.'
+      prefix: "."
     ~/.config/:
       glob: true
       force: true

install

@@ -15,24 +15,18 @@ git submodule update --init --recursive "${DOTBOT_DIR}"
 
 "${DOTBOT_BIN_PATH}" \
   -d "${BASEDIR}" \
-  --plugin-dir=tools/dotbot-asdf \
-  --plugin-dir=tools/dotbot-brew \
   --plugin-dir=tools/dotbot-include \
-  --plugin-dir=tools/dotbot-pip \
   -c "${CONFIG}" \
   "${@}"
 
 if [ "${DOTBOT_HOST}" != "" ]; then
   DOTBOT_HOST_CONFIG="${BASEDIR}/hosts/${DOTBOT_HOST}/${CONFIG}"
   echo "-> Trying if host config can be found: ${DOTBOT_HOST_CONFIG}"
-  [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] &&
+  [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] \
-    echo "(!) Found $DOTBOT_HOST_CONFIG" &&
+    && echo "(!) Found $DOTBOT_HOST_CONFIG" \
-    "$DOTBOT_BIN_PATH" \
+    && "$DOTBOT_BIN_PATH" \
       -d "$BASEDIR" \
-      --plugin-dir=tools/dotbot-asdf \
-      --plugin-dir=tools/dotbot-brew \
       --plugin-dir=tools/dotbot-include \
-      --plugin-dir=tools/dotbot-pip \
       -c "$DOTBOT_HOST_CONFIG" \
       "${@}"
 fi

install.conf.yaml

@@ -1,5 +1,5 @@
 ---
-- include: 'tools/dotbot-defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 
 - clean:
     ~/:
@@ -34,7 +34,7 @@
       force: true
       glob: true
       path: base/*
-      prefix: '.'
+      prefix: "."
     # Most of the configs
     ~/.config/:
       glob: true
@@ -78,8 +78,3 @@
 - shell:
     # Use my dotfiles manager to install everything
     - bash local/bin/dfm install all
-
-- pipx:
-    file: tools/requirements-pipx.txt
-    stdout: true
-    stderr: true

local/bin/README.md

@@ -20,7 +20,7 @@ Some problematic code has been fixed per `shellcheck` suggestions.
 ## Sourced
 
 | Script                  | Source            |
-| ----------------------- | ----------------- |
+|-------------------------|-------------------|
 | `x-dupes`               | skx/sysadmin-util |
 | `x-foreach`             | mvdan/dotfiles    |
 | `x-multi-ping`          | skx/sysadmin-util |

local/bin/a

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 # A script for encrypting and decrypting files or directories with age and SSH keys
 
-VERSION="1.0.0"
+set -euo pipefail
+
+VERSION="1.1.0"
 
 # Default ENV values
 KEYS_FILE="${AGE_KEYSFILE:-$HOME/.ssh/keys.txt}"
@@ -9,14 +11,49 @@ KEYS_SOURCE="${AGE_KEYSSOURCE:-https://github.com/ivuorinen.keys}"
 LOG_FILE="${AGE_LOGFILE:-$HOME/.cache/a.log}"
 
 VERBOSE=false
+DELETE_ORIGINAL=false
+FORCE=false
 
-# Parse flags for verbosity
+# Check for required dependencies
-for arg in "$@"; do
+check_dependencies()
-  if [[ "$arg" == "-v" || "$arg" == "--verbose" ]]; then
+{
-    VERBOSE=true
+  if ! command -v age &> /dev/null; then
-    break
+    echo "Error: 'age' is not installed. Please install it first." >&2
+    echo "  brew install age    # macOS" >&2
+    echo "  apt install age     # Debian/Ubuntu" >&2
+    echo "  dnf install age     # Fedora" >&2
+    exit 1
   fi
-done
+
+  if ! command -v curl &> /dev/null; then
+    echo "Error: 'curl' is not installed." >&2
+    exit 1
+  fi
+}
+
+# Parse flags
+parse_flags()
+{
+  local args=()
+  for arg in "$@"; do
+    case "$arg" in
+      -v | --verbose)
+        VERBOSE=true
+        ;;
+      --delete)
+        DELETE_ORIGINAL=true
+        ;;
+      -f | --force)
+        FORCE=true
+        ;;
+      *)
+        args+=("$arg")
+        ;;
+    esac
+  done
+  # Return remaining arguments
+  printf '%s\n' "${args[@]}"
+}
 
 # Ensure log directory and file exist with correct permissions
 prepare_log_file()
@@ -38,8 +75,6 @@ prepare_log_file()
   chmod 0600 "$LOG_FILE"
 }
 
-prepare_log_file
-
 # Logging function
 log_message()
 {
@@ -56,7 +91,7 @@ log_message()
 print_help()
 {
   cat << EOF
-Usage: a [command] [file_or_directory] [options]
+Usage: a [options] [command] [file_or_directory]
 
 Commands:
   e, enc, encrypt      Encrypt the specified file or directory
@@ -65,12 +100,14 @@ Commands:
   version, --version   Show version information
 
 Options:
-  -v, --verbose        Print log messages to console in addition to writing to log file
+  -v, --verbose        Print log messages to console
+  --delete             Delete original files after successful encryption
+  -f, --force          Overwrite existing output files without prompting
 
 Environment Variables:
-  AGE_KEYSFILE         Path to the SSH keys file (default: $HOME/.ssh/keys.txt)
+  AGE_KEYSFILE         Path to the SSH keys file (default: \$HOME/.ssh/keys.txt)
   AGE_KEYSSOURCE       URL to fetch SSH keys if keys file does not exist
-  AGE_LOGFILE          Path to the log file (default: $HOME/.cache/a.log)
+  AGE_LOGFILE          Path to the log file (default: \$HOME/.cache/a.log)
 
 Examples:
   Encrypt a file:
@@ -79,14 +116,21 @@ Examples:
   Encrypt a directory:
     a e /path/to/directory
 
+  Encrypt and delete originals:
+    a --delete e file.txt
+
   Decrypt a file:
     a d file.txt.age
 
+  Force overwrite existing files:
+    a -f e file.txt
+
   Specify a custom keys file:
     AGE_KEYSFILE=/path/to/keys.txt a e file.txt
 
-  Specify a custom keys source and log file:
+Requirements:
-    AGE_KEYSSOURCE=https://example.com/keys.txt AGE_LOGFILE=/tmp/a.log a d file.txt.age
+  - age (encryption tool): https://github.com/FiloSottile/age
+  - curl (for fetching keys)
 EOF
 }
 
@@ -115,26 +159,104 @@ fetch_keys_if_missing()
   fi
 }
 
+# Function to encrypt a single file
+encrypt_single_file()
+{
+  local file="$1"
+
+  # Skip already encrypted files
+  if [[ "$file" == *.age ]]; then
+    log_message "Skipping already encrypted file: $file"
+    return 0
+  fi
+
+  local output_file="${file}.age"
+
+  # Check if output file exists
+  if [[ -f "$output_file" && "$FORCE" != true ]]; then
+    log_message "Error: Output file '$output_file' already exists. Use --force to overwrite."
+    return 1
+  fi
+
+  fetch_keys_if_missing
+
+  local temp_file
+  temp_file="$(mktemp -p "$(dirname "$file")")"
+
+  if age -R "$KEYS_FILE" "$file" > "$temp_file" && mv "$temp_file" "$output_file"; then
+    log_message "File encrypted successfully: $output_file"
+
+    if [[ "$DELETE_ORIGINAL" == true ]]; then
+      rm -f "$file"
+      log_message "Original file deleted: $file"
+    fi
+  else
+    rm -f "$temp_file"
+    log_message "Error: Failed to encrypt file '$file'."
+    return 1
+  fi
+}
+
 # Function to encrypt files or directories
 encrypt_file_or_directory()
 {
   local file="$1"
+
   if [[ -d "$file" ]]; then
-    for f in "$file"/*; do
+    # Enable dotglob to include hidden files
+    shopt -s dotglob nullglob
+    local files=("$file"/*)
+    shopt -u dotglob nullglob
+
+    if [[ ${#files[@]} -eq 0 ]]; then
+      log_message "Warning: Directory '$file' is empty."
+      return 0
+    fi
+
+    for f in "${files[@]}"; do
       encrypt_file_or_directory "$f"
     done
   elif [[ -f "$file" ]]; then
-    fetch_keys_if_missing
+    encrypt_single_file "$file"
-    local output_file="${file}.age"
+  else
-    local temp_file
+    log_message "Warning: '$file' is not a file or directory, skipping."
-    temp_file="$(mktemp -p "$(dirname "$file")")"
+  fi
-    if age -R "$KEYS_FILE" "$file" > "$temp_file" && mv "$temp_file" "$output_file"; then
+}
-      log_message "File encrypted successfully: $output_file"
+
-    else
+# Function to decrypt a single file
-      rm -f "$temp_file"
+decrypt_single_file()
-      log_message "Error: Failed to encrypt file '$file'."
+{
-      exit 1
+  local file="$1"
+
+  if [[ ! "$file" == *.age ]]; then
+    log_message "Skipping non-.age file: $file"
+    return 0
+  fi
+
+  local output_file="${file%.age}"
+
+  # Check if output file exists
+  if [[ -f "$output_file" && "$FORCE" != true ]]; then
+    log_message "Error: Output file '$output_file' already exists. Use --force to overwrite."
+    return 1
+  fi
+
+  fetch_keys_if_missing
+
+  local temp_file
+  temp_file="$(mktemp -p "$(dirname "$file")")"
+
+  if age -d -i "$KEYS_FILE" "$file" > "$temp_file" && mv "$temp_file" "$output_file"; then
+    log_message "File decrypted successfully: $output_file"
+
+    if [[ "$DELETE_ORIGINAL" == true ]]; then
+      rm -f "$file"
+      log_message "Encrypted file deleted: $file"
     fi
+  else
+    rm -f "$temp_file"
+    log_message "Error: Failed to decrypt file '$file'."
+    return 1
   fi
 }
 
@@ -142,54 +264,76 @@ encrypt_file_or_directory()
 decrypt_file_or_directory()
 {
   local file="$1"
+
   if [[ -d "$file" ]]; then
-    for f in "$file"/*.age; do
+    # Enable nullglob to handle no matches gracefully
-      decrypt_file_or_directory "$f"
+    shopt -s nullglob
+    local files=("$file"/*.age)
+    shopt -u nullglob
+
+    if [[ ${#files[@]} -eq 0 ]]; then
+      log_message "Warning: No .age files found in directory '$file'."
+      return 0
+    fi
+
+    for f in "${files[@]}"; do
+      decrypt_single_file "$f"
     done
   elif [[ -f "$file" ]]; then
-    fetch_keys_if_missing
+    decrypt_single_file "$file"
-    local output_file="${file%.age}"
+  else
-    local temp_file
+    log_message "Warning: '$file' is not a file or directory, skipping."
-    temp_file="$(mktemp -p "$(dirname "$file")")"
-    if age -d -i "$KEYS_FILE" "$file" > "$temp_file" && mv "$temp_file" "$output_file"; then
-      log_message "File decrypted successfully: $output_file"
-    else
-      rm -f "$temp_file"
-      log_message "Error: Failed to decrypt file '$file'."
-      exit 1
-    fi
   fi
 }
 
-# Main logic
+# Main entry point
-case "$1" in
+main()
-  e | enc | encrypt)
+{
-    if [[ $# -lt 2 ]]; then
+  check_dependencies
-      log_message "Error: No file or directory specified for encryption."
+
+  # Parse flags and get remaining arguments
+  mapfile -t ARGS < <(parse_flags "$@")
+
+  prepare_log_file
+
+  local command="${ARGS[0]:-}"
+  local target="${ARGS[1]:-}"
+
+  case "$command" in
+    e | enc | encrypt)
+      if [[ -z "$target" ]]; then
+        log_message "Error: No file or directory specified for encryption."
+        print_help
+        exit 1
+      fi
+      encrypt_file_or_directory "$target"
+      ;;
+    d | dec | decrypt)
+      if [[ -z "$target" ]]; then
+        log_message "Error: No file or directory specified for decryption."
+        print_help
+        exit 1
+      fi
+      decrypt_file_or_directory "$target"
+      ;;
+    help | --help | -h)
+      print_help
+      ;;
+    version | --version)
+      print_version
+      ;;
+    "")
       print_help
       exit 1
-    fi
+      ;;
-    encrypt_file_or_directory "$2"
+    *)
-    ;;
+      log_message "Error: Unknown command '$command'"
-  d | dec | decrypt)
-    if [[ $# -lt 2 ]]; then
-      log_message "Error: No file or directory specified for decryption."
       print_help
       exit 1
-    fi
+      ;;
-    decrypt_file_or_directory "$2"
+  esac
-    ;;
+}
-  help | --help)
+
-    print_help
+main "$@"
-    ;;
-  version | --version)
-    print_version
-    ;;
-  *)
-    log_message "Error: Unknown command '$1'"
-    print_help
-    exit 1
-    ;;
-esac
 
 # vim: ft=bash:syn=sh:ts=2:sw=2:et:ai:nowrap

local/bin/a.md

@@ -2,28 +2,76 @@
 
 Encrypt or decrypt files and directories using `age` and your GitHub SSH keys.
 
+## Requirements
+
+- [age](https://github.com/FiloSottile/age) - encryption tool
+- curl - for fetching SSH keys
+
+Install age:
+
+```bash
+brew install age     # macOS
+apt install age      # Debian/Ubuntu
+dnf install age      # Fedora
+```
+
 ## Usage
 
 ```bash
-a encrypt <file|dir>
+a [options] <command> <file|directory>
-a decrypt <file.age|dir>
 ```
 
+Commands:
+
+- `e`, `enc`, `encrypt` - encrypt files
+- `d`, `dec`, `decrypt` - decrypt files
+- `help`, `--help`, `-h` - show help
+- `version`, `--version` - show version
+
 Options:
 
-- `-v`, `--verbose` – show log output
+- `-v`, `--verbose` - show log output
+- `--delete` - delete original files after successful operation
+- `-f`, `--force` - overwrite existing output files
 
 Environment variables:
 
-- `AGE_KEYSFILE` – location of the keys file
+- `AGE_KEYSFILE` - location of the keys file (default: `~/.ssh/keys.txt`)
-- `AGE_KEYSSOURCE` – URL to fetch keys if missing
+- `AGE_KEYSSOURCE` - URL to fetch keys if missing (default: GitHub keys)
-- `AGE_LOGFILE` – log file path
+- `AGE_LOGFILE` - log file path (default: `~/.cache/a.log`)
 
-## Example
+## Examples
 
 ```bash
+# Encrypt a file
 a encrypt secret.txt
+
+# Encrypt with short command
+a e secret.txt
+
+# Decrypt a file
 a decrypt secret.txt.age
+a d secret.txt.age
+
+# Encrypt a directory (includes hidden files)
+a e /path/to/secrets/
+
+# Encrypt and delete originals
+a --delete e secret.txt
+
+# Force overwrite existing .age file
+a -f e secret.txt
+
+# Verbose output
+a -v e secret.txt
 ```
 
+## Behavior
+
+- Encrypting a directory processes all files recursively, including hidden files
+- Already encrypted files (`.age`) are skipped during encryption
+- Only `.age` files are processed during directory decryption
+- Original files are preserved by default (use `--delete` to remove them)
+- Output files are not overwritten by default (use `--force` to overwrite)
+
 <!-- vim: set ft=markdown spell spelllang=en_us cc=80 : -->

local/bin/dfm

@@ -12,41 +12,41 @@
 : "${DOTFILES:=$HOME/.dotfiles}"
 : "${BREWFILE:=$DOTFILES/config/homebrew/Brewfile}"
 : "${HOSTFILES:=$DOTFILES/hosts}"
+export DOTFILES BREWFILE HOSTFILES
 
 SCRIPT=$(basename "$0")
 
-# Detect the current shell
+# Require bash 4.0+ for associative arrays and mapfile
-CURRENT_SHELL=$(ps -p $$ -ocomm= | awk -F/ '{print $NF}')
+if ((BASH_VERSINFO[0] < 4)); then
+  echo "dfm requires bash 4.0+, found ${BASH_VERSION}"
+  if [[ "$(uname)" == "Darwin" ]]; then
+    if ! command -v brew &> /dev/null; then
+      echo "Installing Homebrew..."
+      /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+    fi
+    echo "Installing modern bash via Homebrew..."
+    brew install bash
+    echo "Done. Restart your shell and run dfm again."
+  else
+    echo "Install bash 4.0+ and try again."
+  fi
+  exit 1
+fi
 
-# Function to source files based on the shell
+# shellcheck disable=SC1091
-source_file()
+source "$DOTFILES/config/shared.sh"
+# shellcheck disable=SC1090
+source "${DOTFILES}/local/bin/msgr"
+
+# Get description from a script file's @description tag
+get_script_description()
 {
-  local file=$1
+  local file="$1"
-  case "$CURRENT_SHELL" in
+  local desc
-    fish)
+  desc=$(sed -n '/@description/s/.*@description *\(.*\)/\1/p' "$file" | head -1)
-      if [[ -f "$file.fish" ]]; then
+  echo "${desc:-No description available}"
-        # shellcheck disable=SC1090
-        source "$file.fish"
-      else
-        echo "Fish shell file not found: $file.fish"
-        exit 1
-      fi
-      ;;
-    sh | bash | zsh)
-      # shellcheck disable=SC1090
-      source "$file"
-      ;;
-    *)
-      echo "Unsupported shell: $CURRENT_SHELL"
-      exit 1
-      ;;
-  esac
 }
 
-# Modify the source commands to use the new function
-source_file "$DOTFILES/config/shared.sh"
-source_file "${DOTFILES}/local/bin/msgr"
-
 # Menu builder
 menu_builder()
 {
@@ -54,9 +54,9 @@ menu_builder()
   local commands=("${@:2}")
   local width=60
 
-  printf "\n%s\n" "$(printf '%.s─' $(seq 1 $width))"
+  printf "\n%s\n" "$(printf '%.s─' $(seq 1 "$width"))"
   printf "%-${width}s\n" "  $title"
-  printf "%s\n" "$(printf '%.s─' $(seq 1 $width))"
+  printf "%s\n" "$(printf '%.s─' $(seq 1 "$width"))"
 
   for cmd in "${commands[@]}"; do
     local name=${cmd%%:*}
@@ -65,41 +65,66 @@ menu_builder()
   done
 }
 
+# Handle install section commands
 section_install()
 {
   USAGE_PREFIX="$SCRIPT install <command>"
 
   MENU=(
     "all:Installs everything in the correct order"
+    "apt-packages:Install apt packages (Debian/Ubuntu)"
     "cargo:Install rust/cargo packages"
     "cheat-databases:Install cheat external cheatsheet databases"
     "composer:Install composer"
+    "dnf-packages:Install dnf packages (Fedora/RHEL)"
     "fonts:Install programming fonts"
     "gh:Install GitHub CLI Extensions"
+    "git-crypt:Install git-crypt from source"
     "go:Install Go Packages"
     "imagick:Install ImageMagick CLI"
     "macos:Setup nice macOS defaults"
     "npm-packages:Install NPM Packages"
-    "ntfy:Install ntfy"
+    "ntfy:Install ntfy notification tool"
     "nvm-latest:Install latest lts node using nvm"
     "nvm:Install Node Version Manager (nvm)"
+    "python-packages:Install Python packages via uv"
+    "xcode-cli-tools:Install Xcode CLI tools (macOS)"
     "z:Install z"
   )
 
   case "$1" in
     all)
       msgr msg "Starting to install all and reloading configurations..."
-      $0 install macos
+
-      $0 install fonts
+      # Tier 0: Platform foundations (OS packages, build tools)
+      [[ "$(uname)" == "Darwin" ]] && $0 install macos
+      [[ "$(uname)" == "Darwin" ]] && $0 install xcode-cli-tools
+      command -v apt &> /dev/null && $0 install apt-packages
+      command -v dnf &> /dev/null && $0 install dnf-packages
+
+      # Tier 1: Package managers & fonts
       $0 brew install
+      $0 install fonts
+
+      # Tier 2: Language packages (depend on runtimes from Tier 1)
       $0 install cargo
       $0 install go
       $0 install composer
-      $0 install cheat-databases
       $0 install nvm
       $0 install npm-packages
+      $0 install python-packages
+
+      # Tier 3: Tool-dependent installers
+      $0 install cheat-databases
+      $0 install gh
+      $0 install git-crypt
+      $0 install ntfy
+
+      # Tier 4: Independent utilities
       $0 install z
+
       msgr msg "Reloading configurations again..."
+      # shellcheck disable=SC1091
       source "$DOTFILES/config/shared.sh"
       msgr yay "All done!"
       ;;
@@ -112,7 +137,7 @@ section_install()
 
     cheat-databases)
       msgr run "Installing cheat databases..."
-      for database in "$DOTFILES"/scripts/install-cheat-*; do
+      for database in "$DOTFILES"/scripts/install-cheat-*.sh; do
         bash "$database" \
           && msgr run_done "Cheat: $database run"
       done
@@ -184,6 +209,42 @@ section_install()
         && msgr yay "NPM Packages have been installed!"
       ;;
 
+    apt-packages)
+      msgr run "Installing apt packages..."
+      bash "$DOTFILES/scripts/install-apt-packages.sh" \
+        && msgr yay "apt packages installed!"
+      ;;
+
+    dnf-packages)
+      msgr run "Installing dnf packages..."
+      bash "$DOTFILES/scripts/install-dnf-packages.sh" \
+        && msgr yay "dnf packages installed!"
+      ;;
+
+    git-crypt)
+      msgr run "Installing git-crypt..."
+      bash "$DOTFILES/scripts/install-git-crypt.sh" \
+        && msgr yay "git-crypt installed!"
+      ;;
+
+    ntfy)
+      msgr run "Installing ntfy..."
+      bash "$DOTFILES/scripts/install-ntfy.sh" \
+        && msgr yay "ntfy installed!"
+      ;;
+
+    python-packages)
+      msgr run "Installing Python packages..."
+      bash "$DOTFILES/scripts/install-python-packages.sh" \
+        && msgr yay "Python packages installed!"
+      ;;
+
+    xcode-cli-tools)
+      msgr run "Installing Xcode CLI tools..."
+      bash "$DOTFILES/scripts/install-xcode-cli-tools.sh" \
+        && msgr yay "Xcode CLI tools installed!"
+      ;;
+
     z)
       msgr run "Installing z..."
       bash "$DOTFILES/scripts/install-z.sh" \
@@ -194,6 +255,7 @@ section_install()
   esac
 }
 
+# Handle Homebrew section commands
 section_brew()
 {
   USAGE_PREFIX="$SCRIPT brew <command>"
@@ -208,89 +270,91 @@ section_brew()
     "untracked:List untracked brew packages"
   )
 
-  x-have brew && {
+  if ! x-have brew; then
-    case "$1" in
+    msgr warn "brew not available, skipping"
-      install)
+    return 0
-        brew bundle install --file="$BREWFILE" --force --quiet && msgr yay "Done!"
+  fi
-        ;;
 
-      update)
+  case "$1" in
-        brew update && brew outdated && brew upgrade && brew cleanup
+    install)
-        msgr yay "Done!"
+      brew bundle install --file="$BREWFILE" --force --quiet && msgr yay "Done!"
-        ;;
+      ;;
 
-      updatebundle)
+    update)
-        # Updates .dotfiles/homebrew/Brewfile with descriptions
+      brew update && brew outdated && brew upgrade && brew cleanup
-        brew bundle dump \
+      msgr yay "Done!"
-          --force \
+      ;;
-          --file="$BREWFILE" \
-          --cleanup \
-          --tap \
-          --formula \
-          --cask \
-          --describe && msgr yay "Done!"
-        ;;
 
-      leaves)
+    updatebundle)
-        brew leaves --installed-on-request
+      # Updates .dotfiles/homebrew/Brewfile with descriptions
-        ;;
+      brew bundle dump \
+        --force \
+        --file="$BREWFILE" \
+        --cleanup \
+        --tap \
+        --formula \
+        --cask \
+        --describe && msgr yay "Done!"
+      ;;
 
-      untracked)
+    leaves)
-        declare -a BREW_LIST_ALL
+      brew leaves --installed-on-request
-        while IFS= read -r line; do
+      ;;
-          BREW_LIST_ALL+=("$line")
-        done < <(brew list --formula --installed-on-request -1 --full-name)
-        while IFS= read -r c; do
-          BREW_LIST_ALL+=("$c")
-        done < <(brew list --cask -1 --full-name)
 
-        # Remove entries that are installed as dependencies
+    untracked)
-        declare -a BREW_LIST_DEPENDENCIES
+      declare -a BREW_LIST_ALL
-        while IFS= read -r l; do
+      while IFS= read -r line; do
-          BREW_LIST_DEPENDENCIES+=("$l")
+        BREW_LIST_ALL+=("$line")
-        done < <(brew list -1 --installed-as-dependency)
+      done < <(brew list --formula --installed-on-request -1 --full-name)
+      while IFS= read -r c; do
+        BREW_LIST_ALL+=("$c")
+      done < <(brew list --cask -1 --full-name)
 
-        declare -a BREW_LIST_BUNDLED
+      # Remove entries that are installed as dependencies
-        while IFS= read -r b; do
+      declare -a BREW_LIST_DEPENDENCIES
-          BREW_LIST_BUNDLED+=("$b")
+      while IFS= read -r l; do
-        done < <(brew bundle list --all --file="$BREWFILE")
+        BREW_LIST_DEPENDENCIES+=("$l")
+      done < <(brew list -1 --installed-as-dependency)
 
-        declare -a BREW_LIST_TRACKED_WITHOUT_DEPS
+      declare -a BREW_LIST_BUNDLED
-        for f in "${BREW_LIST_ALL[@]}"; do
+      while IFS= read -r b; do
-          # shellcheck disable=SC2199
+        BREW_LIST_BUNDLED+=("$b")
-          if [[ " ${BREW_LIST_DEPENDENCIES[@]} " != *" ${f} "* ]]; then
+      done < <(brew bundle list --all --file="$BREWFILE")
-            BREW_LIST_TRACKED_WITHOUT_DEPS+=("$f")
-          fi
-        done
 
-        array_diff BREW_LIST_UNTRACKED BREW_LIST_TRACKED_WITHOUT_DEPS BREW_LIST_BUNDLED
+      declare -a BREW_LIST_TRACKED_WITHOUT_DEPS
-
+      for f in "${BREW_LIST_ALL[@]}"; do
-        # If there are no untracked packages, exit
+        # shellcheck disable=SC2199
-        if [ ${#BREW_LIST_UNTRACKED[@]} -eq 0 ]; then
+        if [[ " ${BREW_LIST_DEPENDENCIES[@]} " != *" ${f} "* ]]; then
-          msgr yay "No untracked packages found!"
+          BREW_LIST_TRACKED_WITHOUT_DEPS+=("$f")
-          exit 0
         fi
+      done
 
-        echo "Untracked:"
+      array_diff BREW_LIST_UNTRACKED BREW_LIST_TRACKED_WITHOUT_DEPS BREW_LIST_BUNDLED
-        for f in "${BREW_LIST_UNTRACKED[@]}"; do
-          echo "  $f"
-        done
-        ;;
 
-      autoupdate)
+      # If there are no untracked packages, return
-        brew autoupdate delete
+      if [ ${#BREW_LIST_UNTRACKED[@]} -eq 0 ]; then
-        brew autoupdate start 43200 --upgrade --cleanup --immediate
+        msgr yay "No untracked packages found!"
-        ;;
+        return 0
+      fi
 
-      clean) brew bundle cleanup --file="$BREWFILE" && msgr yay "Done!" ;;
+      echo "Untracked:"
+      for f in "${BREW_LIST_UNTRACKED[@]}"; do
+        echo "  $f"
+      done
+      ;;
 
-      *) menu_builder "$USAGE_PREFIX" "${MENU[@]}" ;;
+    autoupdate)
-    esac
+      brew autoupdate delete
-  }
+      brew autoupdate start 43200 --upgrade --cleanup --immediate
+      ;;
 
-  ! x-have brew && menu_builder "$USAGE_PREFIX" "brew not available on this system"
+    clean) brew bundle cleanup --file="$BREWFILE" && msgr yay "Done!" ;;
+
+    *) menu_builder "$USAGE_PREFIX" "${MENU[@]}" ;;
+  esac
 }
 
+# Handle helper utility commands
 section_helpers()
 {
   USAGE_PREFIX="$SCRIPT helpers <command>"
@@ -299,17 +363,16 @@ section_helpers()
     "colors:Show colors"
     "env:Show environment variables"
     "functions:Show functions"
-    "aerospace:Show aerospace keybindings"
     "nvim:Show nvim keybindings"
     'path:Show $PATH dir by dir'
     "tmux:Show tmux keybindings"
     "wezterm:Show wezterm keybindings"
   )
 
-  CMD="$1"
+  CMD="${1:-}"
-  shift
+  [[ $# -gt 0 ]] && shift
-  SECTION="$1"
+  SECTION="${1:-}"
-  shift
+  [[ $# -gt 0 ]] && shift
 
   case "$CMD" in
     path)
@@ -361,7 +424,6 @@ section_helpers()
 
     "env") env | sort ;;
     "functions") declare -F ;;
-    "aerospace") cat "$DOTFILES/docs/aerospace-keybindings.md" ;;
     "nvim") cat "$DOTFILES/docs/nvim-keybindings.md" ;;
     "tmux") cat "$DOTFILES/docs/tmux-keybindings.md" ;;
     "wezterm") cat "$DOTFILES/docs/wezterm-keybindings.md" ;;
@@ -369,6 +431,7 @@ section_helpers()
   esac
 }
 
+# Handle apt package manager commands
 section_apt()
 {
   USAGE_PREFIX="$SCRIPT apt <command>"
@@ -381,64 +444,69 @@ section_apt()
     "clean:Clean apt cache"
   )
 
-  x-have apt && {
+  if ! x-have apt; then
-    case "$1" in
+    msgr warn "apt not available, skipping"
-      upkeep)
+    return 0
-        sudo apt update \
+  fi
-          && sudo apt upgrade -y \
-          && sudo apt autoremove -y \
-          && sudo apt clean
-        ;;
 
-      install)
+  case "$1" in
-        # if apt.txt is not found, exit
+    upkeep)
-        [ ! -f "$DOTFILES/tools/apt.txt" ] && msgr err "apt.txt not found" && exit 0
+      sudo apt update \
+        && sudo apt upgrade -y \
+        && sudo apt autoremove -y \
+        && sudo apt clean
+      ;;
 
-        # Load apt.txt, remove comments (even if trailing comment) and empty lines.
+    install)
-        #
+      # if apt.txt is not found, return with error
-        # Ignoring "Quote this to prevent word splitting."
+      if [ ! -f "$DOTFILES/tools/apt.txt" ]; then
+        msgr err "apt.txt not found"
+        return 1
+      fi
+
+      # Load apt.txt, remove comments (even if trailing comment) and empty lines.
+      #
+      # Ignoring "Quote this to prevent word splitting."
+      # shellcheck disable=SC2046
+      sudo apt install \
+        -y $(
+          grep -vE '^\s*#' "$DOTFILES/tools/apt.txt" \
+            | sed -e 's/#.*//' \
+            | tr '\n' ' '
+        )
+
+      # If there's a apt.txt file under hosts/$hostname/apt.txt,
+      # run install on those lines too.
+      HOSTNAME=$(hostname -s)
+      HOST_APT="$DOTFILES/hosts/$HOSTNAME/apt.txt"
+      [[ -f $HOST_APT ]] && {
         # shellcheck disable=SC2046
-        sudo apt install \
+        sudo apt install -y $(
-          -y $(
+          grep -vE '^\s*#' "$HOST_APT" \
-            grep -vE '^\s*#' "$DOTFILES/tools/apt.txt" \
+            | sed -e 's/#.*//' \
-              | sed -e 's/#.*//' \
+            | tr '\n' ' '
-              | tr '\n' ' '
+        )
-          )
+      }
 
-        # If there's a apt.txt file under hosts/$hostname/apt.txt,
+      # Try this for an alternative way to install packages
-        # run install on those lines too.
+      # xargs -a <(awk '! /^ *(#|$)/' "$packagelist") -r -- sudo apt-get install -y
-        HOSTNAME=$(hostname -s)
+      ;;
-        HOST_APT="$DOTFILES/hosts/$HOSTNAME/apt.txt"
-        [[ -f $HOST_APT ]] && {
-          # shellcheck disable=SC2046
-          sudo apt install -y $(
-            grep -vE '^\s*#' "$HOST_APT" \
-              | sed -e 's/#.*//' \
-              | tr '\n' ' '
-          )
-        }
 
-        # Try this for an alternative way to install packages
+    update) sudo apt update ;;
-        # xargs -a <(awk '! /^ *(#|$)/' "$packagelist") -r -- sudo apt-get install -y
+    upgrade) sudo apt upgrade -y ;;
-        ;;
+    autoremove) sudo apt autoremove -y ;;
-
+    clean) sudo apt clean ;;
-      update) sudo apt update ;;
+    *) menu_builder "$USAGE_PREFIX" "${MENU[@]}" ;;
-      upgrade) sudo apt upgrade -y ;;
+  esac
-      autoremove) sudo apt autoremove -y ;;
-      clean) sudo apt clean ;;
-      *) menu_builder "$USAGE_PREFIX" "${MENU[@]}" ;;
-    esac
-  }
-  ! x-have apt && menu_builder "$USAGE_PREFIX" "apt not available on this system"
 }
 
+# Handle documentation generation commands
 section_docs()
 {
   USAGE_PREFIX="$SCRIPT docs <command>"
 
   MENU=(
     "all:Update all keybindings documentations"
-    "aerospace:Update aerospace keybindings documentation"
     "tmux:Update tmux keybindings documentation"
     "nvim:Update nvim keybindings documentation"
     "wezterm:Update wezterm keybindings documentation"
@@ -446,12 +514,10 @@ section_docs()
 
   case "$1" in
     all)
-      $0 docs aerospace
       $0 docs tmux
       $0 docs nvim
       $0 docs wezterm
       ;;
-    aerospace) bash "$DOTFILES/scripts/create-aerospace-keymaps.php" ;;
     tmux) bash "$DOTFILES/local/bin/x-dfm-docs-xterm-keybindings" ;;
     nvim) bash "$DOTFILES/scripts/create-nvim-keymaps.sh" ;;
     wezterm) bash "$DOTFILES/scripts/create-wezterm-keymaps.sh" ;;
@@ -459,6 +525,7 @@ section_docs()
   esac
 }
 
+# Handle dotfiles formatting and reset commands
 section_dotfiles()
 {
   USAGE_PREFIX="$SCRIPT dotfiles <command>"
@@ -526,6 +593,7 @@ section_dotfiles()
   esac
 }
 
+# Handle system check commands (arch, hostname)
 section_check()
 {
   USAGE_PREFIX="$SCRIPT check <command>"
@@ -539,50 +607,36 @@ section_check()
 
   case "$1" in
     a | arch)
-      [[ $2 == "" ]] && echo "$X_ARCH" && exit 0
+      [[ $2 == "" ]] && echo "$X_ARCH" && return 0
-      [[ $X_ARCH == "$2" ]] && exit 0 || exit 1
+      [[ $X_ARCH == "$2" ]] && return 0 || return 1
       ;;
 
     h | host | hostname)
-      [[ $2 == "" ]] && echo "$X_HOSTNAME" && exit 0
+      [[ $2 == "" ]] && echo "$X_HOSTNAME" && return 0
-      [[ $X_HOSTNAME == "$2" ]] && exit 0 || exit 1
+      [[ $X_HOSTNAME == "$2" ]] && return 0 || return 1
       ;;
 
     *) menu_builder "$USAGE_PREFIX" "${MENU[@]}" ;;
   esac
 }
 
+# Handle install script execution
 section_scripts()
 {
   USAGE_PREFIX="$SCRIPT scripts <command>"
 
-  # Get description from a file
-  get_script_description()
-  {
-    local file
-    local desc
-    file="$1"
-    desc=$(sed -n '/@description/s/.*@description *\(.*\)/\1/p' "$file" | head -1)
-    echo "${desc:-No description available}"
-  }
-
   # Collect scripts and their descriptions
-  declare -A SCRIPT_MENU
+  local menu_items=()
   for script in "$DOTFILES/scripts/install-"*.sh; do
     if [ -f "$script" ]; then
       name=$(basename "$script" .sh | sed 's/install-//')
       desc=$(get_script_description "$script")
-      SCRIPT_MENU[$name]="$desc"
+      menu_items+=("$name:$desc")
     fi
   done
 
   case "$1" in
     "")
-      # Show the menu
-      local menu_items=()
-      for name in "${!SCRIPT_MENU[@]}"; do
-        menu_items+=("$name:${SCRIPT_MENU[$name]}")
-      done
       menu_builder "$USAGE_PREFIX" "${menu_items[@]}"
       ;;
     *)
@@ -614,7 +668,7 @@ section_tests()
         echo "  $i"
       done
       ;;
-    msg)
+    msgr)
       # shellcheck disable=SC1010
       msgr done "msgr done"
       msgr done_suffix "msgr done_suffix"
@@ -634,11 +688,12 @@ section_tests()
   esac
 }
 
+# Display main usage information for all sections
 usage()
 {
   echo ""
   msgr prompt "Usage: $SCRIPT <section> <command>"
-  echo $"  Empty <command> prints <section> help."
+  echo "  Empty <command> prints <section> help."
   echo ""
   section_install
   echo ""
@@ -657,10 +712,11 @@ usage()
   section_helpers
 }
 
+# Parse section argument and dispatch to handler
 main()
 {
-  SECTION="$1"
+  SECTION="${1:-}"
-  shift
+  [[ $# -gt 0 ]] && shift
   # The main loop. The first keyword after $0 triggers section, or help.
   case "$SECTION" in
     install) section_install "$@" ;;
@@ -672,7 +728,7 @@ main()
     docs) section_docs "$@" ;;
     scripts) section_scripts "$@" ;;
     tests) section_tests "$@" ;;
-    *) usage && exit 0 ;;
+    *) usage && return 0 ;;
   esac
 }
 

local/bin/git-attributes

@@ -22,32 +22,37 @@ if [ "$DEBUG" -eq 1 ]; then
   set -x
 fi
 
-# Output functions
+# Print an error message in red
 msg_err()
 {
   echo -e "\e[31m$*\e[0m" >&2
 }
 
+# Print a success message in green
 msg_success()
 {
   echo -e "\e[32m$*\e[0m"
 }
 
+# Print a warning message in yellow
 msg_warn()
 {
   echo -e "\e[33m$*\e[0m" >&2
 }
 
+# Print an info message in blue
 msg_info()
 {
   echo -e "\e[36m$*\e[0m"
 }
 
+# Print a debug message when verbose mode is on
 msg_debug()
 {
   [[ $VERBOSE -eq 1 ]] && echo -e "\e[35m$*\e[0m"
 }
 
+# Display usage information and examples
 show_help()
 {
   cat << EOF