From 0453d346064e6f44507b03bc8a4b87f06bac7958 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Mon, 13 May 2024 16:44:21 +0200
Subject: [PATCH] flake/modules.nix seperate out modules from inputs

---
 flake.nix            |  1 +
 flake/modules.nix    | 19 +++++++++++++++++++
 lib/flake-helper.nix |  6 +-----
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 flake/modules.nix

diff --git a/flake.nix b/flake.nix
index 82ccf23..377452a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -93,6 +93,7 @@
     nixosConfigurations = helper.mapToNixosConfigurations self.clerie.hosts;
 
     nixosModules = {
+      nixfilesInputs = import ./flake/modules.nix inputs;
       clerie = import ./modules;
       default = self.nixosModules.clerie;
     };
diff --git a/flake/modules.nix b/flake/modules.nix
new file mode 100644
index 0000000..9ba5b94
--- /dev/null
+++ b/flake/modules.nix
@@ -0,0 +1,19 @@
+{ self
+, fernglas
+, fieldpoc
+, nixos-exporter
+, solid-xmpp-alarm
+, sops-nix
+, ...
+}@inputs:
+{ ... }:
+
+{
+  imports = [
+    fernglas.nixosModules.default
+    fieldpoc.nixosModules.default
+    nixos-exporter.nixosModules.default
+    solid-xmpp-alarm.nixosModules.solid-xmpp-alarm
+    sops-nix.nixosModules.sops
+  ];
+}
diff --git a/lib/flake-helper.nix b/lib/flake-helper.nix
index 8fd9dc3..d8e9878 100644
--- a/lib/flake-helper.nix
+++ b/lib/flake-helper.nix
@@ -11,6 +11,7 @@ rec {
   in localNixpkgs.lib.nixosSystem {
     system = system;
     modules = modules ++ [
+      self.nixosModules.nixfilesInputs
       self.nixosModules.clerie
       ({ ... }: {
         /*
@@ -32,11 +33,6 @@ rec {
         ];
         clerie.monitoring = nixpkgs.lib.attrsets.optionalAttrs (group != null) { serviceLevel = group; };
       })
-      fernglas.nixosModules.default
-      fieldpoc.nixosModules.default
-      nixos-exporter.nixosModules.default
-      solid-xmpp-alarm.nixosModules.solid-xmpp-alarm
-      sops-nix.nixosModules.sops
       (../hosts + "/${name}/configuration.nix")
       # Automatically load secrets from sops file for host
       ({ config, lib, ... }: {