clanServices: remove useless importApply

This commit is contained in:
Michael Hoang
2025-09-16 15:02:20 +02:00
parent 69b0c36381
commit e43779f8d6
28 changed files with 43 additions and 66 deletions

View File

@@ -1,4 +1,3 @@
{ ... }:
{
_class = "clan.service";
manifest.name = "clan-core/admin";

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -1,12 +1,8 @@
{
self,
lib,
...
}:
let
module = lib.modules.importApply ./default.nix {
inherit (self) packages;
};
module = ./default.nix;
in
{
clan.modules.certificates = module;

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
{
clan.modules = {
emergency-access = lib.modules.importApply ./default.nix { };
emergency-access = ./default.nix;
};
}

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -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

View File

@@ -5,9 +5,7 @@
...
}:
let
module = lib.modules.importApply ./default.nix {
inherit (self) packages;
};
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
{
clan.modules = {
importer = lib.modules.importApply ./default.nix { };
importer = ./default.nix;
};
}

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules.localbackup = module;

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules.matrix-synapse = module;

View File

@@ -1,4 +1,3 @@
{ packages }:
{ ... }:
{
_class = "clan.service";

View File

@@ -1,12 +1,8 @@
{
self,
lib,
...
}:
let
module = lib.modules.importApply ./default.nix {
inherit (self) packages;
};
module = ./default.nix;
in
{
clan.modules.monitoring = module;

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -5,9 +5,7 @@
...
}:
let
module = lib.modules.importApply ./default.nix {
inherit (self) packages;
};
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules = {

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules.trusted-nix-caches = module;

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules.users = module;

View File

@@ -1,4 +1,3 @@
{ packages }:
{ lib, ... }:
let
inherit (lib)

View File

@@ -1,12 +1,8 @@
{
self,
lib,
...
}:
let
module = lib.modules.importApply ./default.nix {
inherit (self) packages;
};
module = ./default.nix;
in
{
clan.modules.wifi = module;

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ ... }:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules.wireguard = module;

View File

@@ -5,7 +5,7 @@
...
}:
let
module = lib.modules.importApply ./default.nix { };
module = ./default.nix;
in
{
clan.modules.zerotier = module;