Add bind \cw backward-kill-word

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)

.github/workflows/cachix.yml

@@ -14,7 +14,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: cachix/install-nix-action@v31
       with:
         nix_path: nixpkgs=channel:nixos-unstable

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
+```

common-packages.nix

@@ -24,7 +24,9 @@
     fd
     github-cli
     hadolint
-    pre-commit
+    lazygit
+    macchina
+    ncdu
     progress
     ripgrep
     shellcheck
@@ -33,6 +35,7 @@
     yq-go
 
     # containers
+    unstable.argocd
     unstable.k9s
     unstable.krew
     unstable.kubecolor
@@ -77,26 +80,16 @@
     openvpn
     tcpdump
 
-    # rice
-    fastfetch
-
     # nix
     nix-tree
     nixfmt-rfc-style
     nixpkgs-review
+    nvd
 
     # python
-    poetry
-    (unstable.python3.withPackages (ps: [
-      ps.llm
-      ps.llm-ollama
-    ]))
     virtualenv
 
     # media
     yt-dlp
-
-    # llm
-    llm
   ];
 }

flake.lock

@@ -1,72 +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": 1622559957,
-        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "type": "github"
-      }
-    },
-    "base16-helix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736852337,
-        "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
-        "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": [
@@ -74,16 +7,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1749744770,
-        "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
+        "lastModified": 1767634391,
+        "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
+        "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
         "type": "github"
       },
       "original": {
         "owner": "lnl7",
-        "ref": "nix-darwin-25.05",
+        "ref": "nix-darwin-25.11",
         "repo": "nix-darwin",
         "type": "github"
       }
@@ -92,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": 1750776470,
-        "narHash": "sha256-P3QSNR288jf2cl1l9+uahrpDRsbhD5zQpYAw9F+RFR8=",
-        "rev": "e7aec26c5809a91be15e454167462a0a23d5d3cd",
-        "revCount": 252,
+        "lastModified": 1766549083,
+        "narHash": "sha256-G1Hljg7vIBt8n9cxO382YAZWtZU/mYfQcg3icdNG8RQ=",
+        "rev": "ba8999fac986e70f52b4cba15047be7bbb7b6346",
+        "revCount": 318,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.6.7/0197a26c-50d5-7452-b465-c2be416f65de/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",
@@ -116,53 +45,37 @@
     "determinate-nixd-aarch64-darwin": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-lu2ZtVF8hLBgCp58FSXgowNkhlgijnsGJHAc2ubV39U=",
+        "narHash": "sha256-uWDS94cAYprGj+AwuT42nuuDDicRLj1S0JwalZGeBRU=",
         "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.6.7/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.6.7/macOS"
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/macOS"
       }
     },
     "determinate-nixd-aarch64-linux": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-SoZ5zBWwyZr/KD4vtRMxjNA0M/oFR7QTK0Xp97oRx+w=",
+        "narHash": "sha256-uHBcZCh2/Bj5/88TDihupA336tSQDk7s5lVP66IDAX0=",
         "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.6.7/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.6.7/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-mcBD5mliHui0BEXg64cgQbLSKMWJBydHvDCleBDnNsU=",
+        "narHash": "sha256-y+l05H6GNv/1WcrMztDYem8VBWqjc9gNg4WjeQ1PQxo=",
         "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.6.7/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.6.7/x86_64-linux"
-      }
-    },
-    "firefox-gnome-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744642301,
-        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
-        "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": {
@@ -181,37 +94,6 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -241,32 +123,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749398372,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
         "type": "github"
       },
       "original": {
@@ -295,7 +156,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -311,48 +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": {
-      "inputs": {
-        "flake-compat": [
-          "stylix",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore_2",
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
     "git-hooks-nix": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -379,103 +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"
-      }
-    },
-    "gitignore_2": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "git-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": 1750792728,
-        "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
+        "lastModified": 1767910483,
+        "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
+        "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747556831,
-        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -494,16 +231,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1748294338,
-        "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
+        "lastModified": 1754860581,
+        "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
         "owner": "NuschtOS",
         "repo": "ixx",
-        "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
+        "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
         "type": "github"
       },
       "original": {
         "owner": "NuschtOS",
-        "ref": "v0.0.8",
+        "ref": "v0.1.1",
         "repo": "ixx",
         "type": "github"
       }
@@ -517,12 +254,12 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1750774158,
-        "narHash": "sha256-3JtVZilOddowCXzGEy/CprNF8eMZkKCweqe07KBhE3Y=",
-        "rev": "c224b8359c978d378e3cea3a6782f2ee796ddb13",
-        "revCount": 21073,
+        "lastModified": 1766546676,
+        "narHash": "sha256-GsC52VFF9Gi2pgP/haQyPdQoF5Qe2myk1tsPcuJZI28=",
+        "rev": "51dacdd248e8071cd0243a8245c8c42ac1f33307",
+        "revCount": 24299,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.6.7/0197a264-b868-7e7d-a0b7-a5c61b32c575/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",
@@ -531,16 +268,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747179050,
-        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
-        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
-        "revCount": 799423,
+        "lastModified": 1761597516,
+        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
+        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
+        "revCount": 811874,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.799423%2Brev-adaa24fbf46737f3f1b5497bf64bae750f82942e/0196d1c3-1974-7bf1-bcf6-06620ac40c8c/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",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/%3D0.1.799423"
+        "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505"
       }
     },
     "nixpkgs-23-11": {
@@ -561,11 +298,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1750819411,
-        "narHash": "sha256-k2MPHVOetwoVCV/XKCueB6ZNCtSXijRTIyyT4Q6GIQg=",
+        "lastModified": 1767964817,
+        "narHash": "sha256-w8GpeC0gbKE6ftLbpZx7pgJ1zE9dPkWeOVs36tf481c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8eff0be761d12d7e463c2f2f3a863393ab5c5c4c",
+        "rev": "d009f91bd474d996c774ea57be5e65935c778577",
         "type": "github"
       },
       "original": {
@@ -593,11 +330,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1750506804,
-        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
+        "lastModified": 1767767207,
+        "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
+        "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
         "type": "github"
       },
       "original": {
@@ -609,12 +346,12 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1750605355,
-        "narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=",
-        "rev": "3078b9a9e75f1790e6d6ef9955fdc6a2d1740cc6",
-        "revCount": 820016,
+        "lastModified": 1766314097,
+        "narHash": "sha256-laJftWbghBehazn/zxVJ8NdENVgjccsWAdAqKXhErrM=",
+        "rev": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055",
+        "revCount": 914780,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.820016%2Brev-3078b9a9e75f1790e6d6ef9955fdc6a2d1740cc6/0197a072-ba84-7098-8145-0f1fbcbeaba2/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",
@@ -623,75 +360,43 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1750622754,
-        "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=",
+        "lastModified": 1767799921,
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1750622754,
-        "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=",
+        "lastModified": 1767799921,
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1730768919,
-        "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
+        "lastModified": 1763934636,
+        "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1747610100,
-        "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1743814133,
-        "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b",
+        "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261",
         "type": "github"
       },
       "original": {
@@ -711,46 +416,20 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1750512587,
-        "narHash": "sha256-kZqTQEARUkkKDFhECd0MGU4wXCJcxCdh5WeM/yD6oI4=",
+        "lastModified": 1767448089,
+        "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "b04bcdcbba4aa648903e065ad1907a97d4f7aee9",
+        "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": 1746056780,
-        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
     "nuschtosSearch": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -761,11 +440,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749730855,
-        "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=",
+        "lastModified": 1761730856,
+        "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742",
+        "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
         "type": "github"
       },
       "original": {
@@ -774,26 +453,6 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
-        "nixpkgs": "nixpkgs_5"
-      },
-      "locked": {
-        "lastModified": 1750779888,
-        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "darwin": "darwin",
@@ -803,47 +462,9 @@
         "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-compat": "flake-compat_3",
-        "flake-parts": "flake-parts_3",
-        "git-hooks": "git-hooks",
-        "gnome-shell": "gnome-shell",
-        "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs_6",
-        "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": 1750812391,
-        "narHash": "sha256-o70+4fKZjNBnHZdPyh3M5xKVBZ7u5Of+9gGc2Rg7Ob0=",
-        "owner": "danth",
-        "repo": "stylix",
-        "rev": "add70d533c017bf6f5da63e69a31c5f4ae201ad8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "danth",
-        "ref": "release-25.05",
-        "repo": "stylix",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -889,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": 1744974599,
-        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "type": "github"
-      }
-    },
-    "tinted-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745111349,
-        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "type": "github"
-      }
-    },
-    "tinted-zed": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1725758778,
-        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
-        "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_7"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1743991519,
-        "narHash": "sha256-PW2W6OjAPwU867e7RVRK/5E44OqEHo6y+rSFxEjjA4k=",
+        "lastModified": 1766183672,
+        "narHash": "sha256-24+gJj4UsxwQmdxSS3Aqo2fl0Ep13sYrTDvcHY24mwA=",
         "owner": "davegallant",
         "repo": "vpngate",
-        "rev": "5c069cb289145a38d14e09f03c9674d52a18fecf",
+        "rev": "a668484da6b969d29dd2f74d5a4f2323fb48beef",
         "type": "github"
       },
       "original": {

flake.nix

@@ -5,18 +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";
-    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";
   };
 
@@ -29,7 +27,6 @@
       nixpkgs,
       nixpkgs-unstable,
       nixpkgs-master,
-      stylix,
       vpngate,
       ...
     }@inputs:
@@ -44,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 {
@@ -75,14 +58,12 @@
               inherit unstable;
               inherit master;
               inherit vpngate;
+              inherit inputs;
             };
             modules = [
               ./hosts/hephaestus.nix
               ./common-packages.nix
-              ./upgrade-diff.nix
-              determinate.nixosModules.default
               home-manager.nixosModules.home-manager
-              stylix.nixosModules.stylix
               (
                 { ... }:
                 {
@@ -116,7 +97,7 @@
                       useUserPackages = true;
                       users.dave.imports = [
                         ./home.nix
-                        inputs.nixvim.homeManagerModules.nixvim
+                        inputs.nixvim.homeModules.nixvim
                       ];
                       extraSpecialArgs = {
                         inherit unstable;
@@ -152,11 +133,8 @@
 
             modules = [
               home-manager.darwinModules.home-manager
-              stylix.darwinModules.stylix
               ./hosts/zelus.nix
               ./common-packages.nix
-              ./upgrade-diff.nix
-
               (
                 { ... }:
                 {
@@ -167,7 +145,7 @@
                       useUserPackages = true;
                       users."dave.gallant".imports = [
                         ./home.nix
-                        inputs.nixvim.homeManagerModules.nixvim
+                        inputs.nixvim.homeModules.nixvim
                       ];
                       extraSpecialArgs = {
                         inherit unstable;

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,12 +73,33 @@ in
           rebase = true;
         };
       };
+
+      includes = [ { path = "~/.gitconfig-work"; } ];
+
+    };
+
+    alacritty = {
+      enable = stdenv.isLinux;
+      settings = {
+        window.padding.x = 10;
+        window.padding.y = 10;
+        scrolling.history = 100000;
+        general.live_config_reload = true;
+        terminal.shell = {
+          program = "fish";
+        };
+        font = {
+          size = lib.mkForce 14.0;
+        };
+        window = {
+          opacity = lib.mkForce 0.9;
+        };
+      };
     };
 
     starship = {
       enable = true;
-      enableZshIntegration = true;
-
+      enableFishIntegration = true;
       settings = {
         add_newline = false;
         gcloud = {
@@ -104,63 +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 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 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
 
-      initContent = ''
-        setopt noincappendhistory
+          set -x PATH $PATH \
+            ~/.cargo/bin \
+            ~/.local/bin \
+            ~/.npm-packages/bin \
+            /opt/homebrew/bin \
+            ~/.krew/bin \
+            ~/bin
 
-        source $HOME/.zsh-work
+          # golang
+          set -x GOPATH ~/go
+          set -x GOBIN $GOPATH/bin
+          set -x PATH $PATH $GOBIN
 
-        if [[ "$OSTYPE" == "darwin"* ]];
-        then
-          export PATH="$(brew --prefix)/opt/gnu-tar/libexec/gnubin:$PATH"
-          alias xdg-open=open
-        fi
+          source $HOME/work.fish
+        # '';
 
-        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)";
@@ -169,6 +158,7 @@ in
         grep = "rg --smart-case";
         j = "just";
         k = "kubecolor";
+        kubectl = "kubecolor";
         kp = "viddy 'kubectl get pods'";
         kcx = "kubectx";
         kns = "kubens";
@@ -180,10 +170,6 @@ in
         tree = "eza --tree";
         v = "nvim";
       };
-
-      "oh-my-zsh" = {
-        enable = true;
-      };
     };
 
     go = {
@@ -194,6 +180,32 @@ in
       enable = true;
     };
 
+    nnn = {
+      enable = stdenv.isLinux;
+      package = pkgs.nnn.override ({ withNerdIcons = true; });
+      bookmarks = {
+        d = "~/Downloads";
+        p = "~/src/";
+        c = "~/.config";
+        h = "~";
+      };
+      extraPackages = with pkgs; [
+        bat
+        eza
+        fzf
+        imv
+        mediainfo
+        ffmpegthumbnailer
+      ];
+      plugins = {
+        src = "${pkgs.nnn.src}/plugins";
+        mappings = {
+          p = "preview-tui";
+          o = "fzopen";
+        };
+      };
+    };
+
     nixvim = {
       enable = true;
       viAlias = true;
@@ -256,7 +268,6 @@ in
         lualine.enable = true;
         lsp.enable = true;
         lsp.servers = {
-          ansiblels.enable = true;
           bashls.enable = true;
           dockerls.enable = true;
           gopls.enable = true;
@@ -373,27 +384,51 @@ in
       '';
     };
 
-    vscode = {
+    zed-editor = {
       enable = stdenv.isLinux;
-      package = unstable.vscode;
-      profiles.default.extensions =
-        with unstable.vscode-extensions;
-        [
-          bbenoist.nix
-          github.vscode-pull-request-github
-          golang.go
-          hashicorp.terraform
-          ms-dotnettools.csharp
-          ms-kubernetes-tools.vscode-kubernetes-tools
-          redhat.vscode-yaml
-        ]
-        ++ lib.optionals stdenv.isLinux [ ms-python.python ];
+      package = unstable.zed-editor;
+      extensions = [
+        "ansible"
+        "color-highlight"
+        "dockerfile"
+        "html"
+        "make"
+        "material-icon-theme"
+        "nix"
+        "toml"
+        "vue"
+      ];
+      userSettings = {
+        icon_theme = "Material Icon Theme";
+        features = {
+          edit_prediction_provider = "copilot";
+        };
+        vim_mode = true;
+        vim = {
+          use_system_clipboard = "on_yank";
+        };
+        autosave = "on_focus_change";
+        format_on_save = "off";
+        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 = {

hosts/hephaestus.nix

@@ -1,6 +1,8 @@
 {
+
   config,
   lib,
+  inputs,
   master,
   modulesPath,
   pkgs,
@@ -8,28 +10,10 @@
   vpngate,
   ...
 }:
-let
-  gnomeExtensions = with pkgs.gnomeExtensions; [
-    caffeine
-    clipboard-history
-    grand-theft-focus
-  ];
-in
 {
 
   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";
-    fonts.sizes.desktop = 24;
-  };
-
   security.sudo-rs = {
     enable = true;
     execWheelOnly = true;
@@ -39,12 +23,8 @@ in
   boot = {
     kernelModules = [
       "kvm-amd"
-      "vfio_pci"
-      "vfio"
-      "vfio_iommu_type1"
-      "vfio_virqfd"
     ];
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages;
     kernelParams = [
       "amd_iommu=on"
     ];
@@ -75,7 +55,7 @@ in
       ];
       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";
       };
@@ -88,61 +68,71 @@ in
   environment.systemPackages =
     with pkgs;
     [
-      android-studio
-      android-tools
       bleachbit
       calibre
-      chromium
+      clamtk
       cryptsetup
+      dbeaver-bin
       discord
-      docker-compose
       freefilesync
       gimp-with-plugins
-      gnome-tweaks
+      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
-      mission-center
+      lutris
       mupen64plus
       nfs-utils
       onlyoffice-desktopeditors
       opensnitch-ui
-      pavucontrol
       pciutils
       pika-backup
       pinentry-curses
-      protonvpn-gui
+      pinta
+      protonup-qt
+      qbittorrent
       qemu
-      ryujinx
       traceroute
-      unityhub
+      unrar
       unstable.beszel
-      unstable.ghostty
+      unstable.ktailctl
+      unstable.mcpelauncher-ui-qt
       unstable.obsidian
+      unstable.podman
+      unstable.podman-compose
+      unstable.podman-desktop
+      unstable.ryubing
       unstable.signal-desktop-bin
-      unstable.spotify
       unstable.tailscale
       unstable.zoom-us
       usbutils
       virt-manager
       vlc
       vpngate.packages.x86_64-linux.default
+      wayland-utils
       whois
       wine
-    ]
-    ++ gnomeExtensions;
+      wl-clipboard
+    ];
+
 
   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" = {
@@ -159,7 +149,6 @@ in
     dejavu_fonts
     fira-mono
     font-awesome
-    google-fonts
     liberation_ttf
     nerd-fonts.droid-sans-mono
     nerd-fonts.fira-code
@@ -168,8 +157,8 @@ in
     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 = {
@@ -234,24 +223,41 @@ in
     };
   };
 
+  services = {
+     mullvad-vpn = {
+       enable = true;
+       package = pkgs.mullvad-vpn;
+     };
+  };
+
   system = {
     autoUpgrade.enable = true;
-    stateVersion = "25.05";
+    stateVersion = "25.11";
+    activationScripts = {
+      diff = {
+        supportsDryActivation = true;
+        text = ''
+          if [[ -e /run/current-system ]]; then
+            echo -e "\e[36mPackage version diffs:\e[0m"
+            ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
+          fi
+        '';
+      };
+    };
   };
 
   nix = {
     extraOptions = "experimental-features = nix-command flakes";
+    settings.trusted-users = [ "root" "@wheel" ];
   };
 
   users.users.dave = {
     isNormalUser = true;
     extraGroups = [
-      "docker"
       "wheel"
       "libvirtd"
-      "corectrl"
     ];
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
   };
 
   i18n.defaultLocale = "en_US.UTF-8";
@@ -264,6 +270,8 @@ in
 
   time.timeZone = "America/Toronto";
 
+  hardware.bluetooth.enable = true;
+
   hardware.graphics = {
     enable = true;
     enable32Bit = true;
@@ -271,17 +279,20 @@ in
 
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
+  documentation.man.generateCaches = false;
+
   programs = {
+    fish.enable = true;
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
     };
+    kdeconnect.enable = true;
     nix-ld.enable = true;
     steam = {
       enable = true;
       remotePlay.openFirewall = true;
     };
-    zsh.enable = true;
   };
 
   services.avahi = {
@@ -297,9 +308,11 @@ in
     };
   };
 
-  services.flatpak.enable = true;
-
-  services.gnome.gnome-keyring.enable = true;
+  services = {
+    desktopManager.plasma6.enable = true;
+    displayManager.sddm.enable = true;
+    displayManager.sddm.wayland.enable = true;
+  };
 
   services.printing.enable = true;
 
@@ -312,45 +325,8 @@ in
     package = unstable.tailscale;
   };
 
-  services.xserver = {
-    enable = true;
-    displayManager = {
-      gdm = {
-        enable = true;
-        wayland = true;
-      };
-    };
-    desktopManager.gnome.enable = true;
-    videoDrivers = [ "amdgpu" ];
-  };
-
-  services.ollama = {
-    package = master.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 = unstable.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;
@@ -497,7 +473,6 @@ in
   };
 
   virtualisation = {
-    docker.enable = true;
     podman.enable = true;
     libvirtd = {
       enable = true;

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";
 
@@ -39,13 +36,11 @@
       tilesize = 50;
       orientation = "bottom";
       persistent-apps = [
-        "/Applications/Ghostty.app"
+        "/Applications/iTerm.app"
         "/Applications/Google Chrome.app"
         "/Applications/LibreWolf.app"
         "/Applications/Obsidian.app"
         "/Applications/Slack.app"
-        "/Applications/Spotify.app"
-        "/Applications/Visual Studio Code.app"
         "/Applications/zoom.us.app"
       ];
     };
@@ -88,18 +83,20 @@
       "coreutils"
       "gnu-sed"
       "gnu-tar"
+      "k6"
       "node"
       "oras"
-      "k6"
+      "vault"
     ];
 
     casks = [
+      "claude-code"
       "discord"
       "dbeaver-community"
       "font-fira-code-nerd-font"
       "font-hack-nerd-font"
       "fork"
-      "ghostty"
+      "freelens"
       "iterm2"
       "karabiner-elements"
       "knockknock"
@@ -107,7 +104,6 @@
       "lulu"
       "notunes"
       "obsidian"
-      "ollama"
       "raycast"
       "rectangle"
       "signal"
@@ -116,11 +112,14 @@
       "stats"
       "steam"
       "taskexplorer"
-      "tailscale"
+      "tailscale-app"
       "vlc"
+      "whisky"
+      "zed"
     ];
 
     taps = [
+      "hashicorp/tap"
       "homebrew/bundle"
       "homebrew/cask-fonts"
       "homebrew/cask-versions"
@@ -128,9 +127,4 @@
     ];
   };
 
-  stylix = {
-    enable = true;
-    image = "/Library/tokyo-night.jpg";
-  };
-
 }

justfile

@@ -5,13 +5,16 @@ 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"
+  $cmd switch --flake .
+
+rebuild-boot:
+  $cmd boot --flake . --install-bootloader
 
 rollback:
-  $cmd switch --rollback --flake .
+  sudo $cmd switch --rollback --flake .
 
 channel-update:
   nix-channel --update

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

upgrade-diff.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-  system.activationScripts.diff = {
-    supportsDryActivation = true;
-    text = ''
-      ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
-    '';
-  };
-}