From 0ea66d23a34b2fe349885324e6ec947ee4fa1729 Mon Sep 17 00:00:00 2001
From: Phil Pluckthun <phil@kitten.sh>
Date: Sun, 22 Jun 2025 19:50:03 +0100
Subject: [PATCH] Apply sshd config to macOS server

---
 machines/irnbru/configuration.nix | 4 ++++
 modules/server/caddy.nix          | 2 +-
 modules/server/hd-idle.nix        | 4 ++--
 modules/server/home-assistant.nix | 4 ++--
 modules/server/jellyfin.nix       | 4 ++--
 modules/server/podman.nix         | 4 ++--
 modules/server/sshd.nix           | 3 ++-
 modules/server/tailscale.nix      | 4 ++--
 modules/server/vaultwarden.nix    | 4 ++--
 9 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/machines/irnbru/configuration.nix b/machines/irnbru/configuration.nix
index 4b780a7..64d2a53 100644
--- a/machines/irnbru/configuration.nix
+++ b/machines/irnbru/configuration.nix
@@ -2,4 +2,8 @@
 
 {
   imports = [ ];
+
+  modules = {
+    server.enable = true;
+  };
 }
diff --git a/modules/server/caddy.nix b/modules/server/caddy.nix
index 2a12194..019d1e8 100644
--- a/modules/server/caddy.nix
+++ b/modules/server/caddy.nix
@@ -67,7 +67,7 @@ let
       }
     '') cfg.caddy.exposeFolders;
   in strings.concatStringsSep "\n\n" configs;
-in {
+in helpers.linuxAttrs {
   options.modules.server.caddy = {
     enable = mkOption {
       default = false;
diff --git a/modules/server/hd-idle.nix b/modules/server/hd-idle.nix
index ad25a90..a13efd8 100644
--- a/modules/server/hd-idle.nix
+++ b/modules/server/hd-idle.nix
@@ -1,10 +1,10 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, helpers, ... }:
 
 with lib;
 let
   cfgRoot = config.modules.server;
   cfg = config.modules.server.hd-idle;
-in {
+in helpers.linuxAttrs {
   options.modules.server.hd-idle = {
     enable = mkOption {
       default = false;
diff --git a/modules/server/home-assistant.nix b/modules/server/home-assistant.nix
index 5c5a6f2..b45a170 100644
--- a/modules/server/home-assistant.nix
+++ b/modules/server/home-assistant.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, helpers, ... }:
 
 with lib;
 let
@@ -10,7 +10,7 @@ let
   containerImage = if stdenv.isAarch64
     then "ghcr.io/home-assistant/aarch64-homeassistant:${cfg.revision}"
     else "ghcr.io/home-assistant/home-assistant:${cfg.revision}";
-in {
+in helpers.linuxAttrs {
   options.modules.server.home-assistant = {
     enable = mkOption {
       default = false;
diff --git a/modules/server/jellyfin.nix b/modules/server/jellyfin.nix
index 0e4db0d..08e60bb 100644
--- a/modules/server/jellyfin.nix
+++ b/modules/server/jellyfin.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, user, ... }:
+{ lib, config, pkgs, user, helpers, ... }:
 
 with lib;
 let
@@ -6,7 +6,7 @@ let
   cfg = config.modules.server.jellyfin;
 
   group = "share";
-in {
+in helpers.linuxAttrs {
   options.modules.server.jellyfin = {
     enable = mkOption {
       default = false;
diff --git a/modules/server/podman.nix b/modules/server/podman.nix
index e516472..0de6c32 100644
--- a/modules/server/podman.nix
+++ b/modules/server/podman.nix
@@ -1,10 +1,10 @@
-{ lib, config, user, pkgs, ... }:
+{ lib, config, user, pkgs, helpers, ... }:
 
 with lib;
 let
   cfgRoot = config.modules.server;
   cfg = config.modules.server.podman;
-in {
+in helpers.linuxAttrs {
   options.modules.server.podman = {
     enable = mkOption {
       default = false;
diff --git a/modules/server/sshd.nix b/modules/server/sshd.nix
index 908c404..7b54ca8 100644
--- a/modules/server/sshd.nix
+++ b/modules/server/sshd.nix
@@ -1,4 +1,4 @@
-{ lib, config, user, ... }:
+{ lib, config, user, helpers, ... }:
 
 with lib;
 let
@@ -20,6 +20,7 @@ in {
 
     services.openssh = {
       enable = true;
+    } // helpers.linuxAttrs {
       openFirewall = mkDefault (!config.modules.router.enable);
     };
   };
diff --git a/modules/server/tailscale.nix b/modules/server/tailscale.nix
index c8fec0f..e61ed47 100644
--- a/modules/server/tailscale.nix
+++ b/modules/server/tailscale.nix
@@ -1,11 +1,11 @@
-{ lib, config, pkgs, user, hostname, ... }:
+{ lib, config, pkgs, user, helpers, hostname, ... }:
 
 with lib;
 let
   cfgRoot = config.modules.server;
   cfgRouter = config.modules.router;
   cfg = config.modules.server.tailscale;
-in {
+in helpers.linuxAttrs {
   options.modules.server.tailscale = {
     enable = mkOption {
       default = false;
diff --git a/modules/server/vaultwarden.nix b/modules/server/vaultwarden.nix
index 2cac54c..6bf0c0f 100644
--- a/modules/server/vaultwarden.nix
+++ b/modules/server/vaultwarden.nix
@@ -1,10 +1,10 @@
-{ lib, config, hostname, ... }:
+{ lib, config, hostname, helpers, ... }:
 
 with lib;
 let
   address = config.modules.router.adress;
   cfg = config.modules.server;
-in {
+in helpers.linuxAttrs {
   options.modules.server.vaultwarden = {
     enable = mkOption {
       default = false;
-- 
2.51.2