Add bind \cw backward-kill-word

nix flake update: 2026-01-08 12:24:24 UTC
unpacking 'https://flakehub.com/f/DeterminateSystems/determinate/%2A' into the Git cache... unpacking 'github:nix-community/home-manager/8c8a16d41353a174767c38b962359b51a56ca02e' into the Git cache... unpacking 'github:NixOS/nixpkgs/d351d0653aeb7877273920cd3e823994e7579b0b' into the Git cache... unpacking 'github:NixOS/nixpkgs/f244e841501d61e8fda288c2a9f56ca46e4429de' into the Git cache... unpacking 'github:NixOS/nixpkgs/5912c1772a44e31bf1c63c0390b90501e5026886' into the Git cache... • Updated input 'home-manager': 'github:nix-community/home-manager/c08430923ed417abc653884328a39e98496cfd0f?narHash=sha256-5SbmsLMgxzPd9YMbFR4IHfOXv6bjWs%2Bdfl6IbSq3r7s%3D' (2026-01-07) → 'github:nix-community/home-manager/8c8a16d41353a174767c38b962359b51a56ca02e?narHash=sha256-D3QzdIT11J66I4mzwmIpAGLzPAcbCS2VaKN8fmOe6%2BE%3D' (2026-01-08) • Updated input 'home-manager/nixpkgs': 'github:NixOS/nixpkgs/3c9db02515ef1d9b6b709fc60ba9a540957f661c?narHash=sha256-2GffSfQxe3sedHzK%2BsTKlYo/NTIAGzbFCIsNMUPAAnk%3D' (2026-01-05) → 'github:NixOS/nixpkgs/d351d0653aeb7877273920cd3e823994e7579b0b?narHash=sha256-r4GVX%2BFToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE%3D' (2026-01-07) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3c9db02515ef1d9b6b709fc60ba9a540957f661c?narHash=sha256-2GffSfQxe3sedHzK%2BsTKlYo/NTIAGzbFCIsNMUPAAnk%3D' (2026-01-05) → 'github:NixOS/nixpkgs/d351d0653aeb7877273920cd3e823994e7579b0b?narHash=sha256-r4GVX%2BFToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE%3D' (2026-01-07) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/c0fc386a2f5f7027de84c302659f16c93f8da151?narHash=sha256-Eu0eZDABynDaCPRr5bce4UpVcmRHioxG8pJTpPPMrWE%3D' (2026-01-07) → 'github:NixOS/nixpkgs/f244e841501d61e8fda288c2a9f56ca46e4429de?narHash=sha256-UP55tLruQPznPL6IMxTzRtx/jhvVhxMuF%2BCUpH78New%3D' (2026-01-08) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5?narHash=sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i%2BbwD6XxMb8A%3D' (2026-01-05) → 'github:NixOS/nixpkgs/5912c1772a44e31bf1c63c0390b90501e5026886?narHash=sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4%3D' (2026-01-07)
2026-01-12 09:54:06 +00:00 · 2026-01-11 09:04:48 -05:00 · 2026-01-08 07:24:24 -05:00 · 2026-01-07 07:39:51 -05:00 · 2026-01-07 07:17:14 -05:00 · 2026-01-06 12:42:40 -05:00
11 changed files with 250 additions and 758 deletions
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -14,7 +14,7 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
    - uses: cachix/install-nix-action@v31
      with:
        nix_path: nixpkgs=channel:nixos-unstable
--- a/README.md
+++ b/README.md
@@ -4,9 +4,31 @@ This repo stores nix configuration to manage my hosts running [NixOS](https://ni

 The configuration is very specific to my own machines and setup, but it may be a useful reference for anyone else learning or experimenting with nix, whether it be on a personal workstation or a server environment.

+```console
+❯ macchina
+
+        a8888b.           Host        -  dave@hephaestus
+       d888888b.          Machine     -  Micro-Star International Co., Ltd MS-7C02 1.0
+       8P"YP"Y88          Kernel      -  6.12.61
+       8|o||o|88          Distro      -  NixOS 25.11 (Xantusia)
+       8'    .88          DE          -  KDE
+       8`._.' Y8.         Packages    -  1 (cargo), 10998 (nix)
+      d/      `8b.        Shell       -  fish
+     dP        Y8b.       Terminal    -  alacritty
+    d8:       ::88b.      Resolution  -  2560x1440, 3840x2160
+   d8"         'Y88b      Uptime      -  26m
+  :8P           :888      CPU         -  AMD Ryzen 7 5700X 8-Core Processor (16)
+   8a.         _a88P      CPU Load    -  8%
+ ._/"Yaa     .| 88P|      Memory      -  10.7 GB / 32.8 GB
+ \    YP"    `|     `.
+ /     \.___.d|    .'
+ `--..__)     `._.'
+```
+
 ## Prerequisites

