flake.lock: Update

Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/036d480ae895afff54da5034331950827a7f317a' (2024-01-14)
  → 'github:nix-community/disko/d0b4408eaf782a1ada0a9133bb1cecefdd59c696' (2024-01-15)
• Updated input 'firefox-gnome-theme':
    'github:rafaelmardojai/firefox-gnome-theme/7a1a81baa7c31d75764dcea908285e487302d32a' (2024-01-07)
  → 'github:rafaelmardojai/firefox-gnome-theme/eb7c43d11abc157f97d032018115c9f7b04ca4de' (2024-01-15)
• Updated input 'home-manager':
    'github:nix-community/home-manager/5f0ab0eedc6ede69beb8f45561ffefa54edc6e65' (2024-01-11)
  → 'github:nix-community/home-manager/924d91e1e4c802fd8e60279a022dbae5acb36f2d' (2024-01-14)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/ef811636cc847355688804593282078bac7758d4' (2024-01-13)
  → 'github:NixOS/nixos-hardware/bee2202bec57e521e3bd8acd526884b9767d7fa0' (2024-01-15)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3dc440faeee9e889fe2d1b4d25ad0f430d449356' (2024-01-10)
  → 'github:NixOS/nixpkgs/428544ae95eec077c7f823b422afae5f174dee4b' (2024-01-13)

README.md

@@ -9,8 +9,16 @@ System and user configuration for NixOS-based systems.
 | **Theme:** | adwaita |
 | **Terminal:** | Console |
 
