host framenix: use latest firmware from unstable

This commit is contained in:
Trolli Schmittlauch 2024-01-19 00:24:00 +01:00
parent f43f752fda
commit e5a5639aa1
2 changed files with 10 additions and 4 deletions

View file

@ -31,12 +31,12 @@
# FIXME: allow different systems # FIXME: allow different systems
systems = flake-utils.lib.system; systems = flake-utils.lib.system;
# necessary to make the top-level inputs available to system configuration # necessary to make the top-level inputs available to system configuration
defaultModules = [ defaultModules = system: [
{ _module.args = { inherit inputs; }; } { _module.args = { inherit inputs system; }; }
]; ];
mkSystem = system: extraModules: mkSystem = system: extraModules:
nixpkgs.lib.nixosSystem rec { nixpkgs.lib.nixosSystem rec {
modules = defaultModules ++ extraModules; modules = (defaultModules system) ++ extraModules;
inherit system; inherit system;
}; };
mkHomeManager = confName: user: system: # unfortunately, home-manager configs are still system-specific mkHomeManager = confName: user: system: # unfortunately, home-manager configs are still system-specific

View file

@ -1,4 +1,7 @@
{ config, lib, pkgs, inputs, ...}: { config, lib, pkgs, inputs, system, ...}:
let
unstable = inputs.nixos-unstable.legacyPackages.${system};
in
{ {
imports = [ imports = [
../../common ../../common
@ -13,6 +16,9 @@
# try newer kernels # try newer kernels
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
# use newer linux-firmware from unstable
hardware.firmware = lib.mkBefore [ unstable.linux-firmware ];
boot.loader = { boot.loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;