From 3651abbfb84b3f40f09f63a515f61aa8d49608f9 Mon Sep 17 00:00:00 2001
From: nzbr <mail@nzbr.de>
Date: Tue, 12 Jul 2022 02:54:55 +0200
Subject: prevent systemd-tmpfiles from removing the xorg socket (#115)

---
 modules/wsl-distro.nix | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'modules')

diff --git a/modules/wsl-distro.nix b/modules/wsl-distro.nix
index cacf2cc..0f7d8b0 100644
--- a/modules/wsl-distro.nix
+++ b/modules/wsl-distro.nix
@@ -181,18 +181,26 @@ with builtins; with lib;
         '';
       };
 
-      # Disable systemd units that don't make sense on WSL
-      systemd.services."serial-getty@ttyS0".enable = false;
-      systemd.services."serial-getty@hvc0".enable = false;
-      systemd.services."getty@tty1".enable = false;
-      systemd.services."autovt@".enable = false;
-
-      systemd.services.firewall.enable = false;
-      systemd.services.systemd-resolved.enable = mkDefault false;
-      systemd.services.systemd-udevd.enable = false;
-
-      # Don't allow emergency mode, because we don't have a console.
-      systemd.enableEmergencyMode = false;
+      systemd = {
+        # Disable systemd units that don't make sense on WSL
+        services = {
+          "serial-getty@ttyS0".enable = false;
+          "serial-getty@hvc0".enable = false;
+          "getty@tty1".enable = false;
+          "autovt@".enable = false;
+          firewall.enable = false;
+          systemd-resolved.enable = false;
+          systemd-udevd.enable = false;
+        };
+
+        tmpfiles.rules = [
+          # Don't remove the X11 socket
+          "d /tmp/.X11-unix 1777 root root"
+        ];
+
+        # Don't allow emergency mode, because we don't have a console.
+        enableEmergencyMode = false;
+      };
 
       warnings = (optional (config.systemd.services.systemd-resolved.enable && config.wsl.wslConf.network.generateResolvConf) "systemd-resolved is enabled, but resolv.conf is managed by WSL");
     };
-- 
cgit v1.2.3