Fix wireless environment file ref

flake.lock: Update
Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0b3d618173114c64ab666f557504d6982665d328' (2023-12-21) → 'github:NixOS/nixpkgs/d02d818f22c777aa4e854efc3242ec451e5d462a' (2023-12-25)
2023-12-27 13:06:37 +00:00 · 2023-12-27 12:13:50 +00:00 · 2023-12-26 22:57:33 +00:00 · 2023-12-26 15:01:11 +00:00 · 2023-12-26 15:00:37 +00:00 · 2023-12-26 00:34:37 +00:00
4 changed files with 24 additions and 18 deletions
--- a/flake.lock
+++ b/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": {
@@ -139,11 +139,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1702453208,
-        "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
+        "lastModified": 1703545041,
+        "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,
-        "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=",
+        "lastModified": 1703467016,
+        "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": 1703534108,
-        "narHash": "sha256-e2M90djo2EpNe6PE9zHI7X3LBSpKjmt5ZRW01i0Q/4E=",
+        "lastModified": 1703545643,
+        "narHash": "sha256-FS/acsRQ01Gj39P1t5CQ6cKOdwADmenk//vVmpA/EgU=",
        "ref": "refs/heads/master",
-        "rev": "4ec3e87d6a7b1f14d23c12c60cad62a6e43be4ca",
-        "revCount": 6,
+        "rev": "ef1f91b155f3bdc4efb2824ad0c47b21b8b1bbfa",
+        "revCount": 9,
        "type": "git",
        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
      },
--- a/hosts/odyssey/audio.nix
+++ b/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 = {
--- a/hosts/odyssey/hardware-configuration.nix
+++ b/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";
 }
--- a/modules/networking/wireless.nix
+++ b/modules/networking/wireless.nix
@@ -26,7 +26,7 @@ in {
      wireless = {
        enable = true;
        interfaces = cfg.interfaces;
-        environmentFile = config.age.secrets.passwords/networks.path;
+        environmentFile = config.age.secrets."passwords/networks".path;
        networks = {
          "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
        };
Author	SHA1	Message	Date
Jordan Holt	9057ebf7fd	Fix wireless environment file ref	2023-12-27 13:06:37 +00:00
Jordan Holt	6f98fbb5cd	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0b3d618173114c64ab666f557504d6982665d328' (2023-12-21) → 'github:NixOS/nixpkgs/d02d818f22c777aa4e854efc3242ec451e5d462a' (2023-12-25)	2023-12-27 12:13:50 +00:00
Jordan Holt	f44a098f80	Add snd-usb-audio to kernelModules	2023-12-26 22:57:33 +00:00
Jordan Holt	4aa27cf9bb	Add apfs-fuse to odyssey	2023-12-26 15:01:11 +00:00
Jordan Holt	2a92ded7db	Bump priority of snd-usb-audio patch	2023-12-26 15:00:37 +00:00
Jordan Holt	4f13020601	flake.lock: Update Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/457669db4259ff69d1ac1183aaa6000420940c1f' (2023-12-23) → 'github:ryantm/agenix/417caa847f9383e111d1397039c9d4337d024bf0' (2023-12-24) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/7763c6fd1f299cb9361ff2abf755ed9619ef01d6' (2023-12-13) → 'github:NixOS/nixos-hardware/a15b6e525f5737a47b4ce28445c836996fb2ea8c' (2023-12-25) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d65bceaee0fb1e64363f7871bc43dc1c6ecad99f' (2023-12-20) → 'github:NixOS/nixpkgs/0b3d618173114c64ab666f557504d6982665d328' (2023-12-21) • Updated input 'secrets': 'git+ssh://git@git.vimium.com/jordan/nix-secrets.git?ref=refs/heads/master&rev=4ec3e87d6a7b1f14d23c12c60cad62a6e43be4ca' (2023-12-25) → 'git+ssh://git@git.vimium.com/jordan/nix-secrets.git?ref=refs/heads/master&rev=ef1f91b155f3bdc4efb2824ad0c47b21b8b1bbfa' (2023-12-25)	2023-12-26 00:34:37 +00:00