From 9b3918f2e9abfacb433326fad93df6bf47e249f4 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 21 Feb 2023 21:06:32 +0100
Subject: sway: switch back to mako for notifications, use proper HM module

fnott had a lot of display issues, with multi-monitor?
---
 usecases/desktop/graphical/sway.nix | 45 +++++++++++++------------------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/usecases/desktop/graphical/sway.nix b/usecases/desktop/graphical/sway.nix
index 1f0c1d1..17bc5b8 100644
--- a/usecases/desktop/graphical/sway.nix
+++ b/usecases/desktop/graphical/sway.nix
@@ -150,9 +150,9 @@ _inputs: {
             "${modifier}+Shift+ccedilla" = "move container to workspace 9";
             "${modifier}+Shift+agrave" = "move container to workspace 10";
 
-            "${modifier}+comma" = "exec fnottctl dismiss";
-            "${modifier}+Shift+comma" = "exec fnottctl dismiss all";
-            "${modifier}+period" = "exec fnottctl actions";
+            "${modifier}+comma" = "exec makoctl dismiss";
+            "${modifier}+Shift+comma" = "exec makoctl dismiss --all";
+            "${modifier}+period" = "exec makoctl menu rofi -dmenu -no-custom";
 
             "${modifier}+m" = "exec ${pkgs.swaylock}/bin/swaylock";
 
@@ -172,6 +172,10 @@ _inputs: {
         output."*".bg = "${../../../res/wallpapers/wallpaper-1920x1080-kernel-card-black.png} fill";
 
         startup = [
+          {
+            command = "mako";
+            always = true;
+          }
           {command = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";}
         ];
 
@@ -184,37 +188,20 @@ _inputs: {
       };
     };
 
-    services.fnott = {
+    programs.mako = with osConfig.theme.colors; {
       enable = true;
-      extraFlags = ["-s"];
-      settings = let
-        color = c: (lib.removePrefix "#" c) + "ff";
-      in
-        with osConfig.theme.colors; {
-          main = {
-            title-color = color foreground;
-            summary-color = color foreground;
-            body-color = color foreground;
+      backgroundColor = background0;
+      borderColor = lightBackground;
+      borderSize = 2;
+      progressColor = neutralBlue;
+      textColor = foreground;
 
-            border-size = 1;
-            border-color = color background0;
+      margin = "15";
+      padding = "7";
 
-            min-width = 300;
-
-            notification-margin = 5;
-
-            selection-helper = "${config.programs.rofi.finalPackage}/bin/rofi -dmenu -no-custom";
-          };
-
-          normal.background = color lightBackground;
-          low.background = color background;
-          critical.background = color brightRed;
-        };
+      groupBy = "app-name";
     };
 
-    # TODO: upstream
-    systemd.user.services.fnott.Install.WantedBy = ["graphical-session.target"];
-
     services.wlsunset = {
       enable = true;
       latitude = "48.864716";
-- 
cgit v1.2.3