diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix
index 3fb34ff..a3323ed 100644
--- a/hosts/hermit/programs.nix
+++ b/hosts/hermit/programs.nix
@@ -2,7 +2,13 @@
   self,
   pkgs,
   ...
-}: {
+}: let
+  niri-switch-to-workspace = pkgs.writeShellScriptBin "niri-switch-to-workspace" ''
+    workspace="$(echo -en "main\nsocial\nkeepass\nbrowser\ninfra\nscratch\nmultimedia" | fuzzel --dmenu)"
+    # niri msg action focus-workspace-monitor "$workspace"
+    niri msg action focus-workspace "$workspace"
+  '';
+in {
   environment.systemPackages = builtins.attrValues {
     inherit
       (pkgs)
@@ -95,5 +101,6 @@
       television
       ;
     inherit (self.packages.${pkgs.stdenv.system}) helix;
+    inherit niri-switch-to-workspace;
   };
 }
diff --git a/modules/wms/wayland/niri/module.nix b/modules/wms/wayland/niri/module.nix
index 385dc2e..8d60ca5 100644
--- a/modules/wms/wayland/niri/module.nix
+++ b/modules/wms/wayland/niri/module.nix
@@ -13,7 +13,7 @@ in {
   programs.xwayland.enable = lib.mkForce false;
   services.gnome.gnome-keyring.enable = lib.mkForce false;
   environment.systemPackages = builtins.attrValues {
-    inherit (pkgs) wmenu swaylock avizo playerctl wayland-satellite;
+    inherit (pkgs) wmenu swaylock avizo playerctl xwayland-satellite;
   };
 
   xdg.portal = {