Fix wireless environment file ref

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0b3d618173114c64ab666f557504d6982665d328' (2023-12-21)
  → 'github:NixOS/nixpkgs/d02d818f22c777aa4e854efc3242ec451e5d462a' (2023-12-25)

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1703371241,
+        "lastModified": 1703433843,
-        "narHash": "sha256-f7ZcabJ5iAH2IRfVuI55xSPZ9TbegFzvFxoKtIPNEn8=",
+        "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "457669db4259ff69d1ac1183aaa6000420940c1f",
+        "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
         "type": "github"
       },
       "original": {
@@ -139,11 +139,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1702453208,
+        "lastModified": 1703545041,
-        "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
+        "narHash": "sha256-nvQA+k1rSszrf4kA4eK2i/SGbzoXyoKHzzyzq/Jca1w=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
+        "rev": "a15b6e525f5737a47b4ce28445c836996fb2ea8c",
         "type": "github"
       },
       "original": {
@@ -186,11 +186,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1703068421,
+        "lastModified": 1703467016,
-        "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=",
+        "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f",
+        "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a",
         "type": "github"
       },
       "original": {
@@ -214,11 +214,11 @@
     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1702936962,
+        "lastModified": 1703545643,
-        "narHash": "sha256-uIZ2uPE26JKJ58463ejHMiAOpqBwflyN6tCmZ89vaSQ=",
+        "narHash": "sha256-FS/acsRQ01Gj39P1t5CQ6cKOdwADmenk//vVmpA/EgU=",
         "ref": "refs/heads/master",
-        "rev": "c6db5c3ba8bff0e618fc3e31c9680863c5e53800",
+        "rev": "ef1f91b155f3bdc4efb2824ad0c47b21b8b1bbfa",
-        "revCount": 5,
+        "revCount": 9,
         "type": "git",
         "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
       },

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 = {
-  boot.loader.grub.device = "/dev/sda";
+    loader.grub = {
-  boot.loader.grub.zfsSupport = true;
+      enable = true;
+      device = "/dev/sda";
+      zfsSupport = true;
+    };
+  };
 
-  networking.hostName = "helios";
+  networking = {
-  networking.hostId = "47d23505";
+    hostName = "helios";
-  networking.networkmanager.enable = true;
+    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/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 (_: {
+    (patched)
-      patches = [ ./0001-Update-device-ID-for-PreSonus-1824c.patch ];
-    }))
   ];
 
   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;
@@ -111,6 +83,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/default.nix

@@ -29,21 +29,6 @@
 
   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;
@@ -108,35 +93,25 @@
     };
   };
 
-  age.secrets."passwords/services/borg/pi-passphrase" = {
+  modules = {
-    file = "${inputs.secrets}/passwords/services/borg/pi-passphrase.age";
+    networking = {
-  };
+      wireless = {
-
+        enable = true;
-  services.borgmatic = {
+        interfaces = [ "wlan0" ];
-    enable = true;
-    settings = {
-      source_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;
+    services = {
-        keep_weekly = 4;
+      borgmatic = {
-        keep_monthly = 6;
+        enable = true;
+        directories = [
+          "/var/lib/mosquitto"
+          "/var/lib/zigbee2mqtt"
+        ];
+        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/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;
+  };
+}