From 8b4a2e713b0a225eb6a18677003423dffe9642c1 Mon Sep 17 00:00:00 2001 From: xinyangli Date: Thu, 10 Apr 2025 13:00:06 +0800 Subject: [PATCH] weilite: switch to dae in network module --- machines/weilite/default.nix | 8 ++------ modules/nixos/common-settings/network.nix | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/machines/weilite/default.nix b/machines/weilite/default.nix index 9b9d442..ccb0b2d 100644 --- a/machines/weilite/default.nix +++ b/machines/weilite/default.nix @@ -39,6 +39,7 @@ enable = true; }; comin.enable = true; + network.localdns.enable = true; }; node = { mediaDir = "/mnt/nixos/media"; @@ -102,7 +103,7 @@ type = "virtiofs"; options = "rw,nodev,nosuid"; } -{ + { what = "originals"; where = "/mnt/photos/xin/originals"; type = "virtiofs"; @@ -148,11 +149,6 @@ 2222 ]; - services.dae = { - enable = true; - configFile = "/var/lib/dae/config.dae"; - }; - services.tailscale = { enable = true; openFirewall = true; diff --git a/modules/nixos/common-settings/network.nix b/modules/nixos/common-settings/network.nix index 354904a..196b0e7 100644 --- a/modules/nixos/common-settings/network.nix +++ b/modules/nixos/common-settings/network.nix @@ -25,6 +25,12 @@ in useLocalResolver = true; }; + services.resolved.enable = mkIf cfg.localdns.enable false; + + services.tailscale = mkIf cfg.localdns.enable { + extraUpFlags = [ "--accept-dns=false" ]; + }; + services.kresd = mkIf cfg.localdns.enable { enable = true; listenPlain = [ "127.0.0.1:53" ];