From c11c4d77f007a8ceedf937ad54b2dbedf01971ca Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Fri, 9 Jun 2023 22:09:19 +0200
Subject: [PATCH] Move dunst into a module

---
 home-manager/modules/default.nix              |  1 +
 .../modules/services/dunst/default.nix        | 65 +++++++++++++++++++
 home-manager/profiles/desktop.nix             |  2 +-
 home-manager/software/dunst/default.nix       | 56 ----------------
 4 files changed, 67 insertions(+), 57 deletions(-)
 create mode 100644 home-manager/modules/services/dunst/default.nix
 delete mode 100644 home-manager/software/dunst/default.nix

diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix
index 579723c..275dac7 100644
--- a/home-manager/modules/default.nix
+++ b/home-manager/modules/default.nix
@@ -4,6 +4,7 @@
     ./programs/alacritty
     ./programs/ansible
     ./programs/calibre
+    ./services/dunst
     ./services/grobi
   ];
 }
diff --git a/home-manager/modules/services/dunst/default.nix b/home-manager/modules/services/dunst/default.nix
new file mode 100644
index 0000000..0337f0d
--- /dev/null
+++ b/home-manager/modules/services/dunst/default.nix
@@ -0,0 +1,65 @@
+{ config, lib, ... }:
+let
+  cfg = config.programs.az-dunst;
+in
+{
+  options = {
+    programs.az-dunst.enable = lib.mkEnableOption "Enable dunst.";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.dunst = {
+      enable = true;
+      settings = {
+        global = {
+          font = "Source Code Pro 14";
+          markup = "yes";
+          format = "<b>%s</b>\\n%b";
+          sort = "no";
+          indicate_hidden = "yes";
+          alignment = "center";
+          show_age_threshold = -1;
+          word_wrap = "yes";
+          ignore_newline = "no";
+          stack_duplicates = "yes";
+          shrink = "no";
+          transparency = 5;
+          idle_threshold = 0;
+          monitor = 0;
+          follow = "none";
+          sticky_history = "yes";
+          history_length = 15;
+          show_indicators = "no";
+          line_height = 3;
+          separator_height = 2;
+          padding = 6;
+          horizontal_padding = 6;
+          separator_color = "frame";
+          browser = "firefox - new-tab";
+          icon_position = "off";
+          max_icon_size = 80;
+          frame_width = 3;
+          frame_color = "#8EC07C";
+        };
+        urgency_low = {
+          frame_color = "#3B7C87";
+          foreground = "#3B7C87";
+          background = "#191311";
+          timeout = 4;
+        };
+        urgency_normal = {
+          frame_color = "#5B8234";
+          foreground = "#5B8234";
+          background = "#191311";
+          timeout = 6;
+        };
+        urgency_critical = {
+          frame_color = "#B7472A";
+          foreground = "#B7472A";
+          background = "#191311";
+          timeout = 8;
+        };
+      };
+    };
+  };
+}
diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix
index 6f1bed8..e65ec62 100644
--- a/home-manager/profiles/desktop.nix
+++ b/home-manager/profiles/desktop.nix
@@ -4,7 +4,6 @@
     "${inputs.self}/home-manager/modules"
     "${inputs.self}/home-manager/software/emacs"
     "${inputs.self}/home-manager/software/espanso"
-    "${inputs.self}/home-manager/software/dunst"
     "${inputs.self}/home-manager/software/evince"
     "${inputs.self}/home-manager/software/fzf"
     "${inputs.self}/home-manager/software/git"
@@ -69,6 +68,7 @@
   };
 
   services = {
+    az-dunst.enable = true;
     az-grobi.enable = true;
     nextcloud-client = {
       enable = true;
diff --git a/home-manager/software/dunst/default.nix b/home-manager/software/dunst/default.nix
deleted file mode 100644
index 2fa8c55..0000000
--- a/home-manager/software/dunst/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ ... }:
-{
-  services.dunst = {
-    enable = true;
-    settings = {
-      global = {
-        font = "Source Code Pro 14";
-        markup = "yes";
-        format = "<b>%s</b>\\n%b";
-        sort = "no";
-        indicate_hidden = "yes";
-        alignment = "center";
-        show_age_threshold = -1;
-        word_wrap = "yes";
-        ignore_newline = "no";
-        stack_duplicates = "yes";
-        shrink = "no";
-        transparency = 5;
-        idle_threshold = 0;
-        monitor = 0;
-        follow = "none";
-        sticky_history = "yes";
-        history_length = 15;
-        show_indicators = "no";
-        line_height = 3;
-        separator_height = 2;
-        padding = 6;
-        horizontal_padding = 6;
-        separator_color = "frame";
-        browser = "firefox - new-tab";
-        icon_position = "off";
-        max_icon_size = 80;
-        frame_width = 3;
-        frame_color = "#8EC07C";
-      };
-      urgency_low = {
-        frame_color = "#3B7C87";
-        foreground = "#3B7C87";
-        background = "#191311";
-        timeout = 4;
-      };
-      urgency_normal = {
-        frame_color = "#5B8234";
-        foreground = "#5B8234";
-        background = "#191311";
-        timeout = 6;
-      };
-      urgency_critical = {
-        frame_color = "#B7472A";
-        foreground = "#B7472A";
-        background = "#191311";
-        timeout = 8;
-      };
-    };
-  };
-}