more granularity on wm subcomponents.

modules/desktop/home.nix

···
     inherit (osConfig.desktop or { })
       enable
       wm
+      waybar
+      hyprlock
+      wallpaper
+      notification
+      launcher
       terminal
       audio
       apps
···
     enable = mkEnableOption "all desktop tools";
 
     wm.enable = mkEnableOption "window manager and interface tools";
+    waybar.enable = mkEnableOption "Waybar status bar";
+    hyprlock.enable = mkEnableOption "Hyprlock screen locker";
+    wallpaper.enable = mkEnableOption "Wallpaper management";
+    wallpaper.image = lib.mkOption {
+      default = pkgs.fetchurl {
+        url = "https://raw.githubusercontent.com/HoulFloof/wallpapers/f23c1010b93cb97baa7ad7c94fd552f7601496d2/misc/waves_right_colored.png";
+        hash = "sha256-NqqE+pGnCIWAitH86sxu1EudVEEaSO82y3NqbhtDh9k=";
+      };
+      type = lib.types.path;
+      description = "the wallpaper to use";
+    };
+    notification.enable = mkEnableOption "Notification daemon";
+    launcher.enable = mkEnableOption "Application launcher";
     terminal.enable = mkEnableOption "terminal tools";
     audio.enable = mkEnableOption "audio tools";
     apps.enable = mkEnableOption "desktop applications";
···
       default = "firefox-devedition.desktop";
       type = types.str;
     };
-    wallpaper = lib.mkOption {
-      default = pkgs.fetchurl {
-        url = "https://raw.githubusercontent.com/HoulFloof/wallpapers/f23c1010b93cb97baa7ad7c94fd552f7601496d2/misc/waves_right_colored.png";
-        hash = "sha256-NqqE+pGnCIWAitH86sxu1EudVEEaSO82y3NqbhtDh9k=";
-      };
-      type = lib.types.path;
-      description = "the wallpaper to use";
-    };
+
   };
   imports = [
     ./wm

modules/desktop/nixos.nix

···
     enable = mkEnableOption "all desktop tools";
 
     wm.enable = mkEnableOption "window manager and interface tools";
+    waybar.enable = mkEnableOption "Waybar status bar";
+    hyprlock.enable = mkEnableOption "Hyprlock screen locker";
+    wallpaper.enable = mkEnableOption "Wallpaper management";
+    notification.enable = mkEnableOption "Notification daemon";
+    launcher.enable = mkEnableOption "Application launcher";
     terminal.enable = mkEnableOption "terminal tools";
     audio.enable = mkEnableOption "audio tools";
     apps.enable = mkEnableOption "desktop applications";
···
 
   config = {
     desktop.wm.enable = mkIf cfg.enable true;
+    desktop.waybar.enable = mkIf cfg.wm.enable true;
+    desktop.hyprlock.enable = mkIf cfg.wm.enable true;
+    desktop.wallpaper.enable = mkIf cfg.wm.enable true;
+    desktop.notification.enable = mkIf cfg.wm.enable true;
+    desktop.launcher.enable = mkIf cfg.wm.enable true;
     desktop.terminal.enable = mkIf cfg.enable true;
     desktop.audio.enable = mkIf cfg.enable true;
     desktop.apps.enable = mkIf cfg.enable true;

modules/desktop/wm/dunst.nix

···
 { config, ... }:
 {
-  services.dunst.enable = config.desktop.wm.enable;
+  services.dunst.enable = config.desktop.notification.enable;
 }

modules/desktop/wm/fuzzel.nix

···
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
-  programs.fuzzel = lib.mkIf config.desktop.wm.enable {
+  programs.fuzzel = lib.mkIf config.desktop.launcher.enable {
     enable = true;
     settings.main = {
       terminal = "ghostty";
     };
+  };
+
+  programs.niri.settings.binds = lib.mkIf config.desktop.launcher.enable {
+    "Mod+R".action.spawn = "${lib.getExe pkgs.fuzzel}";
   };
 }

modules/desktop/wm/hyprlock.nix

···
   ...
 }:
 {
-  config = lib.mkIf config.desktop.wm.enable {
+  config = lib.mkIf config.desktop.hyprlock.enable {
     services.hypridle = {
       enable = true;
       settings = {
···
 
         background = {
           monitor = "";
-          path = "${config.desktop.wallpaper}";
+          path = "${config.desktop.wallpaper.image}";
           blur_passes = 0;
           color = "$base";
         };

modules/desktop/wm/niri.nix

···
           };
         };
 
-        spawn-at-startup = [ { command = [ "systemctl --user restart waybar.service" ]; } ];
+        spawn-at-startup = [ ];
 
         layout = {
           gaps = 16;
···
           {
             "Mod+O".action = show-hotkey-overlay;
             "Mod+Q".action.spawn = "${lib.getExe pkgs.ghostty}";
-            "Mod+R".action.spawn = "${lib.getExe pkgs.fuzzel}";
             "Mod+C".action.close-window = [ ];
 
             "Mod+Comma".action = consume-window-into-column;

modules/desktop/wm/wallpaper.nix

···
   ...
 }:
 {
-  config = lib.mkIf config.desktop.wm.enable {
+  config = lib.mkIf config.desktop.wallpaper.enable {
     services.swww = {
       enable = true;
     };
···
         command = [
           (lib.getExe' pkgs.swww "swww")
           "img"
-          "${config.desktop.wallpaper}"
+          "${config.desktop.wallpaper.image}"
         ];
       }
     ];

modules/desktop/wm/waybar.nix

···
   ...
 }:
 {
-  config = lib.mkIf config.desktop.wm.enable {
+  config = lib.mkIf config.desktop.waybar.enable {
+    programs.niri.settings.spawn-at-startup = [
+      { command = [ "systemctl --user restart waybar.service" ]; }
+    ];
     programs.waybar = {
       enable = true;
       systemd.enable = true;