fix small issues around desktop module

modules/desktop/desktop.nix

···
 in
 {
   imports = [ inputs.niri.nixosModules.niri ];
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.wm.enable {
     environment = {
       systemPackages = with pkgs; [
         wl-clipboard

modules/desktop/home.nix

···
 {
   lib,
-  osConfig ? { },
+  osConfig ? {},
   pkgs,
-  config,
   ...
-}:
-let
+}: let
   inherit (lib) mkEnableOption mkOption types;
-in
-{
-  config.dev = lib.intersectAttrs config.dev (osConfig.dev or { });
+in {
+  config.desktop = {
+    inherit
+      (osConfig.desktop or {})
+      enable
+      wm
+      terminal
+      audio
+      apps
+      ;
+  };
   options.desktop = {
     enable = mkEnableOption "all desktop tools";
 

modules/desktop/nixos.nix

···
     desktop.terminal.enable = mkIf cfg.enable true;
     desktop.audio.enable = mkIf cfg.enable true;
     desktop.apps.enable = mkIf cfg.enable true;
-    desktop.ipcam.enable = mkIf cfg.enable true;
     desktop.yubikey.enable = mkIf cfg.enable true;
     desktop.locale.enable = mkIf cfg.enable true;
   };

modules/desktop/wm/dunst.nix

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

modules/desktop/wm/xdg.nix

···
           "application/x-extension-xht" = browser;
           "x-scheme-handler/about" = browser;
           "x-scheme-handler/unknown" = browser;
-          "x-scheme-handler/discord" = "legcord.desktop";
+          "x-scheme-handler/discord" = "vesktop.desktop";
           "text/markdown" = editor;
           "text/plain" = editor;
         };

modules/dev/home.nix

···
 {
-  osConfig ? { },
+  osConfig ? {},
   lib,
-  config,
   ...
-}:
-let
+}: let
   inherit (lib) mkEnableOption;
-in
-{
-  config.dev = lib.intersectAttrs config.dev (osConfig.dev or { });
+in {
+  config.dev = {
+    inherit
+      (osConfig.dev or {})
+      shell
+      editor
+      vcs
+      tools
+      ;
+  };
   options.dev = {
     enable = mkEnableOption "all development tools";