From 9088dac46d97774b3ff83faed150aff7c271f92a Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Thu, 19 Dec 2024 08:00:00 +0000
Subject: [PATCH] Start to extract common host configuration
---
nix/hosts/common/default.nix | 16 ++++++++++++++++
nix/hosts/lemp11/configuration.nix | 6 ------
nix/hosts/lemp11/default.nix | 2 ++
nix/hosts/t490/configuration.nix | 6 ------
nix/hosts/t490/default.nix | 4 +++-
5 files changed, 21 insertions(+), 13 deletions(-)
create mode 100644 nix/hosts/common/default.nix
diff --git a/nix/hosts/common/default.nix b/nix/hosts/common/default.nix
new file mode 100644
index 00000000..fd0852f0
--- /dev/null
+++ b/nix/hosts/common/default.nix
@@ -0,0 +1,16 @@
+{
+ hostname,
+ inputs,
+ outputs,
+ ...
+}:
+
+{
+ imports = [
+ inputs.home-manager.nixosModules.home-manager
+
+ outputs.nixosModules.default
+ ];
+
+ networking.hostName = hostname;
+}
diff --git a/nix/hosts/lemp11/configuration.nix b/nix/hosts/lemp11/configuration.nix
index 817d4aa7..cfb4e800 100644
--- a/nix/hosts/lemp11/configuration.nix
+++ b/nix/hosts/lemp11/configuration.nix
@@ -12,16 +12,12 @@
{
imports = [
- inputs.home-manager.nixosModules.home-manager
-
inputs.nixos-hardware.nixosModules.common-cpu-intel
inputs.nixos-hardware.nixosModules.common-gpu-intel
inputs.nixos-hardware.nixosModules.common-pc-laptop
inputs.nixos-hardware.nixosModules.common-pc-laptop-hdd
inputs.nixos-hardware.nixosModules.system76
- outputs.nixosModules.default
-
./hardware-configuration.nix
];
@@ -81,8 +77,6 @@
DefaultTimeoutStopSec=10s
'';
- networking.hostName = hostname;
-
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
diff --git a/nix/hosts/lemp11/default.nix b/nix/hosts/lemp11/default.nix
index eee30170..cdd72e79 100644
--- a/nix/hosts/lemp11/default.nix
+++ b/nix/hosts/lemp11/default.nix
@@ -25,6 +25,8 @@
imports = [
inputs.agenix.nixosModules.default
+ ../common
+
./configuration.nix
./secrets.nix
diff --git a/nix/hosts/t490/configuration.nix b/nix/hosts/t490/configuration.nix
index 170d0906..54477981 100644
--- a/nix/hosts/t490/configuration.nix
+++ b/nix/hosts/t490/configuration.nix
@@ -12,10 +12,6 @@
{
imports = [
- inputs.home-manager.nixosModules.home-manager
-
- outputs.nixosModules.default
-
./hardware-configuration.nix
];
@@ -74,8 +70,6 @@
DefaultTimeoutStopSec=10s
'';
- networking.hostName = hostname;
-
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
diff --git a/nix/hosts/t490/default.nix b/nix/hosts/t490/default.nix
index 1d03934f..5900e7a0 100644
--- a/nix/hosts/t490/default.nix
+++ b/nix/hosts/t490/default.nix
@@ -1,5 +1,7 @@
{
- imports = [
+ imports = [
+ ../common
+
./configuration.nix
];
}