revamp with nix flakes + desktop config

3 files changed, 11 insertions, 3 deletions

diff --git a/usecases/server/default.nix b/usecases/server/default.nix
index 1b47ee4..f32728a 100644
--- a/usecases/server/default.nix
+++ b/usecases/server/default.nix
@@ -1,8 +1,12 @@
+# A reasonable set of defaults for a server
+
+inputs:
+
 { ... }:
 
 {
   imports = [
-    ./fail2ban.nix
-    ./monitoring-target.nix
+    (import ./fail2ban.nix inputs)
+    (import ./monitoring-target.nix inputs)
   ];
 }
diff --git a/usecases/server/fail2ban.nix b/usecases/server/fail2ban.nix
index 1c2912c..3870a32 100644
--- a/usecases/server/fail2ban.nix
+++ b/usecases/server/fail2ban.nix
@@ -1,3 +1,5 @@
+inputs:
+
 { config, ... }:
 
 {
diff --git a/usecases/server/monitoring-target.nix b/usecases/server/monitoring-target.nix
index 1ddeb25..2ccd160 100644
--- a/usecases/server/monitoring-target.nix
+++ b/usecases/server/monitoring-target.nix
@@ -1,3 +1,5 @@
+inputs:
+
 { config, ... }:
 
 {
@@ -6,7 +8,7 @@
       enable = true;
       enabledCollectors = [ "logind" "systemd" ];
       disabledCollectors = [ "textfile" ];
-      listenAddress = config.topology.mainVpn.currentNodeIP;
+      listenAddress = "[${config.topology.mainVpn.currentNodeIP}]";
     };
   };