diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 9e501f6..95f4ec1 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -154,7 +154,10 @@ in
           options = [ "caps:escape" ];
         };
 
-        sessionVariables.EDITOR = "vim";
+        sessionVariables = {
+          EDITOR = "vim";
+          NIXOS_OZONE_WL = 1;
+        };
 
         packages =
           (with pkgs; [
diff --git a/modules/services/work-proxy.nix b/modules/services/work-proxy.nix
index db20430..a337ae2 100644
--- a/modules/services/work-proxy.nix
+++ b/modules/services/work-proxy.nix
@@ -50,6 +50,9 @@ in
       };
     };
 
-    environment.systemPackages = with pkgs; [ chisel ];
+    environment.systemPackages = with pkgs; [
+      (sbt.override { jre = jdk17; })
+      chisel
+    ];
   };
 }