diff --git a/Cargo.toml b/Cargo.toml
index d0f76e80..acec6fdc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -64,14 +64,14 @@ egui = "0.27.2"
 egui_extras = { version = "0.27.2", features = ["svg", "image"] }
 epaint = "0.27.2"
 
-luminol-eframe = { version = "0.4.0", path = "crates/eframe/", features = [
+luminol-eframe = { version = "0.4.0", path = "crates/eframe/", default-features = false, features = [
     "wgpu",
     "accesskit",
     "persistence",
     "default_fonts",
-    "x11",
+    # "x11",
     "wayland",
-], default-features = false }
+] }
 luminol-egui-wgpu = { version = "0.4.0", path = "crates/egui-wgpu/" }
 egui-winit = "0.27.2"
 
@@ -100,7 +100,18 @@ color-eyre = "0.6.2"
 
 puffin = "0.19"
 raw-window-handle = "0.6.0"
-winit = { version = "0.29.4", default-features = false }
+
+winit = { version = "0.29.4", default-features = false, features = [
+    "rwh_06",
+    "wayland",
+    "wayland-dlopen",
+    "wayland-csd-adwaita",
+    "x11-dl",
+    "bytemuck",
+    "percent-encoding",
+    "x11rb",
+] }
+
 log = { version = "0.4", features = ["std"] }
 document-features = "0.2.8"
 web-time = "0.2"
diff --git a/misc/nix/luminol.nix b/misc/nix/luminol.nix
index 8939014e..1f96f1f5 100644
--- a/misc/nix/luminol.nix
+++ b/misc/nix/luminol.nix
@@ -13,8 +13,15 @@ in rustPlatform.buildRustPackage rec {
   pname = "luminol";
   version = "v0.0.1";
 
-
-  nativeBuildInputs = [ autoPatchelfHook fenix.complete.toolchain pkg-config git cmake clang makeBinaryWrapper ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+    fenix.complete.toolchain
+    pkg-config
+    git
+    cmake
+    clang
+    makeBinaryWrapper
+  ];
 
   buildInputs = [ gtk3 libxcb speechd libxkbcommon openssl alsa-lib ];
 
@@ -31,4 +38,9 @@ in rustPlatform.buildRustPackage rec {
       "flume-0.11.0" = "sha256-3GyRZyxvQxpbgXoptCcd9Rvb5xcRQlNVeRpal7mFEzA=";
     };
   };
+
+  postInstall = ''
+    wrapProgram $out/bin/luminol \
+      --set LD_LIBRARY_PATH ${libxkbcommon}/lib/libxkbcommon-x11.so
+  '';
 }