diff --git a/home/david/modules/default.nix b/home/david/modules/default.nix
index d126544..26bb09d 100644
--- a/home/david/modules/default.nix
+++ b/home/david/modules/default.nix
@@ -16,7 +16,6 @@
       spacer
       devenv
       just
-      showmethekey
     ];
   };
 }
diff --git a/home/david/modules/programs/niri/config.nix b/home/david/modules/programs/niri/config.nix
index 868c357..d06522d 100644
--- a/home/david/modules/programs/niri/config.nix
+++ b/home/david/modules/programs/niri/config.nix
@@ -464,36 +464,6 @@ in
         (leaf "geometry-corner-radius" 12.0)
         (leaf "clip-to-geometry" true)
       ])
-      (window-rule [
-        (match {app-id = "^showmethekey-gtk$";})
-        (leaf "geometry-corner-radius" 0.0)
-        (leaf "clip-to-geometry" false)
-        (leaf "open-floating" true)
-        (leaf "open-focused" false)
-        (plain "default-column-width" [
-          (leaf "fixed" 300)
-        ])
-        (plain "default-window-height" [
-          (leaf "fixed" 70)
-        ])
-        (leaf "draw-border-with-background" true)
-        (leaf "default-floating-position" {
-          relative-to = "bottom-right";
-          x = 20;
-          y = 20;
-        })
-        (plain "focus-ring" [
-          (flag "off")
-        ])
-        (plain "border" [
-          (flag "off")
-        ])
-        (plain "shadow" [
-          (flag "off")
-        ])
-        (leaf "baba-is-float" true)
-        (leaf "tiled-state" false)
-      ])
       (window-rule [
         (match {app-id = "^org\\.keepassxc\\.KeePassXC$";})
         (match {app-id = "^org\\.gnome\\.World\\.Secrets$";})
diff --git a/nixos/configurations/Akun/default.nix b/nixos/configurations/Akun/default.nix
index cb3bebd..3e6644c 100644
--- a/nixos/configurations/Akun/default.nix
+++ b/nixos/configurations/Akun/default.nix
@@ -31,6 +31,7 @@
       openssh.enable = true;
       kanata.enable = true;
       tailscale.enable = true;
+      wshowkeys.enable = true;
     };
   };
   programs.gnupg.agent = {
diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix
index 8b8392a..2dc840a 100644
--- a/nixos/configurations/Tytonidae/default.nix
+++ b/nixos/configurations/Tytonidae/default.nix
@@ -52,6 +52,7 @@
       juicity.client.enable = true;
       owncast.enable = true;
       minio.enable = true;
+      wshowkeys.enable = true;
     };
   };
 
diff --git a/nixos/modules/programs/default.nix b/nixos/modules/programs/default.nix
index 2a83c37..5a8143f 100644
--- a/nixos/modules/programs/default.nix
+++ b/nixos/modules/programs/default.nix
@@ -28,5 +28,6 @@
     ./minio.nix
     ./supergfxd.nix
     ./radicle.nix
+    ./wshowkeys.nix
   ];
 }
diff --git a/nixos/modules/programs/wshowkeys.nix b/nixos/modules/programs/wshowkeys.nix
new file mode 100644
index 0000000..825aabb
--- /dev/null
+++ b/nixos/modules/programs/wshowkeys.nix
@@ -0,0 +1,16 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.youthlic.programs.wshowkeys;
+in {
+  options = {
+    youthlic.programs.wshowkeys = {
+      enable = lib.mkEnableOption "wshowkeys";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    programs.wshowkeys.enable = true;
+  };
+}
diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix
index 79e53df..c7b2aba 100644
--- a/overlays/modifications/default.nix
+++ b/overlays/modifications/default.nix
@@ -7,6 +7,7 @@ in
     ./dae.nix
     ./spotifyx.nix
     ./radicle-explorer.nix
+    ./wshowkeys.nix
   ]
   |> map (file: import file args)
   |> (overlays: (lib.composeManyExtensions overlays) final prev)