-## Quick start
-1. Copy SSH keypair and `known_hosts` to `~/.ssh`
-1. Import GPG keys and set ultimate trust with `echo "KEYID:6:" | gpg --import-ownertrust`
-1. `git clone git@git.vimium.com:jordan/nix-config.git projects/jordan/nix-config`
-1. `sudo nixos-rebuild switch --flake .#`
+## Provisioning
+> [nixos-anywhere](https://github.com/nix-community/nixos-anywhere) is the module used for provisioning
+
+Generate a new SSH host key in "$temp/etc/ssh" as per [this guide](https://nix-community.github.io/nixos-anywhere/howtos/secrets.html#example-decrypting-an-openssh-host-key-with-pass).
+
+Then run;
+```
+nix run github:nix-community/nixos-anywhere -- \
+  --disk-encryption-keys /tmp/secret.key /tmp/secret.key \
+  --extra-files "$temp" \
+  --flake .#<hostname> \
+  root@<ip>
+```

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1703371241,
-        "narHash": "sha256-f7ZcabJ5iAH2IRfVuI55xSPZ9TbegFzvFxoKtIPNEn8=",
+        "lastModified": 1703433843,
+        "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "457669db4259ff69d1ac1183aaa6000420940c1f",
+        "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1703087360,
-        "narHash": "sha256-0VUbWBW8VyiDRuimMuLsEO4elGuUw/nc2WDeuO1eN1M=",
+        "lastModified": 1704875591,
+        "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "b709d63debafce9f5645a5ba550c9e0983b3d1f7",
+        "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b",
         "type": "github"
       },
       "original": {
@@ -63,14 +63,34 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1705348229,
+        "narHash": "sha256-CssPema1sBxZkrT95KFuKCNNiqxNe1lnf2QNeXk88Xk=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "d0b4408eaf782a1ada0a9133bb1cecefdd59c696",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1703023593,
-        "narHash": "sha256-M+Cw6vh7xCDmIhyVuEPNmaNVUwpmdFQq8zlsXZTKees=",
+        "lastModified": 1705281830,
+        "narHash": "sha256-gpUrma8XjAnHULRmD5RRVVZJNvxFrIEyGQLx6oEE9D4=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "bad853333d9021e7012adb9b8fbfe7a7003f26bc",
+        "rev": "eb7c43d11abc157f97d032018115c9f7b04ca4de",
         "type": "github"
       },
       "original": {
@@ -123,11 +143,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703367386,
-        "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=",
+        "lastModified": 1705273357,
+        "narHash": "sha256-JAlkxgJbWh7+auiT0rJL3IUXXtkULRqygfxQA6mvLgc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224",
+        "rev": "924d91e1e4c802fd8e60279a022dbae5acb36f2d",
         "type": "github"
       },
       "original": {
@@ -139,11 +159,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1702453208,
-        "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
+        "lastModified": 1705312285,
+        "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
+        "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0",
         "type": "github"
       },
       "original": {
@@ -186,11 +206,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1703068421,
-        "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=",
+        "lastModified": 1705183652,
+        "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f",
+        "rev": "428544ae95eec077c7f823b422afae5f174dee4b",
         "type": "github"
       },
       "original": {
@@ -203,6 +223,7 @@
       "inputs": {
         "agenix": "agenix",
         "deploy-rs": "deploy-rs",
+        "disko": "disko",
         "firefox-gnome-theme": "firefox-gnome-theme",
         "home-manager": "home-manager_2",
         "nixos-hardware": "nixos-hardware",
@@ -214,11 +235,11 @@
     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1702936962,
-        "narHash": "sha256-uIZ2uPE26JKJ58463ejHMiAOpqBwflyN6tCmZ89vaSQ=",
+        "lastModified": 1704547919,
+        "narHash": "sha256-yc0l7p6bHjR6HD6N09U/G3igHUPDUnZyFliTw7XC3VA=",
         "ref": "refs/heads/master",
-        "rev": "c6db5c3ba8bff0e618fc3e31c9680863c5e53800",
-        "revCount": 5,
+        "rev": "b11b903ed707826a756b7803633f4684a19e637d",
+        "revCount": 11,
         "type": "git",
         "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
       },

flake.nix

@@ -5,6 +5,10 @@
     nixpkgs.url = "nixpkgs/nixos-23.11";
     agenix.url = "github:ryantm/agenix";
     deploy-rs.url = "github:serokell/deploy-rs";
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     home-manager = {
       url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -24,7 +28,7 @@
     };
   };
 
-  outputs = inputs @ { self, nixpkgs, agenix, deploy-rs, home-manager, nixos-hardware, secrets, ... }:
+  outputs = inputs @ { self, nixpkgs, agenix, deploy-rs, disko, home-manager, nixos-hardware, secrets, ... }:
     let
       nixpkgsForSystem = system: inputs.nixpkgs;
       overlays = [
@@ -33,6 +37,7 @@
       ];
       commonModules = [
         agenix.nixosModules.age
+        disko.nixosModules.disko
         home-manager.nixosModule
         ./modules
       ];
@@ -66,6 +71,7 @@
         atlas = nixosSystem { system = "x86_64-linux"; name = "atlas"; };
         eos = nixosSystem { system = "x86_64-linux"; name = "eos"; };
         helios = nixosSystem { system = "x86_64-linux"; name = "helios"; };
+        hypnos = nixosSystem { system = "x86_64-linux"; name = "hypnos"; };
         odyssey = nixosSystem { system = "x86_64-linux"; name = "odyssey"; };
         pi = nixosSystem { system = "aarch64-linux"; name = "pi"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; };
       };

hosts/helios/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 {
   imports = [
@@ -6,13 +6,19 @@
     ../desktop.nix
   ];
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-  boot.loader.grub.zfsSupport = true;
+  boot = {
+    loader.grub = {
+      enable = true;
+      device = "/dev/sda";
+      zfsSupport = true;
+    };
+  };
 
-  networking.hostName = "helios";
-  networking.hostId = "47d23505";
-  networking.networkmanager.enable = true;
+  networking = {
+    hostName = "helios";
+    hostId = "47d23505";
+    networkmanager.enable = true;
+  };
 
   nix.package = pkgs.nixFlakes;
   nix.extraOptions = ''
@@ -40,6 +46,15 @@
       gpg.enable = true;
       pass.enable = true;
     };
