diff --git a/modules/home/services/mako/default.nix b/modules/home/services/mako/default.nix
index b751fda0..e3b1434a 100644
--- a/modules/home/services/mako/default.nix
+++ b/modules/home/services/mako/default.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
@@ -13,7 +14,7 @@ in {
     services.mako = {
       enable = true;
       iconPath = "$HOME/.nix-profile/share/icons/Gruvbox-Plus-Dark";
-      font = "FiraCode Nerd Font Medium 12";
+      font = "Input Sans Narrow Regular 12";
       padding = "20";
       margin = "10";
       anchor = "top-right";
@@ -25,7 +26,16 @@ in {
       borderColor = "#689d6add";
       textColor = "#d5c4a1dd";
       layer = "overlay";
-      extraConfig = ''
+      extraConfig = let
+        play = sound: "mpv ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/${sound}.oga";
+      in ''
+        on-notify=exec ${play "message"}
+        [app-name=yubikey-touch-detector]
+        on-notify=exec ${play "service-login"}
+        [app-name=command_complete summary~="✘.*"]
+        on-notify=exec ${play "dialog-warning"}
+        [app-name=command_complete summary~="✓.*"]
+        on-notify=exec ${play "bell"}
         max-history=50
         max-visible=4
         outer-margin=25
diff --git a/modules/home/services/mako/sounds.nix b/modules/home/services/mako/sounds.nix
deleted file mode 100644
index 6d9d017b..00000000
--- a/modules/home/services/mako/sounds.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-  home-manager.users.balsoft = {
-    systemd.user.services.mako = {
-      Service = {
-        ExecStart = "${pkgs.mako}/bin/mako";
-        Environment = ["PATH=${pkgs.lib.makeBinPath [pkgs.bash pkgs.mpv]}"];
-      };
-      Install = {
-        After = ["sway-session.target"];
-        WantedBy = ["sway-session.target"];
-      };
-    };
-    services.mako = with (pkgs.my-lib.thmHash config.themes.colors); {
-      enable = true;
-      layer = "overlay";
-      font = with config.themes.fonts; "${main.family} ${toString main.size}";
-      width = 500;
-      height = 160;
-      defaultTimeout = 10000;
-      maxVisible = 10;
-      backgroundColor = "${base00}AA";
-      textColor = base05;
-      borderColor = "${base0D}AA";
-      progressColor = "over ${base0B}";
-      iconPath = "${pkgs.breeze-icons}/share/icons/breeze-dark";
-      maxIconSize = 24;
-      extraConfig = let
-        play = sound: "mpv ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/${sound}.oga";
-      in ''
-        [urgency=high]
-        border-color=${base09}AA
-        [urgency=critical]
-        border-color=${base09}AA
-        on-notify=exec ${play "message"}
-        [app-name=yubikey-touch-detector]
-        on-notify=exec ${play "service-login"}
-        [app-name=command_complete summary~="✘.*"]
-        on-notify=exec ${play "dialog-warning"}
-        [app-name=command_complete summary~="✓.*"]
-        on-notify=exec ${play "bell"}
-        [category=osd]
-        on-notify=none
-        [mode=do-not-disturb]
-        invisible=1
-        [mode=do-not-disturb summary="Do not disturb: on"]
-        invisible=0
-        [mode=concentrate]
-        invisible=1
-        [mode=concentrate urgency=critical]
-        invisible=0
-        [mode=concentrate summary="Concentrate mode: on"]
-        invisible=0
-      '';
-    };
-  };
-}
diff --git a/modules/nixos/programs/yubikey/default.nix b/modules/nixos/programs/yubikey/default.nix
index 53124c3d..72de6845 100644
--- a/modules/nixos/programs/yubikey/default.nix
+++ b/modules/nixos/programs/yubikey/default.nix
@@ -16,6 +16,7 @@ in {
       # pkgs.yubikey-manager
       pkgs.yubikey-personalization
       pkgs.yubikey-personalization-gui
+      pkgs.yubikey-touch-detector
       # pkgs.pcsc-tools
     ];
   };