From 013d655626395450855d760060647a07445f1b22 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Sat, 7 Aug 2021 03:15:23 +0100
Subject: [PATCH] Services in each host as special arg

---
 config/hosts/athame/nixos.nix   | 50 +++++++++++++++------------------
 config/hosts/beltane/nixos.nix  | 12 ++++----
 config/hosts/samhain/nixos.nix  | 14 ++++-----
 config/hosts/yule/nixos.nix     | 14 ++++-----
 config/modules/meta/network.nix |  4 +--
 5 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/config/hosts/athame/nixos.nix b/config/hosts/athame/nixos.nix
index 2c7b2f37..e6eef295 100644
--- a/config/hosts/athame/nixos.nix
+++ b/config/hosts/athame/nixos.nix
@@ -1,4 +1,4 @@
-{ config, users, lib, pkgs, profiles, ... }:
+{ config, users, lib, pkgs, profiles, services, ... }:
 
 with lib;
 
@@ -6,35 +6,31 @@ with lib;
   # Imports
 
   imports = [
-    # profiles
     profiles.hardware.hcloud-imperative
     users.kat.server
-    # host-specific services 
+    services.asterisk
+    services.fail2ban
+    services.grafana
+    services.logrotate
+    services.loki
+    services.mail
+    services.matrix
+    services.murmur
+    services.netdata
+    services.nginx
+    services.node-exporter
+    services.postgres
+    services.prometheus
+    services.promtail
+    services.radicale
+    services.restic
+    services.syncplay
+    services.taskserver
+    services.vaultwarden
+    services.weechat
+    services.xmpp
+    services.znc
     ./nixos/virtualhosts.nix
-    # services
-    ../../services/fail2ban.nix
-    ../../services/logrotate.nix
-    ../../services/postgres.nix
-    ../../services/nginx.nix
-    ../../services/mail.nix
-    ../../services/radicale.nix
-    ../../services/xmpp.nix
-    ../../services/gitea
-    ../../services/syncplay.nix
-    ../../services/weechat.nix
-    ../../services/vaultwarden.nix
-    ../../services/taskserver.nix
-    ../../services/murmur.nix
-    ../../services/matrix.nix
-    ../../services/restic.nix
-    ../../services/grafana.nix
-    ../../services/prometheus.nix
-    ../../services/loki.nix
-    ../../services/node-exporter.nix
-    ../../services/promtail.nix
-    ../../services/netdata.nix
-    ../../services/znc.nix
-    ../../services/asterisk.nix
   ];
 
   # File Systems and Swap
diff --git a/config/hosts/beltane/nixos.nix b/config/hosts/beltane/nixos.nix
index c8445f00..a4b38261 100644
--- a/config/hosts/beltane/nixos.nix
+++ b/config/hosts/beltane/nixos.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, profiles, users, tf, ... }:
+{ config, lib, pkgs, profiles, services, users, tf, ... }:
 
 with lib;
 
@@ -9,14 +9,14 @@ with lib;
     profiles.hardware.rm-310
     profiles.gui
     users.kat.guiFull
+    services.node-exporter
+    services.promtail
+    services.netdata
+    services.nginx
+    services.zfs
     ./nixos/jellyfin.nix
     ./nixos/virtualhosts.nix
     ./nixos/transmission.nix
-    ../../services/node-exporter.nix
-    ../../services/promtail.nix
-    ../../services/netdata.nix
-    ../../services/nginx.nix
-    ../../services/zfs.nix
   ];
 
   # File Systems and Swap
diff --git a/config/hosts/samhain/nixos.nix b/config/hosts/samhain/nixos.nix
index 419ee58a..3485bf32 100644
--- a/config/hosts/samhain/nixos.nix
+++ b/config/hosts/samhain/nixos.nix
@@ -1,4 +1,4 @@
-{ tf, config, users, pkgs, lib, profiles, sources, ... }:
+{ tf, config, users, pkgs, lib, profiles, sources, services, ... }:
 
 with lib;
 
@@ -14,12 +14,12 @@ in {
     profiles.gui
     profiles.vfio
     users.kat.guiFull
-    ../../services/zfs.nix
-    ../../services/restic.nix
-    ../../services/nginx.nix
-    ../../services/node-exporter.nix
-    ../../services/promtail.nix
-    ../../services/netdata.nix
+    services.netdata
+    services.nginx
+    services.node-exporter
+    services.promtail
+    services.restic
+    services.zfs
     ./nixos/virtualhosts.nix
   ];
 
diff --git a/config/hosts/yule/nixos.nix b/config/hosts/yule/nixos.nix
index ab43028f..a3f8f67e 100644
--- a/config/hosts/yule/nixos.nix
+++ b/config/hosts/yule/nixos.nix
@@ -1,4 +1,4 @@
-{ config, users, pkgs, lib, profiles, ... }:
+{ config, users, pkgs, lib, profiles, services, ... }:
 
 with lib;
 
@@ -10,12 +10,12 @@ with lib;
     profiles.gui
     profiles.laptop
     users.kat.guiFull
-    ../../services/zfs.nix
-    ../../services/restic.nix
-    ../../services/node-exporter.nix
-    ../../services/promtail.nix
-    ../../services/netdata.nix
-    ../../services/nginx.nix
+    services.netdata
+    services.nginx
+    services.node-exporter
+    services.promtail
+    services.restic
+    services.zfs
   ];
 
   # File Systems and Swap
diff --git a/config/modules/meta/network.nix b/config/modules/meta/network.nix
index 9d360e47..2379196a 100644
--- a/config/modules/meta/network.nix
+++ b/config/modules/meta/network.nix
@@ -1,4 +1,4 @@
-{ pkgs, sources, users, profiles, hardware, lib, config, ... }:
+{ pkgs, sources, users, profiles, services, lib, config, ... }:
 
 /*
 This module:
@@ -59,7 +59,7 @@ with lib;
       ];
       specialArgs = {
         inherit (config.network) nodes;
-        inherit sources profiles users;
+        inherit sources profiles users services;
         meta = config;
       };
     };