+    services = {
+      borgmatic = {
+        enable = true;
+        directories = [
+          "/home/jordan/Documents"
+        ];
+        repoPath = "ssh://b9cjl9hq@b9cjl9hq.repo.borgbase.com/./repo";
+      };
+    };
     shell = {
       git.enable = true;
       zsh.enable = true;

hosts/hypnos/README.md

@@ -0,0 +1,35 @@
+# Hypnos
+
+## Overview
+15-inch MacBook Pro 11,3 (Mid 2014).
+
+## Specs
+* CPU - Intel Core i7-4870HQ @ 2.50GHz
+* Memory - 16 GB DDR3
+* GPU - Intel Iris Pro 5200
+* GPU - NVIDIA GeForce GT 750M
+* NIC - Broadcom BCM43xx 802.11ac
+
+### Disks
+Device | Partitions _(filesystem, size, usage)_
+--- | ---
+Apple SSD SM0512F | `/dev/sda1` (EFI, 256 MiB, NixOS Boot) <br> `/dev/sda2` (ZFS, 500 GiB, NixOS Root)
+
+#### ZFS pool layout
+```
+rpool/
+├── local
+│   ├── nix
+│   └── tmp
+├── system
+│   ├── root
+│   └── var
+└── user
+    └── home
+```
+
+See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datasets) for the motivation behind these datasets.
+
+### Networks
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `hypnos.mesh.vimium.net`.

hosts/hypnos/default.nix

@@ -0,0 +1,50 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    ./disko-config.nix
+    ../desktop.nix
+  ];
+
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
+
+  networking = {
+    hostName = "hypnos";
+    hostId = "cf791898";
+  };
+
+  nix = {
+    package = pkgs.nixFlakes;
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };
+
+  modules = {
+    desktop = {
+      browsers = {
+        firefox.enable = true;
+      };
+    };
+    dev = {
+      node.enable = true;
+    };
+    editors = {
+      neovim.enable = true;
+    };
+    security = {
+      gpg.enable = true;
+      pass.enable = true;
+    };
+    shell = {
+      git.enable = true;
+      zsh.enable = true;
+    };
+  };
+
+  system.stateVersion = "22.11";
+}

hosts/hypnos/disko-config.nix

@@ -0,0 +1,126 @@
+{ lib, ... }:
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = "/dev/disk/by-id/ata-APPLE_SSD_SM0512F_S1K5NYBF736152";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "256M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
+            zfs = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "rpool";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      rpool = {
+        type = "zpool";
+        options = {
+          ashift = "12";
+        };
+        rootFsOptions = {
+          canmount = "off";
+          mountpoint = "none";
+          dnodesize = "auto";
+          xattr = "sa";
+        };
+        postCreateHook = "zfs snapshot rpool@blank";
+        datasets = {
+          local = {
+            type = "zfs_fs";
+            options = {
+              mountpoint = "none";
+            };
+          };
+          "local/nix" = {
+            type = "zfs_fs";
+            mountpoint = "/nix";
+            options = {
+              atime = "off";
+              mountpoint = "legacy";
+            };
+          };
+          "local/tmp" = {
+            type = "zfs_fs";
+            mountpoint = "/tmp";
+            options = {
+              setuid = "off";
+              devices = "off";
+              mountpoint = "legacy";
+            };
+          };
+          system = {
+            type = "zfs_fs";
+            mountpoint = "/";
+            options = {
+              mountpoint = "legacy";
+            };
+          };
+          "system/var" = {
+            type = "zfs_fs";
+            mountpoint = "/var";
+            options = {
+              mountpoint = "legacy";
+            };
+          };
+          "system/var/tmp" = {
+            type = "zfs_fs";
+            mountpoint = "/var/tmp";
+            options = {
+              devices = "off";
+              mountpoint = "legacy";
+            };
+          };
+          "system/var/log" = {
+            type = "zfs_fs";
+            mountpoint = "/var/log";
+            options = {
+              compression = "on";
+              acltype = "posix";
+              mountpoint = "legacy";
+            };
+          };
+          user = {
+            type = "zfs_fs";
+            options = {
+              mountpoint = "none";
+              encryption = "aes-256-gcm";
+              keyformat = "passphrase";
+              keylocation = "file:///tmp/secret.key";
+            };
+            # use this to read the key during boot
+            postCreateHook = ''
+              zfs set keylocation="prompt" "rpool/$name";
+            '';
+          };
+          "user/home" = {
+            type = "zfs_fs";
+            mountpoint = "/home";
+            options = {
+              setuid = "off";
+              devices = "off";
+              mountpoint = "legacy";
+            };
+          };
+        };
+      };
+    };
+  };
+}
+

hosts/hypnos/hardware-configuration.nix

@@ -0,0 +1,21 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.kernelModules = [ ];
+    kernelModules = [ "applesmc" "kvm-intel" "wl" ];
+    extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
+  };
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
+

hosts/new.md

