From 0ec0fa7748fd443a5737a206e29ac30b8afa98d3 Mon Sep 17 00:00:00 2001 From: Christoph Schmatzler Date: Wed, 13 Aug 2025 21:18:29 +0200 Subject: [PATCH] up --- modules/networking/tailscale.nix | 9 ++++++++- modules/platform/nixos/default.nix | 2 +- modules/platform/nixos/tailscale.nix | 8 -------- 3 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 modules/platform/nixos/tailscale.nix diff --git a/modules/networking/tailscale.nix b/modules/networking/tailscale.nix index d886410..54ff59b 100644 --- a/modules/networking/tailscale.nix +++ b/modules/networking/tailscale.nix @@ -1,3 +1,10 @@ +{ pkgs, lib, ... }: + { - services.tailscale.enable = true; + services.tailscale = { + enable = true; + } // lib.optionalAttrs pkgs.stdenv.isLinux { + useRoutingFeatures = "server"; + openFirewall = true; + }; } diff --git a/modules/platform/nixos/default.nix b/modules/platform/nixos/default.nix index a94ad9c..7383400 100644 --- a/modules/platform/nixos/default.nix +++ b/modules/platform/nixos/default.nix @@ -10,9 +10,9 @@ ../../core ../../networking/firewall.nix ../../networking/ssh.nix + ../../networking/tailscale.nix ../../services/adguard.nix ../../services/syncthing.nix - ./tailscale.nix sops-nix.nixosModules.sops ]; diff --git a/modules/platform/nixos/tailscale.nix b/modules/platform/nixos/tailscale.nix deleted file mode 100644 index 262783f..0000000 --- a/modules/platform/nixos/tailscale.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - services.tailscale = { - enable = true; - port = 41641; - useRoutingFeatures = "server"; - openFirewall = true; - }; -}