1719d54ee0
- New unified flake with two nixpkgs channels (unstable for desktops, 25.11 for muffin)
- modules/common-{doas,shell-fish,nix}.nix extracted from duplicated blocks
- modules/desktop-common.nix: renamed from system/common.nix; secret paths point to secrets/desktop/
- hosts/{mreow,yarn}/default.nix import desktop-common; yarn imports modules/no-rgb.nix
- hosts/muffin/default.nix imports common-* + server-prefixed modules + services/; duplicate doas/fish/nix blocks removed; gc retention preserved as mkForce override
- modules/age-secrets.nix: file paths → ../secrets/server/*.age
- services/{minecraft,matrix/livekit}: secret paths → ../secrets/server/
- home/profiles/*.nix: ./progs/ → ../progs/
- hosts/{mreow,yarn}/home.nix: imports rewired to ../../home/profiles/ and ../../home/progs/
- home/progs/pi.nix and hosts/yarn/home.nix: secret reads → ../../secrets/home/
- tests/*.nix: ../modules/security.nix → ../modules/server-security.nix; ../modules/overlays.nix → ../lib/overlays.nix
- lib/default.nix: takes explicit lib param (defaults to nixpkgs-stable.lib)
nixos
Unified NixOS flake for three hosts:
- mreow — Framework 13 AMD AI 300 laptop (nixos-unstable)
- yarn — AMD Zen 5 desktop with Jovian-NixOS Steam mode (nixos-unstable, pull-based updates)
- muffin — AMD Zen 3 server (nixos-25.11, deploy-rs, agenix, ZFS, Caddy + services)
This repository was created by merging the histories of dotfiles (mreow, yarn) and server-config (muffin)
via git subtree add. See git log --follow <file> to trace any file across the merge.
See AGENTS.md for development conventions.