diff --git a/homes/x86_64-linux/rafiq/desktop/notification-daemon.nix b/homes/x86_64-linux/rafiq/desktop/notification-daemon.nix
new file mode 100644
index 0000000..2959d14
--- /dev/null
+++ b/homes/x86_64-linux/rafiq/desktop/notification-daemon.nix
@@ -0,0 +1,6 @@
+{
+  home.sessionVariables.NOTIFICATION_DAEMON = "mako";
+  services.mako.settings = {
+    default-timeout = 10000;
+  };
+}
diff --git a/modules/home/desktop/notification-daemon/default.nix b/modules/home/desktop/notification-daemon/default.nix
deleted file mode 100644
index bef691a..0000000
--- a/modules/home/desktop/notification-daemon/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ osConfig, lib, ... }:
-{
-  config = lib.mkMerge [
-    (lib.mkIf (osConfig.desktop.notification-daemon == "mako") {
-      home.sessionVariables.NOTIFICATION_DAEMON = "mako";
-      services.mako = {
-        enable = true;
-        settings = {
-          default-timeout = 10000;
-        };
-      };
-    })
-  ];
-}
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index 988293f..3a9f69e 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -23,7 +23,6 @@ in
     };
     windowManager = lib.pantheon.mkStrOption;
     terminal = lib.pantheon.mkStrOption;
-    notification-daemon = lib.pantheon.mkStrOption;
     status-bar = lib.pantheon.mkStrOption;
     enableSpotifyd = lib.mkEnableOption "";
     enableSteam = lib.mkEnableOption "";
diff --git a/modules/nixos/desktop/notification-daemon/default.nix b/modules/nixos/desktop/notification-daemon/default.nix
new file mode 100644
index 0000000..3464729
--- /dev/null
+++ b/modules/nixos/desktop/notification-daemon/default.nix
@@ -0,0 +1,14 @@
+{ lib, config, ... }:
+let
+  inherit (lib) mkEnableOption singleton;
+  cfg = config.desktop.notification-daemon;
+in
+{
+  options.desktop.notification-daemon = {
+    mako.enable = mkEnableOption "";
+  };
+
+  config.home-manager.sharedModules = singleton {
+    services.mako.enable = cfg.mako.enable;
+  };
+}
diff --git a/systems/x86_64-linux/desktop.nix b/systems/x86_64-linux/desktop.nix
index 887cfa3..eaa8fca 100644
--- a/systems/x86_64-linux/desktop.nix
+++ b/systems/x86_64-linux/desktop.nix
@@ -5,9 +5,9 @@
     lockscreen.hyprlock.enable = true;
     launcher.fuzzel.enable = true;
     media-player.vlc.enable = true;
+    notification-daemon.mako.enable = true;
     windowManager = "hyprland";
     terminal = "ghostty";
-    notification-daemon = "mako";
     status-bar = "waybar";
     mainMonitor = {
       id = "desc:OOO AN-270W04K";