From c9b3731026d24ca1247259445ae0b55409e2d497 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 14 Sep 2024 09:27:35 +0100
Subject: [PATCH] Swap swaync for mako

Remove separate swaylockfx file, combine in default
---
 system/home/sway/default.nix        |  9 ++++-----
 system/home/swaylock/default.nix    |  4 +++-
 system/home/swaylock/swaylockfx.nix |  2 --
 system/home/waybar/default.nix      | 25 ++++++-------------------
 4 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 system/home/swaylock/swaylockfx.nix

diff --git a/system/home/sway/default.nix b/system/home/sway/default.nix
index d01f4f2b..3345758e 100644
--- a/system/home/sway/default.nix
+++ b/system/home/sway/default.nix
@@ -10,9 +10,9 @@
   imports = [
     ../avizo/default.nix
     ../fuzzel/default.nix
+    ../mako/default.nix
     ../swaylock/default.nix
     ../swayidle/default.nix
-    ../swaync/default.nix
     ../waybar/default.nix
     ../wlogout/default.nix
   ];
@@ -175,6 +175,7 @@
         {
           command = "${pkgs.swaybg}/bin/swaybg -m fill -i ${../wallpapers/landscapes/tropic_island_day.jpg}";
         }
+        { command = "${config.services.mako.package}/bin/mako"; }
       ];
       window = {
         border = 1;
@@ -243,8 +244,8 @@
 
           # System utilities
           "Mod4+Mod1+l" = "exec swaylockfx";
-          "${modifier}+z" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw";
-          "${modifier}+Shift+z" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw";
+          "${modifier}+z" = "exec ${config.services.mako.package}/bin/makoctl restore";
+          "${modifier}+Shift+z" = "exec ${config.services.mako.package}/bin/makoctl dismiss -a";
           "${modifier}+Shift+p" = "exec ${config.programs.wlogout.package}/bin/wlogout";
           "${modifier}+Shift+Return" = "exec ${config.programs.emacs.finalPackage}/bin/emacsclient -c";
         };
@@ -266,8 +267,6 @@
       layer_effects "logout_dialog" blur enable; blur_ignore_transparent enable; shadows enable
       layer_effects "waybar" blur enable; blur_ignore_transparent enable; shadows enable
       layer_effects "avizo" blur enable; blur_ignore_transparent enable; shadows enable
-      layer_effects "swaync-notification-window" blur enable; blur_ignore_transparent enable; shadows enable
-      layer_effects "swaync-control-center" blur enable; blur_ignore_transparent enable; shadows enable
       titlebar_separator enable
     '';
   };
diff --git a/system/home/swaylock/default.nix b/system/home/swaylock/default.nix
index 443fe794..463c7fb4 100644
--- a/system/home/swaylock/default.nix
+++ b/system/home/swaylock/default.nix
@@ -6,7 +6,9 @@
 }:
 {
   home.packages = with pkgs; [
-    (callPackage ./swaylockfx.nix { swaylock-effects = config.programs.swaylock.package; })
+    (writeShellScriptBin "swaylockfx" ''
+      ${swaylock-effects}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse
+    '')
   ];
   programs.swaylock = {
     enable = true;
diff --git a/system/home/swaylock/swaylockfx.nix b/system/home/swaylock/swaylockfx.nix
deleted file mode 100644
index c4d7945b..00000000
--- a/system/home/swaylock/swaylockfx.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{ writeShellScriptBin, swaylock-effects, ... }:
-writeShellScriptBin "swaylockfx" "${swaylock-effects}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse"
diff --git a/system/home/waybar/default.nix b/system/home/waybar/default.nix
index 24b1b76e..bac34dff 100644
--- a/system/home/waybar/default.nix
+++ b/system/home/waybar/default.nix
@@ -245,27 +245,14 @@
       };
       "custom/notification" =
         let
-          swaync = pkgs.swaynotificationcenter;
+          makoctl = "${config.services.mako.package}/bin/makoctl";
+          jq = "${pkgs.jq}/bin/jq";
         in
         {
-          tooltip = false;
-          format = "{icon}{}";
-          format-icons = {
-            notification = "󱅫 ";
-            none = "󰂚 ";
-            dnd-notification = "󰅸 ";
-            dnd-none = "󰂜 ";
-            inhibited-notification = "󰅸 ";
-            inhibited-none = "󰂜 ";
-            dnd-inhibited-notification = "󰅸 ";
-            dnd-inhibited-none = "󰂜 ";
-          };
-          return-type = "json";
-          exec-if = "which ${swaync}/bin/swaync-client";
-          exec = "${swaync}/bin/swaync-client -swb";
-          on-click = "${swaync}/bin/swaync-client -t -sw";
-          on-click-right = "${swaync}/bin/swaync-client -d -sw";
-          escape = true;
+          exec = "( ${makoctl} list | ${jq} -e '.data[] | length > 0' >/dev/null && echo '󱅫 ' ) || echo '󰂚 ' ";
+          format = "{}";
+          on-click = "${makoctl} dismiss -a";
+          interval = 3;
         };
       "custom/weather" =
         let