From 9c99926c8a1cfdca695e0e80fd3fab9a5a8453c9 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Tue, 10 Oct 2023 09:56:06 +0200
Subject: [PATCH] greetd: Only open firewall for wayvnc when tailscale is not
 enabled

---
 modules/greetd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix
index 8617a0f..4279065 100644
--- a/modules/greetd/default.nix
+++ b/modules/greetd/default.nix
@@ -77,14 +77,14 @@ in
 
         # exec "${pkgs.greetd.regreet}/bin/regreet; swaymsg exit"
 
-        networking.firewall.allowedTCPPorts = lib.mkIf cfg.wayvnc [ 5900 ];
+        networking.firewall.allowedTCPPorts = lib.mkIf (cfg.wayvnc && !config.services.tailscale.enable) [ 5900 ];
 
         environment = {
           systemPackages = with pkgs; [ pantheon.elementary-gtk-theme pantheon.elementary-icon-theme ];
           etc = {
             "greetd/sway-config" = {
               text = lib.concatStringsSep "\n"
-                ((lib.optional cfg.wayvnc "exec ${pkgs.wayvnc}/bin/wayvnc -g 0.0.0.0") ++
+                ((lib.optional cfg.wayvnc "exec ${pkgs.wayvnc}/bin/wayvnc 0.0.0.0") ++
                   [
                     ''
                       exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -s /etc/greetd/gtkgreet.css -b ${cfg.wallpaper}; swaymsg exit"