From cf598aca71d4c7c0570ab506273ba079f91107b2 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Fri, 1 Dec 2023 16:04:29 +0100
Subject: [PATCH] Import `base.nix` by default
---
lib/system.nix | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/system.nix b/lib/system.nix
index 37ddad5..57e55d1 100644
--- a/lib/system.nix
+++ b/lib/system.nix
@@ -4,15 +4,19 @@
let
lib = nixpkgs.lib;
configPath = ./machines/${name}.nix;
+ machineConfig =
+ if builtins.pathExists configPath then
+ configPath
+ else
+ ./hardware/base.nix;
in
lib.nixosSystem {
system = "x86_64-linux";
modules = [
(
{ config, pkgs, ... }: {
- imports = lib.concatLists [
- (lib.optional (builtins.pathExists configPath) configPath)
- []
+ imports = [
+ machineConfig
];
})
];