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)

README.md

@@ -4,7 +4,26 @@ 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.
 
-<img width="1903" height="986" alt="Image" src="https://github.com/user-attachments/assets/6cba837c-2b5e-4f6c-803e-dbbde81a8047" />
+```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
 
@@ -45,3 +64,22 @@ To cleanup previous files, run nix garbage collection:
 ```sh
 just clean
 ```
+
+## Restoring from a live USB
+
+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,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,7 +87,6 @@
     nvd
 
     # python
-    poetry
     virtualenv
 
     # media

flake.lock

@@ -1,73 +1,5 @@
 {
   "nodes": {
-    "base16": {
-      "inputs": {
-        "fromYaml": "fromYaml"
-      },
-      "locked": {
-        "lastModified": 1755819240,
-        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
-        "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": 1760703920,
-        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
-        "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,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765066094,
+        "lastModified": 1767634391,
-        "narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=",
+        "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "688427b1aab9afb478ca07989dc754fa543e03d5",
+        "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
         "type": "github"
       },
       "original": {
@@ -98,12 +30,12 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1765254444,
+        "lastModified": 1766549083,
-        "narHash": "sha256-kAO/ZeBnjaF+uqOP6qweXlRk2ylocLuv/9Dn8FsuPlU=",
+        "narHash": "sha256-G1Hljg7vIBt8n9cxO382YAZWtZU/mYfQcg3icdNG8RQ=",
-        "rev": "3ccc0297525e51ac3d7905509e0616c9c8350108",
+        "rev": "ba8999fac986e70f52b4cba15047be7bbb7b6346",
-        "revCount": 316,
+        "revCount": 318,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.14.0/019b0160-c5de-7941-9c26-cb47bc17eec3/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",
@@ -113,53 +45,37 @@
     "determinate-nixd-aarch64-darwin": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-6PWoqx52nvlWzlElTjcn7KAPKitfcKZYEFSsC3PoEoE=",
+        "narHash": "sha256-uWDS94cAYprGj+AwuT42nuuDDicRLj1S0JwalZGeBRU=",
         "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/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.14.0/macOS"
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/macOS"
       }
     },
     "determinate-nixd-aarch64-linux": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-b1e25BUPL7Qf0QVbYlfZ/+QiClrP/SHIjMPtA47aOLc=",
+        "narHash": "sha256-uHBcZCh2/Bj5/88TDihupA336tSQDk7s5lVP66IDAX0=",
         "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/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.14.0/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-8EI2f8IftPcRFlR6K4+cpIEAVf5UIeMCjHysEtVqDw0=",
+        "narHash": "sha256-y+l05H6GNv/1WcrMztDYem8VBWqjc9gNg4WjeQ1PQxo=",
         "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/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.14.0/x86_64-linux"
+        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/x86_64-linux"
-      }
-    },
-    "firefox-gnome-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1764724327,
-        "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "type": "github"
       }
     },
     "flake-compat": {
@@ -207,32 +123,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765495779,
+        "lastModified": 1765835352,
-        "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1763759067,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
         "type": "github"
       },
       "original": {
@@ -261,7 +156,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -277,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",
@@ -319,35 +198,16 @@
         "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941"
       }
     },
-    "gnome-shell": {
-      "flake": false,
-      "locked": {
-        "host": "gitlab.gnome.org",
-        "lastModified": 1764524476,
-        "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
-        "owner": "GNOME",
-        "repo": "gnome-shell",
-        "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
-        "type": "gitlab"
-      },
-      "original": {
-        "host": "gitlab.gnome.org",
-        "owner": "GNOME",
-        "ref": "gnome-49",
-        "repo": "gnome-shell",
-        "type": "gitlab"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1765605144,
+        "lastModified": 1767850628,
-        "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=",
+        "narHash": "sha256-D3QzdIT11J66I4mzwmIpAGLzPAcbCS2VaKN8fmOe6+E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "90b62096f099b73043a747348c11dbfcfbdea949",
+        "rev": "8c8a16d41353a174767c38b962359b51a56ca02e",
         "type": "github"
       },
       "original": {
@@ -394,12 +254,12 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1765252170,
+        "lastModified": 1766546676,
-        "narHash": "sha256-p98D44tYJMgB5Qet5S8cTQFdffk/GmoaGkpQtZ3hqJU=",
+        "narHash": "sha256-GsC52VFF9Gi2pgP/haQyPdQoF5Qe2myk1tsPcuJZI28=",
-        "rev": "1ddd28880651054346c34009d7bb9de36f1db2c1",
+        "rev": "51dacdd248e8071cd0243a8245c8c42ac1f33307",
-        "revCount": 23362,
+        "revCount": 24299,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.14.0/019b0159-8907-7fab-a120-9d287c7e6d2e/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",
@@ -438,11 +298,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1765639711,
+        "lastModified": 1767873505,
-        "narHash": "sha256-FHgcKgFONNW2epilU72fWou1D/P+DgRSDvswAlua9tg=",
+        "narHash": "sha256-UP55tLruQPznPL6IMxTzRtx/jhvVhxMuF+CUpH78New=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2e0977107afca75db2966c059105370da3c71da5",
+        "rev": "f244e841501d61e8fda288c2a9f56ca46e4429de",
         "type": "github"
       },
       "original": {
@@ -470,11 +330,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1765472234,
+        "lastModified": 1767767207,
-        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
+        "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
+        "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
         "type": "github"
       },
       "original": {
@@ -486,12 +346,12 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1764611609,
+        "lastModified": 1766314097,
-        "narHash": "sha256-yU9BNcP0oadUKupw0UKmO9BKDOVIg9NStdJosEbXf8U=",
+        "narHash": "sha256-laJftWbghBehazn/zxVJ8NdENVgjccsWAdAqKXhErrM=",
-        "rev": "8c29968b3a942f2903f90797f9623737c215737c",
+        "rev": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055",
-        "revCount": 905078,
+        "revCount": 914780,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.905078%2Brev-8c29968b3a942f2903f90797f9623737c215737c/019add91-3add-7a0d-8a25-9569cbe01efe/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",
@@ -500,11 +360,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1764983851,
+        "lastModified": 1767799921,
-        "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
         "type": "github"
       },
       "original": {
@@ -516,11 +376,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1765311797,
+        "lastModified": 1767799921,
-        "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=",
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
         "type": "github"
       },
       "original": {
@@ -531,22 +391,6 @@
       }
     },
     "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1764522689,
-        "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
       "locked": {
         "lastModified": 1763934636,
         "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=",
@@ -572,11 +416,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1765632205,
+        "lastModified": 1767448089,
-        "narHash": "sha256-2FVFinUhMwp2Z3OldK+WjlABf6jgaxhsx+cAJfH3OSY=",
+        "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "844cb1c1b72cda6baec95fd9f18c2937f8f6463c",
+        "rev": "983751b66f255bbea1adc185364e9e7b73f82358",
         "type": "github"
       },
       "original": {
@@ -586,31 +430,6 @@
         "type": "github"
       }
     },
-    "nur": {
-      "inputs": {
-        "flake-parts": [
-          "stylix",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1764773531,
-        "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
     "nuschtosSearch": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -643,43 +462,9 @@
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
-        "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_5",
-        "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": 1765478257,
-        "narHash": "sha256-GMCAQgs+h4aHhLP3LF6JxI5uNg+fLPlRhHwRrJJ+3+Y=",
-        "owner": "nix-community",
-        "repo": "stylix",
-        "rev": "a7fb3944d1fb4daa073ba82e1a9d34b5f05adb9f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-25.11",
-        "repo": "stylix",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -725,113 +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": 1763914658,
-        "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "type": "github"
-      }
-    },
-    "tinted-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1764465359,
-        "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "type": "github"
-      }
-    },
-    "tinted-zed": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1764464512,
-        "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "type": "github"
-      }
-    },
     "vpngate": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1764077616,
+        "lastModified": 1766183672,
-        "narHash": "sha256-5bhF1Pdrz5yq9mSMWzoPRKDx6fedRr55A8+v556MD/I=",
+        "narHash": "sha256-24+gJj4UsxwQmdxSS3Aqo2fl0Ep13sYrTDvcHY24mwA=",
         "owner": "davegallant",
         "repo": "vpngate",
-        "rev": "eda46dcce93b9246784e684e9cb7e8b96d53ee1d",
+        "rev": "a668484da6b969d29dd2f74d5a4f2323fb48beef",
         "type": "github"
       },
       "original": {

flake.nix

@@ -15,7 +15,6 @@
       url = "github:nix-community/nixvim/nixos-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    stylix.url = "github:nix-community/stylix/release-25.11";
     vpngate.url = "github:davegallant/vpngate";
   };
 
@@ -28,7 +27,6 @@
       nixpkgs,
       nixpkgs-unstable,
       nixpkgs-master,
-      stylix,
       vpngate,
       ...
     }@inputs:
@@ -66,7 +64,6 @@
               ./hosts/hephaestus.nix
               ./common-packages.nix
               home-manager.nixosModules.home-manager
-              stylix.nixosModules.stylix
               (
                 { ... }:
                 {
@@ -136,7 +133,6 @@
 
             modules = [
               home-manager.darwinModules.home-manager
-              stylix.darwinModules.stylix
               ./hosts/zelus.nix
               ./common-packages.nix
               (

home.nix

@@ -12,26 +12,6 @@ in
 
   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}";
-    };
-
-    targets = {
-      firefox.profileNames = [ "default" ];
-    };
-
-  };
-
   services = {
     gpg-agent = {
       enable = stdenv.isLinux;
@@ -62,13 +42,16 @@ in
 
       settings = {
         user.name = "Dave Gallant";
+        user.signingkey = "5A548984C7377E4D";
+        commit.gpgsign = true;
+        tag.gpgsign = true;
         alias = {
           aa = "add -A .";
           br = "branch";
-          c = "commit -S";
+          c = "commit";
-          cm = "commit -S -m";
+          cm = "commit -m";
-          ca = "commit -S --amend";
+          ca = "commit --amend";
-          cane = "commit -S --amend --no-edit";
+          cane = "commit --amend --no-edit";
           cb = "checkout -b";
           co = "checkout";
           cmp = "! git checkout main && git pl";
@@ -155,12 +138,14 @@ in
           set -x PATH $PATH $GOBIN
 
           source $HOME/work.fish
-
-          atuin init fish | source
-          helm completion fish | source
-          kubectl completion fish | source
         # '';
 
+      shellInit = ''
+        atuin init fish | source
+        helm completion fish | source
+        kubectl completion fish | source
+      '';
+
       shellAliases = {
         ".." = "cd ..";
         g = "git";
@@ -408,13 +393,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";
         };
@@ -424,8 +407,8 @@ in
         };
         autosave = "on_focus_change";
         format_on_save = "off";
-        ui_font_size = lib.mkForce 20;
+        ui_font_size = lib.mkForce 18;
-        buffer_font_size = lib.mkForce 18;
+        buffer_font_size = lib.mkForce 16;
       };
       userKeymaps = [
         {

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;
@@ -64,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";
       };
@@ -79,7 +70,7 @@
     [
       bleachbit
       calibre
-      chromium
+      clamtk
       cryptsetup
       dbeaver-bin
       discord
@@ -88,8 +79,10 @@
       google-chrome
       hardinfo2
       httpie-desktop
+      heroic
       iputils
       kdePackages.bluedevil
+      kdePackages.kcalc
       kdePackages.kcharselect
       kdePackages.kclock
       kdePackages.kcolorchooser
@@ -97,6 +90,7 @@
       kdePackages.partitionmanager
       kdePackages.sddm-kcm
       libation
+      lutris
       mupen64plus
       nfs-utils
       onlyoffice-desktopeditors
@@ -105,12 +99,13 @@
       pika-backup
       pinentry-curses
       pinta
-      protonvpn-gui
+      protonup-qt
-      qalculate-qt
+      qbittorrent
       qemu
       traceroute
       unrar
       unstable.beszel
+      unstable.ktailctl
       unstable.mcpelauncher-ui-qt
       unstable.obsidian
       unstable.podman
@@ -133,15 +128,11 @@
 
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/a6723178-6f18-428e-b541-9ac901861125";
+      device = "/dev/disk/by-uuid/7f4f0948-041c-47e9-ab28-53132026f158";
-      fsType = "ext4";
-    };
-    "/home" = {
-      device = "/dev/disk/by-uuid/e3ab2e1a-bddf-4ae0-b00a-bf954c6c182b";
       fsType = "ext4";
     };
     "/boot/efi" = {
-      device = "/dev/disk/by-uuid/3CFD-D749";
+      device = "/dev/disk/by-uuid/F1BD-5227";
       fsType = "vfat";
     };
     "/mnt/synology-2b/media" = {
@@ -158,7 +149,6 @@
     dejavu_fonts
     fira-mono
     font-awesome
-    google-fonts
     liberation_ttf
     nerd-fonts.droid-sans-mono
     nerd-fonts.fira-code
@@ -233,6 +223,13 @@
     };
   };
 
+  services = {
+     mullvad-vpn = {
+       enable = true;
+       package = pkgs.mullvad-vpn;
+     };
+  };
+
   system = {
     autoUpgrade.enable = true;
     stateVersion = "25.11";
@@ -251,6 +248,7 @@
 
   nix = {
     extraOptions = "experimental-features = nix-command flakes";
+    settings.trusted-users = [ "root" "@wheel" ];
   };
 
   users.users.dave = {
@@ -258,7 +256,6 @@
     extraGroups = [
       "wheel"
       "libvirtd"
-      "corectrl"
     ];
     shell = pkgs.fish;
   };
@@ -317,8 +314,6 @@
     displayManager.sddm.wayland.enable = true;
   };
 
-  services.flatpak.enable = true;
-
   services.printing.enable = true;
 
   services.resolved.enable = true;
@@ -330,6 +325,9 @@
     package = unstable.tailscale;
   };
 
+  services.clamav.daemon.enable = true;
+  services.clamav.updater.enable = true;
+
   services.opensnitch = {
     enable = true;
     rules = {

hosts/zelus.nix

@@ -112,8 +112,9 @@
       "stats"
       "steam"
       "taskexplorer"
-      "tailscale"
+      "tailscale-app"
       "vlc"
+      "whisky"
       "zed"
     ];
 
@@ -126,9 +127,4 @@
     ];
   };
 
-  stylix = {
-    enable = true;
-    image = "/Library/tokyo-night.jpg";
-  };
-
 }

justfile

@@ -5,10 +5,13 @@ alias r := rebuild
 
 arch := `uname -s`
 
-cmd := if arch == "Linux" { "nixos-rebuild --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 .