@@ -1,30 +0,0 @@
-# Steps to add a new host
-
-1. Generate an SSH host key to be used for secrets
-`ssh-keygen -t ed25519 -f /tmp/ssh_host_ed25519_key -C ""`
-1. Go to borgmatic.com, add the generated SSH key and create a new
-repository
-1. Add a new host entry to nix-secrets/secrets.nix
-1. Generate a repository passphrase in nix-secrets
-1. Commit nix-secrets and run `nix flake update` in nix-config
-1. Add a README.md and default.nix suited to the host
-1. Define (or generate with `nixos-generate-config`) a
-hardware-configuration.nix
-1. Define the disk layout to be used by disko
-1. Commit nix-config
-1. Boot the NixOS installer
-1. Copy the generated SSH host key to `/etc/ssh`
-1. Run `nix run github:nix-community/nixos-anywhere -- --flake .#<hostname> root@<ip address>`
-
-## Post install
-> The backup and Tailscale modules won't work until the following steps are
-> completed.
-
-1. Run `sudo borgmatic init --encryption repokey-blake2`
-1. Restart `borgmatic`
-1. Run `sudo tailscale up --login-server https://headscale.vimium.net`
-1. Visit the URL, then SSH onto `vps1` and run
-`headscale --user mesh nodes register --key <key>`
-1. (Optionally) Give the Tailscale node a friendly name with
-`headscale node rename -i <index> <hostname>`
-

hosts/odyssey/audio.nix

@@ -1,8 +1,11 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 let
   snd-usb-audio-module = pkgs.callPackage ./snd-usb-audio.nix {
     kernel = config.boot.kernelPackages.kernel;
   };
+  patched = snd-usb-audio-module.overrideAttrs (prev: {
+    patches = [ ./0001-Update-device-ID-for-PreSonus-1824c.patch ];
+  });
   upmixConfig = ''
     stream.properties = {
       channelmix.upmix = true
@@ -10,10 +13,9 @@ let
     }
   '';
 in {
+  boot.kernelModules = [ "snd-usb-audio" ];
   boot.extraModulePackages = [
-    (snd-usb-audio-module.overrideAttrs (_: {
-      patches = [ ./0001-Update-device-ID-for-PreSonus-1824c.patch ];
-    }))
+    (patched)
   ];
 
   environment.etc = {

hosts/odyssey/default.nix

@@ -52,34 +52,6 @@
     };
   };
 
