3 files changed, 11 insertions, 42 deletions
diff --git a/env/wsl/bootstrap-configuration.nix b/env/wsl/bootstrap-configuration.nix
index b66147c..1dddade 100755
--- a/env/wsl/bootstrap-configuration.nix
+++ b/env/wsl/bootstrap-configuration.nix
@@ -8,5 +8,5 @@
 
   environment.systemPackages = with pkgs; [ git nfs-utils ];
 
-  system.stateVersion = "23.05";
+  system.stateVersion = "25.05";
 }
diff --git a/env/wsl/noto_cjk_no_variable.diff b/env/wsl/noto_cjk_no_variable.diff
deleted file mode 100644
index 152c140..0000000
--- a/env/wsl/noto_cjk_no_variable.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix b/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
-index 5c7ab768..79981e27 100644
---- a/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
-+++ b/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
-@@ -13,12 +13,12 @@ stdenvNoCC.mkDerivation rec {
-     owner = "notofonts";
-     repo = "noto-cjk";
-     rev = "Sans${version}";
--    hash = "sha256-IgalJkiOAVjNxKaPAQWfb5hKeqclliR4qVXCq63FGWY=";
--    sparseCheckout = [ "Sans/Variable/OTC" ];
-+    hash = "sha256-GXULnRPsIJRdiL3LdFtHbqTqSvegY2zodBxFm4P55to=";
-+    sparseCheckout = [ "Sans/OTC" ];
-   };
- 
-   installPhase = ''
--    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Sans/Variable/OTC/*.otf.ttc
-+    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Sans/OTC/*.ttc
-   '';
- 
-   passthru.tests.noto-fonts = nixosTests.noto-fonts;
-diff --git a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
-index d9fddcc6..55cde591 100644
---- a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
-+++ b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
-@@ -13,12 +13,12 @@ stdenvNoCC.mkDerivation rec {
-     owner = "notofonts";
-     repo = "noto-cjk";
-     rev = "Serif${version}";
--    hash = "sha256-GLjpTAiHfygj1J4AdUVDJh8kykkFOglq+h4kyat5W9s=";
--    sparseCheckout = [ "Serif/Variable/OTC" ];
-+    hash = "sha256-ihbhbv875XEHupFUzIdEweukqEmwQXCXCiTG7qisE64=";
-+    sparseCheckout = [ "Serif/OTC" ];
-   };
- 
-   installPhase = ''
--    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Serif/Variable/OTC/*.otf.ttc
-+    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Serif/OTC/*.ttc
-   '';
- 
-   passthru.tests.noto-fonts = nixosTests.noto-fonts;
diff --git a/env/wsl/wsl-dev-host.nix b/env/wsl/wsl-dev-host.nix
index ccd0ac4..0e9877e 100755
--- a/env/wsl/wsl-dev-host.nix
+++ b/env/wsl/wsl-dev-host.nix
@@ -6,7 +6,6 @@ in {
     enable = true;
     defaultUser = user;
     useWindowsDriver = true;
-    nativeSystemd = true;
   };
 
   users.users.${user}.extraGroups = [ "audio" "video" ];
@@ -47,6 +46,16 @@ in {
     cmatrix
   ];
 
+  # @TEMP: https://github.com/nix-community/NixOS-WSL/issues/650
+  # Needed for Wayland.
+  systemd.services."user-runtime-dir@" = {
+    overrideStrategy = "asDropin";
+    serviceConfig.ExecStart = [
+      "" # unset old value
+      "${pkgs.coreutils}/bin/true"
+    ];
+  };
+
   fonts = {
     fontDir.enable = true;
     packages = with pkgs; [