From 88284829ec3940a9e8a03c89c7c36f98d4be0f36 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Thu, 3 Apr 2025 22:43:12 +0100
Subject: [PATCH] Refactor inputs for external modules

---
 flake.nix                      | 38 ++++++++++++++++++++++------------
 hosts/lemp11/configuration.nix |  6 ------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index 74e59e65..28ecfd1a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,7 +23,14 @@
   };
 
   outputs =
-    { nixpkgs, self, ... }@inputs:
+    {
+      agenix,
+      disko,
+      nixos-hardware,
+      nixpkgs,
+      self,
+      ...
+    }@inputs:
     let
       inherit (self) outputs;
 
@@ -67,7 +74,12 @@
           };
 
           modules = [
-            inputs.agenix.nixosModules.default
+            agenix.nixosModules.default
+            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
 
             ./hosts/lemp11/configuration.nix
           ];
@@ -81,7 +93,7 @@
           };
 
           modules = [
-            inputs.agenix.nixosModules.default
+            agenix.nixosModules.default
 
             ./hosts/nixedo/configuration.nix
           ];
@@ -94,9 +106,9 @@
           };
 
           modules = [
-            inputs.agenix.nixosModules.default
-            inputs.nixos-hardware.nixosModules.common-gpu-intel
-            inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480
+            agenix.nixosModules.default
+            nixos-hardware.nixosModules.common-gpu-intel
+            nixos-hardware.nixosModules.lenovo-thinkpad-t480
 
             ./hosts/t480/configuration.nix
           ];
@@ -109,9 +121,9 @@
           };
 
           modules = [
-            inputs.agenix.nixosModules.default
-            inputs.nixos-hardware.nixosModules.common-gpu-intel
-            inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t490
+            agenix.nixosModules.default
+            nixos-hardware.nixosModules.common-gpu-intel
+            nixos-hardware.nixosModules.lenovo-thinkpad-t490
 
             ./hosts/t490/configuration.nix
           ];
@@ -127,8 +139,8 @@
           };
 
           modules = [
-            inputs.agenix.nixosModules.default
-            inputs.disko.nixosModules.disko
+            agenix.nixosModules.default
+            disko.nixosModules.disko
             inputs.nixos-wsl.nixosModules.default
 
             ./hosts/PW05CH3L/configuration.nix
@@ -143,8 +155,8 @@
           };
 
           modules = [
-            inputs.agenix.nixosModules.default
-            inputs.disko.nixosModules.disko
+            agenix.nixosModules.default
+            disko.nixosModules.disko
 
             ./hosts/hetznix/configuration.nix
           ];
diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix
index 616b8a19..2e567a66 100644
--- a/hosts/lemp11/configuration.nix
+++ b/hosts/lemp11/configuration.nix
@@ -2,12 +2,6 @@
 
 {
   imports = [
-    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
-
     ./hardware-configuration.nix
     ./hardware.nix
     ./programs.nix