- [Determinate Nix](https://determinate.systems/nix-installer)
+- [NixOS](nixos.org) (Linux)
+- [Determinate Nix](https://determinate.systems/nix-installer) (macOS)
 - [just](https://github.com/casey/just)

 ## Build
@@ -43,6 +65,21 @@ To cleanup previous files, run nix garbage collection:
 just clean
 ```

-## Pre-commit hooks
+## Restoring from a live USB

-Run `nix develop` to install the pre-commit hooks.
+If the bootloader for some reason breaks (i.e. motherboard firmware upgrade), restore it from a live USB by running the following commands:
+
+```console
+$ sudo cryptsetup luksOpen /dev/nvme0n1p2 crypted-nixos
+Enter passphrase for /dev/nvme0n1p2: ********
+$ sudo mount /dev/vg/root /mnt
+$ sudo mount /dev/nvme0n1p1 /mnt/boot/efi
+$ sudo nixos-enter --root /mnt
+$ hostname <hostname>
+```
+
+Navigate to the nix-config directory and run:
+
+```sh
+just rebuild-boot
+```
--- a/common-packages.nix
+++ b/common-packages.nix
@@ -24,6 +24,9 @@
    fd
    github-cli
    hadolint
+    lazygit
+    macchina
+    ncdu
    progress
    ripgrep
    shellcheck
@@ -77,9 +80,6 @@
    openvpn
    tcpdump

-    # rice
-    fastfetch
-
    # nix
    nix-tree
    nixfmt-rfc-style
@@ -87,11 +87,6 @@
    nvd

    # python
-    poetry
-    (unstable.python3.withPackages (ps: [
-      ps.llm
-      ps.llm-ollama
-    ]))
    virtualenv

    # media
--- a/flake.lock
+++ b/flake.lock
@@ -1,73 +1,5 @@
 {
  "nodes": {
-    "base16": {
-      "inputs": {
-        "fromYaml": "fromYaml"
-      },
-      "locked": {
-        "lastModified": 1746562888,
-        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "type": "github"
-      }
-    },
-    "base16-fish": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1754405784,
-        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
-        "type": "github"
-      }
-    },
-    "base16-helix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1748408240,
-        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "type": "github"
-      }
-    },
-    "base16-vim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732806396,
-        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      }
-    },
    "darwin": {
      "inputs": {
        "nixpkgs": [
@@ -75,16 +7,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1759509947,
-        "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
+        "lastModified": 1767634391,
+        "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
+        "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
        "type": "github"
      },
      "original": {
        "owner": "lnl7",
-        "ref": "nix-darwin-25.05",
+        "ref": "nix-darwin-25.11",
        "repo": "nix-darwin",
        "type": "github"
      }
@@ -93,21 +25,17 @@
      "inputs": {
        "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin",
        "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux",
-        "determinate-nixd-x86_64-darwin": [
-          "determinate",
-          "determinate-nixd-aarch64-darwin"
-        ],
        "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux",
        "nix": "nix",
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1762366147,
-        "narHash": "sha256-wgdxpKPvkMqCdHwpO8/uboBHTWhLevVXpX0VxU+ahic=",
-        "rev": "43a73d8765c97ff76eac4ef543369891d4e2644d",
-        "revCount": 308,
+        "lastModified": 1766549083,
+        "narHash": "sha256-G1Hljg7vIBt8n9cxO382YAZWtZU/mYfQcg3icdNG8RQ=",
+        "rev": "ba8999fac986e70f52b4cba15047be7bbb7b6346",
+        "revCount": 318,
        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.12.2/019a55b3-b1fd-794d-ae5b-c6f07d0d0ca7/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.15.1/019b4e8a-dc22-75db-aef5-a447efbb1a13/source.tar.gz"
      },
      "original": {
        "type": "tarball",
@@ -117,53 +45,37 @@
    "determinate-nixd-aarch64-darwin": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-6Nk7pIXTTsdp52WJ7PgA2ocJoxNYlaS0c2iOBsfIlfM=",
+        "narHash": "sha256-uWDS94cAYprGj+AwuT42nuuDDicRLj1S0JwalZGeBRU=",
        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.2/macOS"
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/macOS"
      },
      "original": {
        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.2/macOS"
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/macOS"
      }
    },
    "determinate-nixd-aarch64-linux": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-Xd1H8NenrmJBbpVD0qcCWLqXiPz+WWm0MpZBDSgnMtE=",
+        "narHash": "sha256-uHBcZCh2/Bj5/88TDihupA336tSQDk7s5lVP66IDAX0=",
        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.2/aarch64-linux"
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/aarch64-linux"
      },
      "original": {
        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.2/aarch64-linux"
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/aarch64-linux"
      }
    },
    "determinate-nixd-x86_64-linux": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-e8RT5Jo5n3m95BXuUaIl05Bf0rUshb3S0lUhTPAQlZs=",
+        "narHash": "sha256-y+l05H6GNv/1WcrMztDYem8VBWqjc9gNg4WjeQ1PQxo=",
        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.2/x86_64-linux"
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/x86_64-linux"
      },
      "original": {
        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.2/x86_64-linux"
-      }
-    },
-    "firefox-gnome-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1748383148,
-        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "type": "github"
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/x86_64-linux"
      }
    },
    "flake-compat": {
@@ -182,22 +94,6 @@
        "type": "github"
      }
    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
@@ -227,32 +123,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760948891,
-        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749398372,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
        "type": "github"
      },
      "original": {
@@ -281,7 +156,7 @@
    },
    "flake-utils_2": {
      "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_3"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -297,22 +172,6 @@
        "type": "github"
      }
    },
-    "fromYaml": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731966426,
-        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "type": "github"
-      }
-    },
    "git-hooks-nix": {
      "inputs": {
        "flake-compat": "flake-compat",
@@ -339,59 +198,21 @@
        "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941"
      }
    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "gnome-shell": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744584021,
-        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
-        "owner": "GNOME",
-        "repo": "gnome-shell",
-        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "GNOME",
-        "ref": "48.1",
-        "repo": "gnome-shell",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1758463745,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "lastModified": 1767910483,
+        "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
        "repo": "home-manager",
        "type": "github"
      }
@@ -433,45 +254,26 @@
        "nixpkgs-regression": "nixpkgs-regression"
      },
      "locked": {
-        "lastModified": 1762362505,
-        "narHash": "sha256-Wm+ar8RmbGPCzmrYeou2T37WHTBRynMIsEb/uBiw/Ac=",
-        "rev": "72d304e9097a7307f2d4c1bf260f75a94871122b",
-        "revCount": 23176,
+        "lastModified": 1766546676,
+        "narHash": "sha256-GsC52VFF9Gi2pgP/haQyPdQoF5Qe2myk1tsPcuJZI28=",
+        "rev": "51dacdd248e8071cd0243a8245c8c42ac1f33307",
+        "revCount": 24299,
        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.12.2/019a5521-738e-7c3d-be11-70270771a4e2/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.15.1/019b4e84-d036-75db-b6c6-6bc2e2035c53/source.tar.gz"
      },
      "original": {
        "type": "tarball",
        "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A"
      }
    },
-    "nixos-needsreboot": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1747839748,
-        "narHash": "sha256-WoqPStYVlE+EU2Hm4chd57E8BGvVikCIPa3vnH/N+Qw=",
-        "owner": "thefossguy",
-        "repo": "nixos-needsreboot",
-        "rev": "d0deaf4e1f0a7f5f528ca9f1b96377d2845960cd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "thefossguy",
-        "ref": "master",
-        "repo": "nixos-needsreboot",
-        "type": "github"
-      }
-    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1755922037,
-        "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=",
-        "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c",
-        "revCount": 808723,
+        "lastModified": 1761597516,
+        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
+        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
+        "revCount": 811874,
        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.808723%2Brev-b1b3291469652d5a2edb0becc4ef0246fff97a7c/0198daf7-011a-7703-95d7-57146e794342/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz"
      },
      "original": {
        "type": "tarball",
@@ -496,11 +298,11 @@
    },
    "nixpkgs-master": {
      "locked": {
-        "lastModified": 1762471686,
-        "narHash": "sha256-yCVgOVyrcT4h5P9vfslK5gDNEyEwiPej9Ovksc6QI8U=",
+        "lastModified": 1767964817,
+        "narHash": "sha256-w8GpeC0gbKE6ftLbpZx7pgJ1zE9dPkWeOVs36tf481c=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "735cf1f2a15de9b5db06c260cf0ea826ef67f108",
+        "rev": "d009f91bd474d996c774ea57be5e65935c778577",
        "type": "github"
      },
      "original": {
@@ -528,11 +330,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
+        "lastModified": 1767767207,
+        "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
+        "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
        "type": "github"
      },
      "original": {
@@ -544,12 +346,12 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1762156382,
-        "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
-        "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717",
-        "revCount": 888688,
+        "lastModified": 1766314097,
+        "narHash": "sha256-laJftWbghBehazn/zxVJ8NdENVgjccsWAdAqKXhErrM=",
+        "rev": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055",
+        "revCount": 914780,
        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.888688%2Brev-7241bcbb4f099a66aafca120d37c65e8dda32717/019a4d5f-1342-7012-9c08-5af5fe8439c0/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.914780%2Brev-306ea70f9eb0fb4e040f8540e2deab32ed7e2055/019b49b8-ed0f-724e-bdaf-5fd90cc1c590/source.tar.gz"
      },
      "original": {
        "type": "tarball",
@@ -558,89 +360,43 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1753345091,
-        "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
+        "lastModified": 1767799921,
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1712867921,
-        "narHash": "sha256-edTFV4KldkCMdViC/rmpJa7oLIU8SE/S35lh/ukC7bg=",
-        "rev": "51651a540816273b67bc4dedea2d37d116c5f7fe",
-        "revCount": 557634,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2311.557634%2Brev-51651a540816273b67bc4dedea2d37d116c5f7fe/018ed69f-a175-7ab0-bc05-651225022c5a/source.tar.gz"
+        "lastModified": 1767799921,
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
+        "type": "github"
      },
      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A.tar.gz"
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
      }
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1762233356,
-        "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=",
+        "lastModified": 1763934636,
+        "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1759417375,
-        "narHash": "sha256-O7eHcgkQXJNygY6AypkF9tFhsoDQjpNEojw3eFs73Ow=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "dc704e6102e76aad573f63b74c742cd96f8f1e6c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1751211869,
-        "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1743814133,
-        "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b",
+        "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261",
        "type": "github"
      },
      "original": {
@@ -660,46 +416,20 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1762083835,
-        "narHash": "sha256-O5cqRhOiKDCHBZze4VJBZqRjX4B+DttSkAJcTEhDv1k=",
+        "lastModified": 1767448089,
+        "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "87abad151f662238ce9946895850609c1ca42a68",
+        "rev": "983751b66f255bbea1adc185364e9e7b73f82358",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixvim",
        "type": "github"
      }
    },
-    "nur": {
-      "inputs": {
-        "flake-parts": [
-          "stylix",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1751320053,
-        "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
    "nuschtosSearch": {
      "inputs": {
        "flake-utils": "flake-utils",
@@ -723,74 +453,18 @@
        "type": "github"
      }
    },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
-        "nixpkgs": "nixpkgs_6"
-      },
-      "locked": {
-        "lastModified": 1762441963,
-        "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "darwin": "darwin",
        "determinate": "determinate",
        "home-manager": "home-manager",
-        "nixos-needsreboot": "nixos-needsreboot",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
        "nixpkgs-master": "nixpkgs-master",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "nixvim": "nixvim",
-        "pre-commit-hooks": "pre-commit-hooks",
-        "stylix": "stylix",
        "vpngate": "vpngate"
      }
    },
-    "stylix": {
-      "inputs": {
-        "base16": "base16",
-        "base16-fish": "base16-fish",
-        "base16-helix": "base16-helix",
-        "base16-vim": "base16-vim",
-        "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_3",
-        "gnome-shell": "gnome-shell",
-        "nixpkgs": "nixpkgs_7",
-        "nur": "nur",
-        "systems": "systems_3",
-        "tinted-foot": "tinted-foot",
-        "tinted-kitty": "tinted-kitty",
-        "tinted-schemes": "tinted-schemes",
-        "tinted-tmux": "tinted-tmux",
-        "tinted-zed": "tinted-zed"
-      },
-      "locked": {
-        "lastModified": 1762295027,
-        "narHash": "sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx+X9Y=",
-        "owner": "danth",
-        "repo": "stylix",
-        "rev": "91b9a270523361268ba6a8772152fde31103869f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "danth",
-        "ref": "release-25.05",
-        "repo": "stylix",
-        "type": "github"
-      }
-    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
@@ -836,135 +510,17 @@
        "type": "github"
      }
    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "tinted-foot": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726913040,
-        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      }
-    },
-    "tinted-kitty": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735730497,
-        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "type": "github"
-      }
-    },
-    "tinted-schemes": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1750770351,
-        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "type": "github"
-      }
-    },
-    "tinted-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1751159871,
-        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "type": "github"
-      }
-    },
-    "tinted-zed": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1751158968,
-        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "type": "github"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
    "vpngate": {
      "inputs": {
        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1753748785,
-        "narHash": "sha256-IPdoF8KSFbAKp9gpTWi9qQv5+9qPjGDVPZKawIE0H+8=",
+        "lastModified": 1766183672,
+        "narHash": "sha256-24+gJj4UsxwQmdxSS3Aqo2fl0Ep13sYrTDvcHY24mwA=",
        "owner": "davegallant",
        "repo": "vpngate",
-        "rev": "0167804252a2297c1f81b5cbf1fbb772d26d3e1f",
+        "rev": "a668484da6b969d29dd2f74d5a4f2323fb48beef",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -5,19 +5,16 @@
    determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
    nixpkgs-master.url = "github:NixOS/nixpkgs/master";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
-    nixos-needsreboot.url = "github:thefossguy/nixos-needsreboot/master";
-    pre-commit-hooks.url = "github:cachix/git-hooks.nix";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
    darwin = {
-      url = "github:lnl7/nix-darwin/nix-darwin-25.05";
+      url = "github:lnl7/nix-darwin/nix-darwin-25.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    home-manager.url = "github:nix-community/home-manager/release-25.05";
+    home-manager.url = "github:nix-community/home-manager/release-25.11";
    nixvim = {
-      url = "github:nix-community/nixvim/nixos-25.05";
+      url = "github:nix-community/nixvim/nixos-25.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    stylix.url = "github:danth/stylix/release-25.05";
    vpngate.url = "github:davegallant/vpngate";
  };

@@ -30,9 +27,7 @@
      nixpkgs,
      nixpkgs-unstable,
      nixpkgs-master,
-      stylix,
      vpngate,
-      nixos-needsreboot,
      ...
    }@inputs:
    let
@@ -46,20 +41,6 @@
      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
    in
    {
-      checks = forAllSystems (system: {
-        pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
-          src = ./.;
-          hooks = {
-            nixfmt-rfc-style.enable = true;
-          };
-        };
-      });
-      devShells = forAllSystems (system: {
-        default = nixpkgs.legacyPackages.${system}.mkShell {
-          inherit (self.checks.${system}.pre-commit-check) shellHook;
-          buildInputs = self.checks.${system}.pre-commit-check.enabledPackages;
-        };
-      });
      nixosConfigurations =
        let
          unstable = import nixpkgs-unstable {
@@ -83,7 +64,6 @@
              ./hosts/hephaestus.nix
              ./common-packages.nix
              home-manager.nixosModules.home-manager
-              stylix.nixosModules.stylix
              (
                { ... }:
                {
@@ -117,7 +97,7 @@
                      useUserPackages = true;
                      users.dave.imports = [
                        ./home.nix
-                        inputs.nixvim.homeManagerModules.nixvim
+                        inputs.nixvim.homeModules.nixvim
                      ];
                      extraSpecialArgs = {
                        inherit unstable;
@@ -153,7 +133,6 @@

            modules = [
              home-manager.darwinModules.home-manager
-              stylix.darwinModules.stylix
              ./hosts/zelus.nix
              ./common-packages.nix
              (
@@ -166,7 +145,7 @@
                      useUserPackages = true;
                      users."dave.gallant".imports = [
                        ./home.nix
-                        inputs.nixvim.homeManagerModules.nixvim
+                        inputs.nixvim.homeModules.nixvim
                      ];
                      extraSpecialArgs = {
                        inherit unstable;
--- a/home.nix
+++ b/home.nix
@@ -8,25 +8,10 @@ let
  inherit (pkgs) stdenv;
 in
 {
-  home.stateVersion = "25.05";
+  home.stateVersion = "25.11";

  home.packages = with pkgs; [ just ];

-  stylix = {
-    enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
-
-    fonts.monospace = {
-      name = "FiraCode Nerd Font Mono";
-      package = "${pkgs.fira-mono}";
-    };
-
-    fonts.sansSerif = {
-      name = "FiraCode Nerd Font";
-      package = "${pkgs.fira-code}";
-    };
-  };
-
  services = {
    gpg-agent = {
      enable = stdenv.isLinux;
@@ -45,41 +30,42 @@ in

    direnv.enable = true;

+    diff-so-fancy = {
+      enable = true;
+      enableGitIntegration = true;
+    };
+
    git = {
      enable = true;

-      userName = "Dave Gallant";
-
-      diff-so-fancy.enable = true;
-
      lfs.enable = true;

-      aliases = {
-        aa = "add -A .";
-        br = "branch";
-        c = "commit -S";
-        cm = "commit -S -m";
-        ca = "commit -S --amend";
-        cane = "commit -S --amend --no-edit";
-        cb = "checkout -b";
-        co = "checkout";
-        cmp = "! git checkout main && git pl";
-        d = "diff";
-        dc = "diff --cached";
-        dcn = "diff --cached --name-only";
-        ds = "! git diff origin | sed -r 's/value: (.*)/value: \"************\"/'";
-        l = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
-        ms = "merge --squash";
-        p = "push origin";
-        pf = "push -f";
-        pl = "! git pull origin $(git rev-parse --abbrev-ref HEAD)";
-        st = "status";
-        wip = "for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads";
-      };
-
-      includes = [ { path = "~/.gitconfig-work"; } ];
-
-      extraConfig = {
+      settings = {
+        user.name = "Dave Gallant";
+        user.signingkey = "5A548984C7377E4D";
+        commit.gpgsign = true;
+        tag.gpgsign = true;
+        alias = {
+          aa = "add -A .";
+          br = "branch";
+          c = "commit";
+          cm = "commit -m";
+          ca = "commit --amend";
+          cane = "commit --amend --no-edit";
+          cb = "checkout -b";
+          co = "checkout";
+          cmp = "! git checkout main && git pl";
+          d = "diff";
+          dc = "diff --cached";
+          dcn = "diff --cached --name-only";
+          l = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
+          ms = "merge --squash";
+          p = "push origin";
+          pf = "push -f";
+          pl = "! git pull origin $(git rev-parse --abbrev-ref HEAD)";
+          st = "status";
+          wip = "for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads";
+        };
        push = {
          default = "current";
        };
@@ -87,6 +73,9 @@ in
          rebase = true;
        };
      };
+
+      includes = [ { path = "~/.gitconfig-work"; } ];
+
    };

    alacritty = {
@@ -97,7 +86,7 @@ in
        scrolling.history = 100000;
        general.live_config_reload = true;
        terminal.shell = {
-          program = "zsh";
+          program = "fish";
        };
        font = {
          size = lib.mkForce 14.0;
@@ -110,8 +99,7 @@ in

    starship = {
      enable = true;
-      enableZshIntegration = true;
-
+      enableFishIntegration = true;
      settings = {
        add_newline = false;
        gcloud = {
@@ -123,66 +111,45 @@ in
      };
    };

-    zsh = {
+    fish = {
      enable = true;
-      autosuggestion.enable = true;
-      enableCompletion = true;
-      syntaxHighlighting.enable = true;
-      history.size = 1000000;

-      localVariables = {
-        CASE_SENSITIVE = "true";
-        DISABLE_UNTRACKED_FILES_DIRTY = "true";
-        RPROMPT = ""; # override because macOS defaults to filepath
-        ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=#838383,underline";
-        ZSH_DISABLE_COMPFIX = "true";
-      };
+      interactiveShellInit = ''
+          set fish_greeting

-      envExtra = ''
-        export PAGER=less
-        export EDITOR=vim
-        export DOCKER_CLI_HINTS=false
-        export TERM=xterm-256color
+          bind \cw backward-kill-word

-        export DOCKER_DEFAULT_PLATFORM=linux/amd64
-        export NNN_FIFO="$XDG_RUNTIME_DIR/nnn.fifo";
+          set -x DOCKER_CLI_HINTS false
+          set -x DOCKER_DEFAULT_PLATFORM linux/amd64
+          set -x EDITOR vim
+          set -x NNN_FIFO "$XDG_RUNTIME_DIR/nnn.fifo"
+          set -x PAGER less
+          set -x TERM xterm-256color

-        export PATH=$PATH:~/.cargo/bin
-        export PATH=$PATH:~/.local/bin
-        export PATH=$PATH:~/.npm-packages/bin
-        export PATH=$PATH:/opt/homebrew/bin
-        export PATH=$PATH:~/.krew/bin
-        export PATH=$PATH:~/bin
-        export GOPATH=~/go
-        export GOBIN=$GOPATH/bin
-        export PATH=$PATH:$GOBIN
-      '';
+          set -x PATH $PATH \
+            ~/.cargo/bin \
+            ~/.local/bin \
+            ~/.npm-packages/bin \
+            /opt/homebrew/bin \
+            ~/.krew/bin \
+            ~/bin

-      initContent = ''
-        setopt noincappendhistory
+          # golang
+          set -x GOPATH ~/go
+          set -x GOBIN $GOPATH/bin
+          set -x PATH $PATH $GOBIN

-        source $HOME/.zsh-work
+          source $HOME/work.fish
+        # '';

-        if [[ "$OSTYPE" == "darwin"* ]];
-        then
-          export PATH="$(brew --prefix)/opt/gnu-tar/libexec/gnubin:$PATH"
-          alias xdg-open=open
-        fi
-
-        source <(helm completion zsh)
-        source <(kubectl completion zsh)
-        eval "$(atuin init zsh)"
-
-        # kubecolor
-        source <(kubectl completion zsh)
-        alias kubectl=kubecolor
-        # make completion work with kubecolor
-        compdef kubecolor=kubectl
+      shellInit = ''
+        atuin init fish | source
+        helm completion fish | source
+        kubectl completion fish | source
      '';

      shellAliases = {
        ".." = "cd ..";
-        c = "code";
        g = "git";
        gc = "git checkout $(git branch | fzf)";
        gco = "git checkout $(git branch -r | sed -e 's/^  origin\\///' | fzf)";
@@ -191,6 +158,7 @@ in
        grep = "rg --smart-case";
        j = "just";
        k = "kubecolor";
+        kubectl = "kubecolor";
        kp = "viddy 'kubectl get pods'";
        kcx = "kubectx";
        kns = "kubens";
@@ -202,10 +170,6 @@ in
        tree = "eza --tree";
        v = "nvim";
      };
-
-      "oh-my-zsh" = {
-        enable = true;
-      };
    };

    go = {
@@ -304,7 +268,6 @@ in
        lualine.enable = true;
        lsp.enable = true;
        lsp.servers = {
-          ansiblels.enable = true;
          bashls.enable = true;
          dockerls.enable = true;
          gopls.enable = true;
@@ -432,13 +395,11 @@ in
        "make"
        "material-icon-theme"
        "nix"
-        "tokyo-night"
        "toml"
        "vue"
      ];
      userSettings = {
        icon_theme = "Material Icon Theme";
-        theme = lib.mkForce "Tokyo Night";
        features = {
          edit_prediction_provider = "copilot";
        };
@@ -448,22 +409,26 @@ in
        };
        autosave = "on_focus_change";
        format_on_save = "off";
-      }
-      // (
-        if pkgs.stdenv.isLinux then
-          {
-            ui_font_size = lib.mkForce 20;
-            buffer_font_size = lib.mkForce 18;
-          }
-        else
-          { }
-      );
+        ui_font_size = lib.mkForce 18;
+        buffer_font_size = lib.mkForce 16;
+      };
+      userKeymaps = [
+        {
+          context = "Editor && !menu";
+          bindings = {
+            "ctrl-shift-c" = "editor::Copy";
+            "ctrl-shift-x" = "editor::Cut";
+            "ctrl-shift-v" = "editor::Paste";
+            "ctrl-z" = "editor::Undo";
+          };
+        }
+      ];
    };

    firefox = {
      enable = stdenv.isLinux;

-      package = unstable.librewolf;
+      package = pkgs.librewolf;

      profiles = {
        default = {
--- a/hosts/hephaestus.nix
+++ b/hosts/hephaestus.nix
@@ -1,4 +1,5 @@
 {
+
  config,
  lib,
  inputs,
@@ -13,16 +14,6 @@

  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

-  stylix = {
-    enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
-    image = pkgs.fetchurl {
-      url = "https://raw.githubusercontent.com/davegallant/nix-config/refs/heads/main/nixos-wallpaper.png";
-      sha256 = "Ztqn9+CHslr6wZdnOTeo/YNi/ICerpcFLyMArsZ/PIY=";
-    };
-    polarity = "dark";
-  };
-
  security.sudo-rs = {
    enable = true;
    execWheelOnly = true;
@@ -32,12 +23,8 @@
  boot = {
    kernelModules = [
      "kvm-amd"
-      "vfio_pci"
-      "vfio"
-      "vfio_iommu_type1"
-      "vfio_virqfd"
    ];
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages;
    kernelParams = [
      "amd_iommu=on"
    ];
@@ -68,7 +55,7 @@
      ];
      luks.devices."root" = {
        allowDiscards = true;
-        device = "/dev/disk/by-uuid/21cd166c-1528-49a4-b31b-0d408d48aa80";
+        device = "/dev/disk/by-uuid/89a14ac5-7723-4a0a-bb95-fb2fb2e92160";
        preLVM = true;
        keyFile = "./keyfile0.bin";
      };
@@ -83,7 +70,7 @@
    [
      bleachbit
      calibre
-      chromium
+      clamtk
      cryptsetup
      dbeaver-bin
      discord
@@ -92,16 +79,18 @@
      google-chrome
      hardinfo2
      httpie-desktop
+      heroic
      iputils
      kdePackages.bluedevil
+      kdePackages.kcalc
      kdePackages.kcharselect
      kdePackages.kclock
      kdePackages.kcolorchooser
      kdePackages.ksystemlog
+      kdePackages.partitionmanager
      kdePackages.sddm-kcm
      libation
-      libsForQt5.bluez-qt
-      mission-center
+      lutris
      mupen64plus
      nfs-utils
      onlyoffice-desktopeditors
@@ -110,13 +99,15 @@
      pika-backup
      pinentry-curses
      pinta
-      protonvpn-gui
-      qalculate-qt
+      protonup-qt
+      qbittorrent
      qemu
      traceroute
+      unrar
      unstable.beszel
-      unstable.obsidian
+      unstable.ktailctl
      unstable.mcpelauncher-ui-qt
+      unstable.obsidian
      unstable.podman
      unstable.podman-compose
      unstable.podman-desktop
@@ -132,21 +123,16 @@
      whois
      wine
      wl-clipboard
-      inputs.nixos-needsreboot.packages.${pkgs.system}.default
    ];


  fileSystems = {
    "/" = {
-      device = "/dev/disk/by-uuid/a6723178-6f18-428e-b541-9ac901861125";
-      fsType = "ext4";
-    };
-    "/home" = {
-      device = "/dev/disk/by-uuid/e3ab2e1a-bddf-4ae0-b00a-bf954c6c182b";
+      device = "/dev/disk/by-uuid/7f4f0948-041c-47e9-ab28-53132026f158";
      fsType = "ext4";
    };
    "/boot/efi" = {
-      device = "/dev/disk/by-uuid/3CFD-D749";
+      device = "/dev/disk/by-uuid/F1BD-5227";
      fsType = "vfat";
    };
    "/mnt/synology-2b/media" = {
@@ -163,7 +149,6 @@
    dejavu_fonts
    fira-mono
    font-awesome
-    google-fonts
    liberation_ttf
    nerd-fonts.droid-sans-mono
    nerd-fonts.fira-code
@@ -172,8 +157,8 @@
    nerd-fonts.ubuntu-mono
    noto-fonts
    noto-fonts-cjk-sans
-    noto-fonts-emoji
-    noto-fonts-extra
+    noto-fonts-color-emoji
+    noto-fonts
  ];

  fonts.fontconfig.defaultFonts = {
@@ -238,9 +223,16 @@
    };
  };

+  services = {
+     mullvad-vpn = {
+       enable = true;
+       package = pkgs.mullvad-vpn;
+     };
+  };
+
  system = {
    autoUpgrade.enable = true;
-    stateVersion = "25.05";
+    stateVersion = "25.11";
    activationScripts = {
      diff = {
        supportsDryActivation = true;
@@ -251,18 +243,12 @@
          fi
        '';
      };
-      needsreboot = {
-        supportsDryActivation = true;
-        text = ''
-          echo -e "\e[36mSystem changes requiring a reboot:\e[0m"
-          ${inputs.nixos-needsreboot.packages.${pkgs.system}.default}/bin/nixos-needsreboot --dry-run || true
-        '';
-      };
    };
  };

  nix = {
    extraOptions = "experimental-features = nix-command flakes";
+    settings.trusted-users = [ "root" "@wheel" ];
  };

  users.users.dave = {
@@ -270,9 +256,8 @@
    extraGroups = [
      "wheel"
      "libvirtd"
-      "corectrl"
    ];
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
  };

  i18n.defaultLocale = "en_US.UTF-8";
@@ -294,7 +279,10 @@

  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

+  documentation.man.generateCaches = false;
+
  programs = {
+    fish.enable = true;
    gnupg.agent = {
      enable = true;
      enableSSHSupport = true;
@@ -305,7 +293,6 @@
      enable = true;
      remotePlay.openFirewall = true;
    };
-    zsh.enable = true;
  };

  services.avahi = {
@@ -327,8 +314,6 @@
    displayManager.sddm.wayland.enable = true;
  };

-  services.flatpak.enable = true;
-
  services.printing.enable = true;

  services.resolved.enable = true;
@@ -340,33 +325,8 @@
    package = unstable.tailscale;
  };

-  services.ollama = {
-    package = pkgs.ollama;
-    enable = true;
-    # acceleration = "rocm";
-    host = "0.0.0.0";
-    environmentVariables = {
-      HSA_OVERRIDE_GFX_VERSION = "11.0.2";
-    };
-    loadModels = [
-      "dolphin3:8b"
-      "llama3.1"
-      "llava"
-    ];
-  };
-
-  services.open-webui = {
-    enable = true;
-    package = pkgs.open-webui;
-    host = "0.0.0.0";
-    environment = {
-      ANONYMIZED_TELEMETRY = "False";
-      DO_NOT_TRACK = "True";
-      SCARF_NO_ANALYTICS = "True";
-      OLLAMA_API_BASE_URL = "http://127.0.0.1:11434/api";
-      OLLAMA_BASE_URL = "http://127.0.0.1:11434";
-    };
-  };
+  services.clamav.daemon.enable = true;
+  services.clamav.updater.enable = true;

  services.opensnitch = {
    enable = true;
--- a/hosts/zelus.nix
+++ b/hosts/zelus.nix
@@ -12,15 +12,12 @@

  nix.enable = false;

-  programs.zsh = {
-    enable = true;
-    # https://github.com/nix-community/home-manager/issues/108#issuecomment-340397178
-    enableCompletion = false;
-  };
-
  system.stateVersion = 4;

  users.users."dave.gallant".home = "/Users/dave.gallant";
+  users.users."dave.gallant".shell = pkgs.fish;
+
+  programs.fish.enable = true;

  system.primaryUser = "dave.gallant";

@@ -93,6 +90,7 @@
    ];

    casks = [
+      "claude-code"
      "discord"
      "dbeaver-community"
      "font-fira-code-nerd-font"
@@ -106,7 +104,6 @@
      "lulu"
      "notunes"
      "obsidian"
-      "ollama"
      "raycast"
      "rectangle"
      "signal"
@@ -115,8 +112,9 @@
      "stats"
      "steam"
      "taskexplorer"
-      "tailscale"
+      "tailscale-app"
      "vlc"
+      "whisky"
      "zed"
    ];

@@ -129,9 +127,4 @@
    ];
  };

-  stylix = {
-    enable = true;
-    image = "/Library/tokyo-night.jpg";
-  };
-
 }
--- a/7
+++ b/7
@@ -5,10 +5,13 @@ alias r := rebuild

 arch := `uname -s`

-cmd := if arch == "Linux" { "nixos-rebuild --use-remote-sudo" } else { "darwin-rebuild" }
+cmd := if arch == "Linux" { "nixos-rebuild --sudo" } else { "sudo darwin-rebuild" }

 rebuild:
-  sudo $cmd switch --flake . -I nixos-config="hosts/$(hostname).nix" --show-trace
+  $cmd switch --flake .
+
+rebuild-boot:
+  $cmd boot --flake . --install-bootloader

 rollback:
  sudo $cmd switch --rollback --flake .
--- a/nixos-wallpaper.png
+++ b/nixos-wallpaper.png
--- a/update-flake.sh
+++ b/update-flake.sh
@@ -2,6 +2,10 @@

 set -euo pipefail

+if ! git diff-index --quiet HEAD --; then
+  git stash push -m "Auto-stash via update-flash.sh on $(date)"
+fi
+
 git pull
 update_msg=$(nix flake update 2>&1 | grep -v 'warning:')
 just rebuild