From e5a5639aa1ae0bcb200e0d1aaae6ce751ab498d2 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Fri, 19 Jan 2024 00:24:00 +0100
Subject: [PATCH] host framenix: use latest firmware from unstable

---
 flake.nix                  | 6 +++---
 hosts/framenix/default.nix | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 21a0317..9d0937f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,12 +31,12 @@
     # FIXME: allow different systems
     systems = flake-utils.lib.system;
     # necessary to make the top-level inputs available to system configuration
-    defaultModules = [
-      { _module.args = { inherit inputs; }; }
+    defaultModules = system: [
+      { _module.args = { inherit inputs system; }; }
     ];
     mkSystem = system: extraModules:
       nixpkgs.lib.nixosSystem rec {
-        modules = defaultModules ++ extraModules;
+        modules = (defaultModules system) ++ extraModules;
         inherit system;
     };
     mkHomeManager = confName: user: system:  # unfortunately, home-manager configs are still system-specific
diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix
index d3d828c..aadb17f 100644
--- a/hosts/framenix/default.nix
+++ b/hosts/framenix/default.nix
@@ -1,4 +1,7 @@
-{ config, lib, pkgs, inputs, ...}:
+{ config, lib, pkgs, inputs, system, ...}:
+let
+  unstable = inputs.nixos-unstable.legacyPackages.${system};
+in
 {
   imports = [
     ../../common
@@ -13,6 +16,9 @@
   # try newer kernels
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
+  # use newer linux-firmware from unstable
+  hardware.firmware = lib.mkBefore [ unstable.linux-firmware ];
+
   boot.loader = {
     systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;