diff --git a/home/desktop/cosmic/default.nix b/home/desktop/cosmic/default.nix
index b21fd75..7583e66 100644
--- a/home/desktop/cosmic/default.nix
+++ b/home/desktop/cosmic/default.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   inputs,
@@ -9,10 +8,9 @@
   mkAction = variant: action:
     mkRON "enum" {
       inherit variant;
-      value = [
-        (mkRON "enum" action)
-      ];
+      value = [action];
     };
+  mkEnumAction = variant: action: mkAction variant (mkRON "enum" action);
 in {
   imports = [inputs.cosmic-manager.homeManagerModules.cosmic-manager];
   wayland.desktopManager.cosmic = {
@@ -27,9 +25,25 @@ in {
 
     shortcuts = [
       {
-        action = mkAction "System" "Terminal";
+        action = mkEnumAction "System" "Terminal";
         key = "Super+Return";
       }
+      {
+        action = mkEnumAction "System" "Screenshot";
+        key = "Super+Shift+S";
+      }
+      {
+        action = mkAction "Spawn" "bwmenu";
+        key = "Super+P";
+      }
+      {
+        action = mkAction "Spawn" "bwusernamemenu";
+        key = "Super+Ctrl+P";
+      }
+      {
+        action = mkAction "Spawn" "bwotpmenu";
+        key = "Super+Shift+P";
+      }
     ];
 
     compositor = {
diff --git a/home/workstation.nix b/home/workstation.nix
index 0ae98e5..597c5da 100644
--- a/home/workstation.nix
+++ b/home/workstation.nix
@@ -18,9 +18,9 @@
   ];
 
   programs.menu = {
-    package = pkgs.tofi;
-    dmenuCommand = "${pkgs.tofi}/bin/tofi --fuzzy-match true";
-    drunCommand = "${pkgs.tofi}/bin/tofi-drun --drun-launch true";
+    package = pkgs.wofi;
+    dmenuCommand = "${lib.getExe pkgs.wofi} --show dmenu";
+    drunCommand = "${lib.getExe pkgs.wofi} --show drun";
   };
 
   home.packages = with pkgs; [
@@ -47,6 +47,5 @@
     ]
   '';
 
-  services.gnome-keyring.enable = true;
   services.hyprpaper.enable = lib.mkForce false;
 }
diff --git a/nixos/workstation.nix b/nixos/workstation.nix
index 6620850..d99aaac 100644
--- a/nixos/workstation.nix
+++ b/nixos/workstation.nix
@@ -22,6 +22,8 @@
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
 
+  services.gnome.gnome-keyring.enable = true;
+
   programs.kdeconnect.enable = true;
 
   virtualisation.waydroid.enable = true;