cleanup

modules/home/programs/mako/default.nix

@@ -4,33 +4,37 @@
   namespace,
   ...
 }:
-with lib;
-let
-  cfg = config.${namespace}.programs.mako;
-in
 {
-  imports = [ ./options.nix ];
-  config = mkIf cfg.enable {
-    services.mako = {
-      enable = true;
-      settings = {
-        font = mkDefault cfg.fontName;
-        icons = true;
-        ignore-timeout = true;
-        sort = "-time";
-        width = 500;
-        height = 110;
-        layer = "overlay";
-        border-radius = 15;
-        border-size = 1;
-        max-icon-size = 64;
-        default-timeout = 5000;
-
-        # background-color = mkDefault config.lib.stylix.colors.base00;
-        # text-color = mkDefault config.lib.stylix.colors.base06;
-        # border-color = mkDefault config.lib.stylix.colors.base0F;
-        # progress-color = mkDefault "over ${config.lib.stylix.colors.base0C}";
+  imports = [
+    (lib.${namespace}.mkHomeModule {
+      inherit config;
+      domain = "programs";
+      name = "mako";
+      options = {
+        fontName = lib.mkOption {
+          type = lib.types.str;
+          default = "DejaVu Sans";
+          description = "Font name for mako notifications.";
+        };
       };
-    };
-  };
+      moduleConfig = {
+        services.mako = {
+          enable = true;
+          settings = {
+            font = lib.mkDefault config.${namespace}.programs.mako.fontName;
+            icons = true;
+            ignore-timeout = true;
+            sort = "-time";
+            width = 500;
+            height = 110;
+            layer = "overlay";
+            border-radius = 15;
+            border-size = 1;
+            max-icon-size = 64;
+            default-timeout = 5000;
+          };
+        };
+      };
+    })
+  ];
 }

modules/home/programs/mako/options.nix

@@ -1,12 +0,0 @@
-{ lib, namespace, ... }:
-with lib;
-{
-  options.${namespace}.programs.mako = {
-    enable = mkEnableOption "enable mako";
-
-    fontName = mkOption {
-      type = types.str;
-      default = "DejaVu Sans";
-    };
-  };
-}