diff --git a/overlays/modifications/wshowkeys.nix b/overlays/modifications/wshowkeys.nix
new file mode 100644
index 0000000..eee953b
--- /dev/null
+++ b/overlays/modifications/wshowkeys.nix
@@ -0,0 +1,5 @@
+{outputs, ...}: final: prev: let
+  inherit (prev.stdenv.hostPlatform) system;
+in {
+  wshowkeys = outputs.packages.${system}.wshowkeys-mao;
+}
diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json
index 2a8e87a..69882af 100644
--- a/pkgs/_sources/generated.json
+++ b/pkgs/_sources/generated.json
@@ -1,7 +1,7 @@
 {
     "TrackersListCollection": {
         "cargoLocks": null,
-        "date": "2025-05-22",
+        "date": "2025-05-23",
         "extract": null,
         "name": "TrackersListCollection",
         "passthru": null,
@@ -13,14 +13,14 @@
             "name": null,
             "owner": "XIU2",
             "repo": "TrackersListCollection",
-            "rev": "89d1e855ada9fa4e136759c1f2d9f83e4077fa9b",
-            "sha256": "sha256-2ZctoHyfyDCMuqLlMWoy8BIuZff5fAivtsVPLoVef9I=",
+            "rev": "74575fc44d1d22d777806bec075ae0473b46c5ba",
+            "sha256": "sha256-RqMdfIv/OzhDITkd48b8jNgmsGPJxZR+CAs7flmTrXw=",
             "sparseCheckout": [
                 "all.txt"
             ],
             "type": "github"
         },
-        "version": "89d1e855ada9fa4e136759c1f2d9f83e4077fa9b"
+        "version": "74575fc44d1d22d777806bec075ae0473b46c5ba"
     },
     "dioxionary": {
         "cargoLocks": {
@@ -176,5 +176,26 @@
             "url": "https://github.com/kayhide/tree-sitter-idris"
         },
         "version": "c56a25cf57c68ff929356db25505c1cc4c7820f6"
+    },
+    "wshowkeys-mao": {
+        "cargoLocks": null,
+        "date": "2025-02-03",
+        "extract": null,
+        "name": "wshowkeys-mao",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "DreamMaoMao",
+            "repo": "wshowkeys",
+            "rev": "24364e5f40b7ccbed728fe88757f559d84fae234",
+            "sha256": "sha256-I1nnwaE1Wr1b5EzQ4CP5sDCY8ZBaxP2FYZdIsKcVXL4=",
+            "sparseCheckout": [],
+            "type": "github"
+        },
+        "version": "24364e5f40b7ccbed728fe88757f559d84fae234"
     }
 }
\ No newline at end of file
diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix
index 4604f44..3678c00 100644
--- a/pkgs/_sources/generated.nix
+++ b/pkgs/_sources/generated.nix
@@ -3,18 +3,18 @@
 {
   TrackersListCollection = {
     pname = "TrackersListCollection";
-    version = "89d1e855ada9fa4e136759c1f2d9f83e4077fa9b";
+    version = "74575fc44d1d22d777806bec075ae0473b46c5ba";
     src = fetchFromGitHub {
       owner = "XIU2";
       repo = "TrackersListCollection";
-      rev = "89d1e855ada9fa4e136759c1f2d9f83e4077fa9b";
+      rev = "74575fc44d1d22d777806bec075ae0473b46c5ba";
       fetchSubmodules = false;
       deepClone = false;
       leaveDotGit = false;
       sparseCheckout = [ "all.txt" ];
-      sha256 = "sha256-2ZctoHyfyDCMuqLlMWoy8BIuZff5fAivtsVPLoVef9I=";
+      sha256 = "sha256-RqMdfIv/OzhDITkd48b8jNgmsGPJxZR+CAs7flmTrXw=";
     };
-    date = "2025-05-22";
+    date = "2025-05-23";
   };
   dioxionary = {
     pname = "dioxionary";
@@ -117,4 +117,16 @@
     name = "idris";
     date = "2024-11-05";
   };
+  wshowkeys-mao = {
+    pname = "wshowkeys-mao";
+    version = "24364e5f40b7ccbed728fe88757f559d84fae234";
+    src = fetchFromGitHub {
+      owner = "DreamMaoMao";
+      repo = "wshowkeys";
+      rev = "24364e5f40b7ccbed728fe88757f559d84fae234";
+      fetchSubmodules = false;
+      sha256 = "sha256-I1nnwaE1Wr1b5EzQ4CP5sDCY8ZBaxP2FYZdIsKcVXL4=";
+    };
+    date = "2025-02-03";
+  };
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 21421ab..0c66cbb 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -15,6 +15,7 @@ in
     spotifyx = callPackage ./spotifyx.nix {};
     radicle-explorer = callPackage ./radicle-explorer {};
     TrackersListCollection = callPackage ./TrackersListCollection.nix {};
+    wshowkeys-mao = callPackage ./wshowkeys-mao.nix {};
 
     noto-serif-cjk = callPackage ./noto-serif-cjk.nix {};
     noto-sans-cjk = callPackage ./noto-sans-cjk.nix {};
diff --git a/pkgs/nvfetcher.toml b/pkgs/nvfetcher.toml
index 100cc1a..ef7d3f9 100644
--- a/pkgs/nvfetcher.toml
+++ b/pkgs/nvfetcher.toml
@@ -34,3 +34,7 @@ fetch.github = "SpotX-Official/SpotX-Bash"
 src.git = "https://github.com/XIU2/TrackersListCollection.git"
 fetch.github = "XIU2/TrackersListCollection"
 git.sparseCheckout = ["all.txt"]
+
+[wshowkeys-mao]
+src.git = "https://github.com/DreamMaoMao/wshowkeys.git"
+fetch.github = "DreamMaoMao/wshowkeys"
diff --git a/pkgs/wshowkeys-mao.nix b/pkgs/wshowkeys-mao.nix
new file mode 100644
index 0000000..aff1b83
--- /dev/null
+++ b/pkgs/wshowkeys-mao.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  srcs,
+}: let
+  inherit (srcs) wshowkeys-mao;
+in
+  pkgs.wshowkeys.overrideAttrs (final: prev: {
+    inherit (wshowkeys-mao) src;
+    pname = "wshowkeys-mao";
+    version = wshowkeys-mao.date + "-" + wshowkeys-mao.version;
+  })