From 71f335870d4b23deaa641a472919c8d77a53daa3 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Fri, 22 Nov 2024 01:18:31 +0000
Subject: [PATCH] Move host-specific modules
---
flake.nix | 9 +++++++++
nix/lib/nixos/default.nix | 10 ++--------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/flake.nix b/flake.nix
index afc61a12..9d052354 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,6 +64,15 @@
lemp11 = mkNixos {
desktop = true;
hostname = "lemp11";
+
+ # TODO: move the rest of the modules here.
+ modules = [
+ nixos-hardware.nixosModules.common-cpu-intel
+ nixos-hardware.nixosModules.common-gpu-intel
+ nixos-hardware.nixosModules.common-pc-laptop
+ nixos-hardware.nixosModules.common-pc-laptop-hdd
+ nixos-hardware.nixosModules.system76
+ ];
};
};
diff --git a/nix/lib/nixos/default.nix b/nix/lib/nixos/default.nix
index 75564523..95e09e68 100644
--- a/nix/lib/nixos/default.nix
+++ b/nix/lib/nixos/default.nix
@@ -9,6 +9,7 @@
{
desktop ? false,
hostname,
+ modules ? [ ],
}:
let
configuration = import ./configuration.nix {
@@ -44,12 +45,5 @@ inputs.nixpkgs.lib.nixosSystem {
configuration
hardwareConfiguration
-
- # TODO: only for "lemp11".
- nixos-hardware.nixosModules.common-cpu-intel
- nixos-hardware.nixosModules.common-gpu-intel
- nixos-hardware.nixosModules.common-pc-laptop
- nixos-hardware.nixosModules.common-pc-laptop-hdd
- nixos-hardware.nixosModules.system76
- ];
+ ] ++ modules;
}