From c03d0d20821d7628ea0e9541ad767f41a91bd325 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Fri, 22 Nov 2024 21:56:27 +0100
Subject: [PATCH] use mako and improve starting characteristics

---
 common/home/default.nix          | 37 ++++++++++++++++++++++++++++----
 modules/default.nix              |  1 -
 modules/dunst.nix                | 37 --------------------------------
 packages/niri-config/default.nix |  2 --
 4 files changed, 33 insertions(+), 44 deletions(-)
 delete mode 100644 modules/dunst.nix

diff --git a/common/home/default.nix b/common/home/default.nix
index a849b52..a1a57e1 100644
--- a/common/home/default.nix
+++ b/common/home/default.nix
@@ -206,6 +206,10 @@ in
     services = lib.mkMerge [
       {
         spotify = {
+          Install = {
+            WantedBy = [ "niri.service" ];
+          };
+
           Unit = {
             PartOf = "graphical-session.target";
             After = "graphical-session.target";
@@ -216,6 +220,22 @@ in
             ExecStart = "spotify";
           };
         };
+
+        mako = {
+          Install = {
+            WantedBy = [ "niri.service" ];
+          };
+
+          Unit = {
+            PartOf = "graphical-session.target";
+            After = "graphical-session.target";
+            Requisite = "graphical-session.target";
+          };
+
+          Service = {
+            ExecStart = "${pkgs.mako}/bin/mako";
+          };
+        };
       }
       # makes an automapaper service and config for every monitor.
       (builtins.listToAttrs (
@@ -398,10 +418,6 @@ in
   };
 
   services = {
-    # sync my password store and homework
-    syncthing = {
-      enable = true;
-    };
     # to make my yubikey and git signing do things correctly
     gpg-agent = {
       enable = true;
@@ -409,5 +425,18 @@ in
       enableSshSupport = true;
       pinentryPackage = lib.mkIf enableGraphical pkgs.pinentry-qt;
     };
+    # notification daemon, I think it looks better than dunst
+    mako = {
+      enable = true;
+      backgroundColor = "#000000AA";
+      # make notifications time out after 30 sec by default
+      defaultTimeout = 30000;
+      borderColor = config.colorScheme.palette.base00;
+    };
+    playerctld.enable = true;
+    # sync my password store and homework
+    syncthing = {
+      enable = true;
+    };
   };
 }
diff --git a/modules/default.nix b/modules/default.nix
index 9ea9027..4a1b37e 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -4,6 +4,5 @@
     ./waybar
     ./applications
     ./games
-    ./dunst.nix
   ];
 }
diff --git a/modules/dunst.nix b/modules/dunst.nix
deleted file mode 100644
index e0911fe..0000000
--- a/modules/dunst.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
-let
-  cfg = config.modules.dunst;
-in
-{
-  options.modules.dunst = {
-    enable = lib.mkEnableOption "enable dunst for notifications";
-  };
-  config = lib.mkIf cfg.enable {
-    services.dunst = {
-      enable = true;
-      # settings = {
-      #   global = {
-      #     width = 300;
-      #     height = 300;
-      #     offset = "30x50";
-      #     origin = "top-right";
-      #     transparency = 10;
-      #     frame_color = "#293929";
-      #     font = "Droid Sans 9";
-      #   };
-      #
-      #   urgency_normal = {
-      #     background = "#37474f";
-      #     foreground = "#293929";
-      #     timeout = 10;
-      #   };
-      # };
-    };
-  };
-}
diff --git a/packages/niri-config/default.nix b/packages/niri-config/default.nix
index 2f00190..1ab50d2 100644
--- a/packages/niri-config/default.nix
+++ b/packages/niri-config/default.nix
@@ -12,8 +12,6 @@ let
   autostart-string =
     "spawn-at-startup \""
     + pkgs.lib.strings.concatStringsSep "\nspawn-at-startup \"" [
-      "${pkgs.dunst}/bin/dunst\""
-      "spotify\""
       "keepassxc\""
       "thunderbird\""
     ];