-  age.secrets."passwords/services/borg/odyssey-passphrase" = {
-    file = "${inputs.secrets}/passwords/services/borg/odyssey-passphrase.age";
-  };
-
-  services.borgmatic = {
-    enable = true;
-    settings = {
-      source_directories = [
-        "/home/jordan/Documents"
-      ];
-      repositories = [
-        { label = "borgbase"; path = "ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo"; }
-      ];
-      storage = {
-        encryption_passcommand = "cat ${config.age.secrets."passwords/services/borg/odyssey-passphrase".path}";
-        ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";
-      };
-      retention = {
-        keep_daily = 7;
-        keep_weekly = 4;
-        keep_monthly = 6;
-      };
-    };
-  };
-
-  # Without this override, `cat` is unavailable for `encryption_passcommand`
-  systemd.services.borgmatic.confinement.fullUnit = true;
-
   modules = {
     desktop = {
       apps.qbittorrent.enable = true;
@@ -87,8 +59,12 @@
         firefox.enable = true;
       };
       gaming.emulators = {
+        gamecube.enable = true;
         ps2.enable = true;
+        ps3.enable = true;
         psp.enable = true;
+        wii.enable = true;
+        xbox.enable = true;
       };
       media.graphics = {
         modeling.enable = true;
@@ -111,6 +87,15 @@
       gpg.enable = true;
       pass.enable = true;
     };
+    services = {
+      borgmatic = {
+        enable = true;
+        directories = [
+          "/home/jordan/Documents"
+        ];
+        repoPath = "ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo";
+      };
+    };
     shell = {
       git.enable = true;
       zsh.enable = true;

hosts/odyssey/hardware-configuration.nix

@@ -64,5 +64,9 @@
 
   networking.useDHCP = lib.mkDefault true;
 
+  environment.systemPackages = [
+    pkgs.apfs-fuse
+  ];
+
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

hosts/pi/README.md

@@ -16,3 +16,10 @@ SD card | `/dev/mmcblk0` (ext4, NixOS Root)
 ### Networks
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `pi.mesh.vimium.net`.
+
+## Devices and connections
+
+- SONOFF Zigbee 3.0 USB Dongle Plus (connected to USB 2.0 port to avoid [interference](https://www.unit3compliance.co.uk/2-4ghz-intra-system-or-self-platform-interference-demonstration/))
+- HDMI to ONKYO HT-R990
+- S/PDIF to ONKYO HT-R990
+- Ethernet to ONKYO HT-R990

hosts/pi/default.nix

@@ -17,8 +17,78 @@
     };
     deviceTree = {
       enable = true;
+      filter = "*rpi-4-*.dtb";
       overlays = [
-        { name = "hifiberry-digi-pro"; dtboFile = "${pkgs.device-tree_rpi.overlays}/hifiberry-digi-pro.dtbo"; }
+        {
+          name = "audio-off-overlay";
+          dtsText = ''
+            /dts-v1/;
+            /plugin/;
+
+            / {
+              compatible = "brcm,bcm2711";
+
+              fragment@0 {
+                target = <&vchiq>;
+
+                __overlay__ {
+                  status = "disabled";
+                };
+              };
+            };
+          '';
+        }
+        {
+          # Adapted from: https://github.com/raspberrypi/linux/blob/rpi-6.1.y/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
+          # changes:
+          # - modified top-level "compatible" field from bcm2835 to bcm2711
+          # - s/i2s_clk_consumer/i2s/ (name on bcm2711 platform)
+          name = "hifiberry-digi-pro";
+          dtsText = ''
+            /dts-v1/;
+            /plugin/;
+
+            / {
+                compatible = "brcm,bcm2711";
+
+                fragment@0 {
+                    target = <&i2s>;
+                    __overlay__ {
+                        status = "okay";
+                    };
+                };
+
+                fragment@1 {
+                    target = <&i2c1>;
+                    __overlay__ {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "okay";
+
+                        wm8804@3b {
+                            #sound-dai-cells = <0>;
+                            compatible = "wlf,wm8804";
+                            reg = <0x3b>;
+                            PVDD-supply = <&vdd_3v3_reg>;
+                            DVDD-supply = <&vdd_3v3_reg>;
+                            status = "okay";
+                        };
+                    };
+                };
+
+                fragment@2 {
+                    target = <&sound>;
+                    __overlay__ {
+                        compatible = "hifiberry,hifiberry-digi";
+                        i2s-controller = <&i2s>;
+                        status = "okay";
+                        clock44-gpio = <&gpio 5 0>;
+                        clock48-gpio = <&gpio 6 0>;
+                    };
+                };
+            };
+          '';
+        }
       ];
     };
     firmware = with pkgs; [
@@ -29,46 +99,72 @@
 
   sound.enable = true;
 
-  age.secrets."passwords/networks.age" = {
-    file = "${inputs.secrets}/passwords/networks.age";
-  };
-
-  networking = {
-    wireless = {
-      enable = true;
-      interfaces = [ "wlan0" ];
-      environmentFile = config.age.secrets."passwords/networks.age".path;
-      networks = {
-        "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
-      };
-    };
-  };
-
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
-    systemWide = true;
   };
 
-  virtualisation.oci-containers = {
-    backend = "podman";
-    containers.homeassistant = {
-      volumes = [ "home-assistant:/config" ];
-      environment.TZ = config.time.timeZone;
-      image = "ghcr.io/home-assistant/home-assistant:stable";
-      extraOptions = [
-        "--network=host"
-        "--device=/dev/ttyUSB0:/dev/ttyUSB0"
+  age.secrets."files/services/home-assistant/secrets.yaml" = {
+    file = "${inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
+    path = "${config.services.home-assistant.configDir}/secrets.yaml";
+    owner = "hass";
+    group = "hass";
+  };
+
+  services.home-assistant = {
+    enable = true;
+    extraComponents = [
+      "api"
+      "alert"
+      "auth"
+      "backup"
+      "command_line"
+      "default_config"
+      "homekit_controller"
+      "homekit"
+      "http"
+      "icloud"
+      "jellyfin"
+      "metoffice"
+      "mqtt"
+      "onkyo"
+      "ping"
+      "proximity"
+      "radio_browser"
+      "scrape"
+      "sensor"
+      "system_health"
     ];
+    config = {
+      default_config = {};
+      backup = {};
+      homeassistant = {
+        name = "Home";
+        latitude = "!secret latitude";
+        longitude = "!secret longitude";
+        country = "GB";
+        temperature_unit = "C";
+        time_zone = config.time.timeZone;
+        unit_system = "metric";
+      };
+      mqtt = { };
+      scene = "!include scenes.yaml";
+      automation = "!include automations.yaml";
+      system_health = { };
+      recorder = {
+        purge_keep_days = 365;
+      };
     };
   };
 
   services.mosquitto = {
     enable = true;
     listeners = [{
+      acl = [ "pattern readwrite #" ];
+      omitPasswordAuth = true;
       port = 1883;
       settings = {
         allow_anonymous = true;
@@ -87,7 +183,13 @@
     enable = true;
     dataDir = "/var/lib/zigbee2mqtt";
     settings = {
-      homeassistant = true;
+      homeassistant = lib.optionalAttrs config.services.home-assistant.enable {
+        discovery_topic = "homeassistant";
+        status_topic = "hass/status";
+        legacy_entity_attributes = true;
+        legacy_triggers = true;
+      };
+      availability = true;
       frontend = true;
       device_options = {
         retain = true;
@@ -100,6 +202,7 @@
         network_key = "!secret.yaml network_key";
         pan_id = 13001;
         ext_pan_id = [ 79 1 73 47 250 136 124 222 ];
+        transmit_power = 20;
       };
       mqtt = {
         version = 5;
@@ -108,35 +211,25 @@
     };
   };
 
-  age.secrets."passwords/services/borg/pi-passphrase" = {
-    file = "${inputs.secrets}/passwords/services/borg/pi-passphrase.age";
-  };
-
-  services.borgmatic = {
+  modules = {
+    networking = {
+      wireless = {
         enable = true;
-    settings = {
-      source_directories = [
+        interfaces = [ "wlan0" ];
+      };
+    };
+    services = {
+      borgmatic = {
+        enable = true;
+        directories = [
           "/var/lib/mosquitto"
           "/var/lib/zigbee2mqtt"
         ];
-      repositories = [
-        { label = "borgbase"; path = "ssh://qcw86s11@qcw86s11.repo.borgbase.com/./repo"; }
-      ];
-      storage = {
-        encryption_passcommand = "cat ${config.age.secrets."passwords/services/borg/pi-passphrase".path}";
-        ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";
-      };
-      retention = {
-        keep_daily = 7;
-        keep_weekly = 4;
-        keep_monthly = 6;
+        repoPath = "ssh://qcw86s11@qcw86s11.repo.borgbase.com/./repo";
       };
     };
   };
 
-  # Without this override, `cat` is unavailable for `encryption_passcommand`
-  systemd.services.borgmatic.confinement.fullUnit = true;
-
   environment.systemPackages = with pkgs; [
     libraspberrypi
     raspberrypi-eeprom

modules/default.nix

@@ -26,8 +26,10 @@
     ./editors/neovim
     ./editors/vscode.nix
     ./networking/tailscale.nix
+    ./networking/wireless.nix
     ./security/gpg.nix
     ./security/pass.nix
+    ./services/borgmatic
     ./shell/git
     ./shell/zsh
   ];

modules/desktop/gaming/emulators.nix

@@ -19,6 +19,10 @@ in {
       default = false;
       example = true;
     };
+    ps1.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
     ps2.enable      = lib.mkOption {
       default = false;
       example = true;
@@ -35,14 +39,23 @@ in {
       default = false;
       example = true;
     };
+    switch.enable   = lib.mkOption {
+      default = false;
+      example = true;
+    };
     wii.enable      = lib.mkOption {
       default = false;
       example = true;
     };
+    xbox.enable     = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
   config = {
     user.packages = with pkgs; [
+      (lib.mkIf cfg.ps1.enable duckstation)
       (lib.mkIf cfg.ps2.enable pcsx2)
       (lib.mkIf cfg.ps3.enable rpcs3)
       (lib.mkIf cfg.psp.enable ppsspp)
@@ -51,9 +64,11 @@ in {
              cfg.gb.enable  ||
              cfg.snes.enable)
         higan)
+      (lib.mkIf cfg.switch.enable yuzu-early-access)
       (lib.mkIf (cfg.wii.enable ||
              cfg.gamecube.enable)
         dolphin-emu)
+      (lib.mkIf cfg.xbox.enable xemu)
     ];
   };
 }

modules/desktop/gnome.nix

@@ -17,6 +17,7 @@ in {
     };
 
     services.flatpak.enable = true;
+    services.fwupd.enable = true;
 
     programs.dconf.enable = true;
     dconf.settings = {
@@ -102,6 +103,9 @@ in {
         picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-l.jpg";
         picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-d.jpg";
       };
+      "org/gnome/desktop/peripherals/touchpad" = {
+        tap-to-click = true;
+      };
       "org/gtk/settings/file-chooser" = {
         show-hidden = true;
         sort-directories-first = true;
@@ -131,6 +135,7 @@ in {
       };
       "org/gnome/mutter" = {
         center-new-windows = true;
+        edge-tiling = true;
         experimental-features = [ "scale-monitor-framebuffer" ];
       };
       "org/gnome/desktop/interface" = {
@@ -153,9 +158,25 @@ in {
     ];
 
     user.packages = with pkgs; [
+      authenticator
+      bottles
+      bustle
       celluloid
+      d-spy
+      drawing
       fragments
+      gnome.ghex
+      # gnome-builder
+      gnome-decoder
+      gnome-firmware
+      gnome-frog
+      gnome-obfuscate
+      gnome-podcasts
+      identity
       mission-center
+      newsflash
+      schemes
+      shortwave
     ];
 
     environment.systemPackages = with pkgs; [

modules/networking/wireless.nix

@@ -0,0 +1,36 @@
+{ config, lib, pkgs, inputs, ... }:
+
+with lib;
+
+let cfg = config.modules.networking.wireless;
+in {
+  options.modules.networking.wireless = {
+    enable = mkOption {
+      default = false;
+      example = true;
+      description = mdDoc "Automatically connect to known networks";
+    };
+    interfaces = mkOption {
+      default = [ ];  # All interfaces
+      example = [ "wlan0" ];
+      description = mdDoc "Interfaces for `wpa_supplicant` to bind to";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    age.secrets."passwords/networks" = {
+      file = "${inputs.secrets}/passwords/networks.age";
+    };
+
+    networking = {
+      wireless = {
+        enable = true;
+        interfaces = cfg.interfaces;
+        environmentFile = config.age.secrets."passwords/networks".path;
+        networks = {
+          "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
+        };
+      };
+    };
+  };
+}

modules/services/borgmatic/default.nix

@@ -0,0 +1,57 @@
+{ config, lib, pkgs, inputs, ... }:
+
+with lib;
+
+let
+  cfg = config.modules.services.borgmatic;
+  hostname = config.networking.hostName;
+in {
+  options.modules.services.borgmatic = {
+    enable = mkOption {
+      default = false;
+      example = true;
+      description = mdDoc "Enable backups on this host with `borgmatic`";
+    };
+    directories = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [
+        "/home/jordan/Documents"
+      ];
+      description = mdDoc "List of directories to backup";
+    };
+    repoPath = mkOption {
+      type = types.str;
+      example = "ssh://example@example.repo.borgbase.com/./repo";
+      description = mdDoc "Destination borg repository for backup";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    age.secrets."passwords/services/borg/${hostname}-passphrase" = {
+      file = "${inputs.secrets}/passwords/services/borg/${hostname}-passphrase.age";
+    };
+
+    services.borgmatic = {
+      enable = true;
+      settings = {
+        source_directories = cfg.directories;
+        repositories = [
+          { label = "borgbase"; path = cfg.repoPath; }
+        ];
+        storage = {
+          encryption_passcommand = "cat ${config.age.secrets."passwords/services/borg/${hostname}-passphrase".path}";
+          ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";
+        };
+        retention = {
+          keep_daily = 7;
+          keep_weekly = 4;
+          keep_monthly = 6;
+        };
+      };
+    };
+
+    # Without this override, `cat` is unavailable for `encryption_passcommand`
+    systemd.services.borgmatic.confinement.fullUnit = true;
+  };
+}