From 2843d2ee40eb3adb9b30ddf9fac48e45fa2dcb48 Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Sat, 22 Oct 2022 13:33:33 +0200
Subject: [PATCH] [Services] Enable X11 forwarding

---
 services.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services.nix b/services.nix
index 216f423..920acbd 100644
--- a/services.nix
+++ b/services.nix
@@ -49,9 +49,12 @@ in {
     services.openssh = {
       enable = true;
       permitRootLogin = mkDefault "prohibit-password";
-      forwardX11 = mkDefault true;
+      forwardX11 = mkDefault config.services.xserver.enable;
       openFirewall = true;
     };
+    programs.ssh.setXAuthLocation = config.services.xserver.enable;
+    programs.ssh.forwardX11 = mkDefault config.services.xserver.enable;
+    security.pam.services.sudo.forwardXAuth = mkDefault true; # Easier to start GUI programs as root
     
     networking.firewall.allowedTCPPorts = [ 22 ]
       ++ optionals config.services.printing.enable [ 631 139 445 ];