1 files changed, 15 insertions, 14 deletions

diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 841c972a..cc6c85c3 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -4,7 +4,7 @@ let
   terminal = lib.getExe config.programs.kitty.package;
   lightctl = lib.getExe' config.services.avizo.package "lightctl";
   volumectl = lib.getExe' config.services.avizo.package "volumectl";
-  dunstctl = lib.getExe' config.services.dunst.package "dunstctl";
+  makoctl = lib.getExe' config.services.mako.package "makoctl";
   loginctl = lib.getExe' hostConfig.systemd.package "loginctl";
   systemctl = lib.getExe' hostConfig.systemd.package "systemctl";
 
@@ -121,6 +121,7 @@ let
 in {
   imports = [
     ./waybar.nix
+    ./mako.nix
   ];
 
   config = {
@@ -244,13 +245,13 @@ in {
       };
 
       window-rules = [
-        {
-          geometry-corner-radius =
-            let
-              allCorners = r: { bottom-left = r; bottom-right = r; top-left = r; top-right = r; };
-            in allCorners 4.;
-          clip-to-geometry = true;
-        }
+        # {
+        #   geometry-corner-radius =
+        #     let
+        #       allCorners = r: { bottom-left = r; bottom-right = r; top-left = r; top-right = r; };
+        #     in allCorners 4.;
+        #   clip-to-geometry = true;
+        # }
         {
           matches = [ { app-id = "^com\.saivert\.pwvucontrol$"; } ];
           open-on-workspace = "pwctl";
@@ -264,7 +265,7 @@ in {
           excludes = [
             { title = "^Unlock Database.*"; }
             { title = "^Access Request.*"; }
-            { title = "^Passkey credentials.*"; }
+            { title = ".*Passkey credentials$"; }
           ];
           open-on-workspace = "kpxc";
           open-focused = false;
@@ -273,7 +274,7 @@ in {
           matches = [
             { app-id = "^org\.keepassxc\.KeePassXC$";  title = "^Unlock Database.*"; }
             { app-id = "^org\.keepassxc\.KeePassXC$";  title = "^Access Request.*"; }
-            { app-id = "^org\.keepassxc\.KeePassXC$";  title = "^Passkey credentials.*"; }
+            { app-id = "^org\.keepassxc\.KeePassXC$";  title = ".*Passkey credentials$"; }
           ];
           open-focused = true;
         }
@@ -519,10 +520,10 @@ in {
           allow-when-locked = true;
         };
 
-        "Mod+Semicolon".action = spawn dunstctl "close";
-        "Mod+Shift+Semicolon".action = spawn dunstctl "close-all";
-        "Mod+Period".action = spawn dunstctl "context";
-        "Mod+Comma".action = spawn dunstctl "history-pop";
+        "Mod+Semicolon".action = spawn makoctl "dismiss";
+        "Mod+Shift+Semicolon".action = spawn makoctl "dismiss" "--all";
+        "Mod+Period".action = spawn makoctl (lib.getExe config.programs.fuzzel.package) "--dmenu";
+        "Mod+Comma".action = spawn makoctl "restore";
 
         "Mod+Control+A".action = focus-or-spawn-action-app_id "com.saivert.pwvucontrol" "pwctl" "pwvucontrol";
         "Mod+Control+P".action = focus-or-spawn-action-app_id "org.keepassxc.KeePassXC" "kpxc" "keepassxc";