From e43779f8d621ec6bc92a561d6b472d429a080abc Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Tue, 16 Sep 2025 15:02:20 +0200
Subject: [PATCH] clanServices: remove useless `importApply`

---
 clanServices/admin/default.nix                   | 1 -
 clanServices/admin/flake-module.nix              | 4 ++--
 clanServices/borgbackup/flake-module.nix         | 4 ++--
 clanServices/certificates/flake-module.nix       | 6 +-----
 clanServices/coredns/flake-module.nix            | 4 ++--
 clanServices/data-mesher/flake-module.nix        | 4 ++--
 clanServices/dyndns/flake-module.nix             | 4 ++--
 clanServices/emergency-access/flake-module.nix   | 4 ++--
 clanServices/garage/flake-module.nix             | 4 ++--
 clanServices/hello-world/default.nix             | 6 +-----
 clanServices/hello-world/flake-module.nix        | 4 +---
 clanServices/importer/flake-module.nix           | 4 ++--
 clanServices/internet/flake-module.nix           | 4 ++--
 clanServices/localbackup/flake-module.nix        | 4 ++--
 clanServices/matrix-synapse/flake-module.nix     | 4 ++--
 clanServices/monitoring/default.nix              | 1 -
 clanServices/monitoring/flake-module.nix         | 6 +-----
 clanServices/mycelium/flake-module.nix           | 4 ++--
 clanServices/packages/flake-module.nix           | 4 ++--
 clanServices/sshd/flake-module.nix               | 4 ++--
 clanServices/syncthing/flake-module.nix          | 4 +---
 clanServices/tor/flake-module.nix                | 4 ++--
 clanServices/trusted-nix-caches/flake-module.nix | 4 ++--
 clanServices/users/flake-module.nix              | 4 ++--
 clanServices/wifi/default.nix                    | 1 -
 clanServices/wifi/flake-module.nix               | 6 +-----
 clanServices/wireguard/flake-module.nix          | 4 ++--
 clanServices/zerotier/flake-module.nix           | 2 +-
 28 files changed, 43 insertions(+), 66 deletions(-)

diff --git a/clanServices/admin/default.nix b/clanServices/admin/default.nix
index fb48612f4..807d8a69c 100644
--- a/clanServices/admin/default.nix
+++ b/clanServices/admin/default.nix
@@ -1,4 +1,3 @@
-{ ... }:
 {
   _class = "clan.service";
   manifest.name = "clan-core/admin";
diff --git a/clanServices/admin/flake-module.nix b/clanServices/admin/flake-module.nix
index bedd498e3..5a2c1fb1b 100644
--- a/clanServices/admin/flake-module.nix
+++ b/clanServices/admin/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/borgbackup/flake-module.nix b/clanServices/borgbackup/flake-module.nix
index 78066d14d..51b9dd1de 100644
--- a/clanServices/borgbackup/flake-module.nix
+++ b/clanServices/borgbackup/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/certificates/flake-module.nix b/clanServices/certificates/flake-module.nix
index a58fec290..3a51e1c46 100644
--- a/clanServices/certificates/flake-module.nix
+++ b/clanServices/certificates/flake-module.nix
@@ -1,12 +1,8 @@
 {
-  self,
-  lib,
   ...
 }:
 let
-  module = lib.modules.importApply ./default.nix {
-    inherit (self) packages;
-  };
+  module = ./default.nix;
 in
 {
   clan.modules.certificates = module;
diff --git a/clanServices/coredns/flake-module.nix b/clanServices/coredns/flake-module.nix
index 7d74a7407..d08b758f9 100644
--- a/clanServices/coredns/flake-module.nix
+++ b/clanServices/coredns/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/data-mesher/flake-module.nix b/clanServices/data-mesher/flake-module.nix
index 3ec78883a..c738070a4 100644
--- a/clanServices/data-mesher/flake-module.nix
+++ b/clanServices/data-mesher/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/dyndns/flake-module.nix b/clanServices/dyndns/flake-module.nix
index f88507a51..14b155dfb 100644
--- a/clanServices/dyndns/flake-module.nix
+++ b/clanServices/dyndns/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/emergency-access/flake-module.nix b/clanServices/emergency-access/flake-module.nix
index f8a017707..6af395a1c 100644
--- a/clanServices/emergency-access/flake-module.nix
+++ b/clanServices/emergency-access/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 {
   clan.modules = {
-    emergency-access = lib.modules.importApply ./default.nix { };
+    emergency-access = ./default.nix;
   };
 }
diff --git a/clanServices/garage/flake-module.nix b/clanServices/garage/flake-module.nix
index 21c34d0de..9bb9b81c1 100644
--- a/clanServices/garage/flake-module.nix
+++ b/clanServices/garage/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/hello-world/default.nix b/clanServices/hello-world/default.nix
index f322030cd..5d668ff94 100644
--- a/clanServices/hello-world/default.nix
+++ b/clanServices/hello-world/default.nix
@@ -4,7 +4,6 @@
 # The test for this module in ./tests/vm/default.nix shows an example of how
 # the service is used.
 
-{ packages }:
 { ... }:
 {
   _class = "clan.service";
@@ -34,20 +33,17 @@
         settings,
 
         # The name of this instance of the service
-        instanceName,
 
         # The current machine
-        machine,
 
         # All roles of this service, with their assigned machines
-        roles,
         ...
       }:
       {
         # Analog to 'perSystem' of flake-parts.
         # For every instance of this service we will add a nixosModule to a morning-machine
         nixosModule =
-          { config, ... }:
+          { ... }:
           {
             # Interaction examples what you could do here:
             # - Get some settings of this machine
diff --git a/clanServices/hello-world/flake-module.nix b/clanServices/hello-world/flake-module.nix
index c6330b1a0..e41c5c196 100644
--- a/clanServices/hello-world/flake-module.nix
+++ b/clanServices/hello-world/flake-module.nix
@@ -5,9 +5,7 @@
   ...
 }:
 let
-  module = lib.modules.importApply ./default.nix {
-    inherit (self) packages;
-  };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/importer/flake-module.nix b/clanServices/importer/flake-module.nix
index 829039cc0..a9302a630 100644
--- a/clanServices/importer/flake-module.nix
+++ b/clanServices/importer/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 {
   clan.modules = {
-    importer = lib.modules.importApply ./default.nix { };
+    importer = ./default.nix;
   };
 }
diff --git a/clanServices/internet/flake-module.nix b/clanServices/internet/flake-module.nix
index e569aed73..ab7b909cf 100644
--- a/clanServices/internet/flake-module.nix
+++ b/clanServices/internet/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/localbackup/flake-module.nix b/clanServices/localbackup/flake-module.nix
index 9cd9eb626..2e3d3f816 100644
--- a/clanServices/localbackup/flake-module.nix
+++ b/clanServices/localbackup/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules.localbackup = module;
diff --git a/clanServices/matrix-synapse/flake-module.nix b/clanServices/matrix-synapse/flake-module.nix
index 47cec2726..bb2f79841 100644
--- a/clanServices/matrix-synapse/flake-module.nix
+++ b/clanServices/matrix-synapse/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules.matrix-synapse = module;
diff --git a/clanServices/monitoring/default.nix b/clanServices/monitoring/default.nix
index 1369d8ca2..e4ddc67f8 100644
--- a/clanServices/monitoring/default.nix
+++ b/clanServices/monitoring/default.nix
@@ -1,4 +1,3 @@
-{ packages }:
 { ... }:
 {
   _class = "clan.service";
diff --git a/clanServices/monitoring/flake-module.nix b/clanServices/monitoring/flake-module.nix
index 21ad0371f..de23010cc 100644
--- a/clanServices/monitoring/flake-module.nix
+++ b/clanServices/monitoring/flake-module.nix
@@ -1,12 +1,8 @@
 {
-  self,
-  lib,
   ...
 }:
 let
-  module = lib.modules.importApply ./default.nix {
-    inherit (self) packages;
-  };
+  module = ./default.nix;
 in
 {
   clan.modules.monitoring = module;
diff --git a/clanServices/mycelium/flake-module.nix b/clanServices/mycelium/flake-module.nix
index 0c475d590..259a1a138 100644
--- a/clanServices/mycelium/flake-module.nix
+++ b/clanServices/mycelium/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/packages/flake-module.nix b/clanServices/packages/flake-module.nix
index f03bc2b6f..4a4161457 100644
--- a/clanServices/packages/flake-module.nix
+++ b/clanServices/packages/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/sshd/flake-module.nix b/clanServices/sshd/flake-module.nix
index f1a981541..11b7d02a4 100644
--- a/clanServices/sshd/flake-module.nix
+++ b/clanServices/sshd/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/syncthing/flake-module.nix b/clanServices/syncthing/flake-module.nix
index f3f2abb24..63368048d 100644
--- a/clanServices/syncthing/flake-module.nix
+++ b/clanServices/syncthing/flake-module.nix
@@ -5,9 +5,7 @@
   ...
 }:
 let
-  module = lib.modules.importApply ./default.nix {
-    inherit (self) packages;
-  };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/tor/flake-module.nix b/clanServices/tor/flake-module.nix
index 4f7dd3b80..0e4cce64b 100644
--- a/clanServices/tor/flake-module.nix
+++ b/clanServices/tor/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules = {
diff --git a/clanServices/trusted-nix-caches/flake-module.nix b/clanServices/trusted-nix-caches/flake-module.nix
index a1cb3ca60..155cbfb81 100644
--- a/clanServices/trusted-nix-caches/flake-module.nix
+++ b/clanServices/trusted-nix-caches/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules.trusted-nix-caches = module;
diff --git a/clanServices/users/flake-module.nix b/clanServices/users/flake-module.nix
index adf40791d..1c7e91c00 100644
--- a/clanServices/users/flake-module.nix
+++ b/clanServices/users/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules.users = module;
diff --git a/clanServices/wifi/default.nix b/clanServices/wifi/default.nix
index 897a1802b..ec9563fa4 100644
--- a/clanServices/wifi/default.nix
+++ b/clanServices/wifi/default.nix
@@ -1,4 +1,3 @@
-{ packages }:
 { lib, ... }:
 let
   inherit (lib)
diff --git a/clanServices/wifi/flake-module.nix b/clanServices/wifi/flake-module.nix
index a2b885bcd..32ee533dc 100644
--- a/clanServices/wifi/flake-module.nix
+++ b/clanServices/wifi/flake-module.nix
@@ -1,12 +1,8 @@
 {
-  self,
-  lib,
   ...
 }:
 let
-  module = lib.modules.importApply ./default.nix {
-    inherit (self) packages;
-  };
+  module = ./default.nix;
 in
 {
   clan.modules.wifi = module;
diff --git a/clanServices/wireguard/flake-module.nix b/clanServices/wireguard/flake-module.nix
index 66529b160..8da6931a0 100644
--- a/clanServices/wireguard/flake-module.nix
+++ b/clanServices/wireguard/flake-module.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules.wireguard = module;
diff --git a/clanServices/zerotier/flake-module.nix b/clanServices/zerotier/flake-module.nix
index 33fe2aa91..78933d589 100644
--- a/clanServices/zerotier/flake-module.nix
+++ b/clanServices/zerotier/flake-module.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  module = lib.modules.importApply ./default.nix { };
+  module = ./default.nix;
 in
 {
   clan.modules.zerotier = module;