diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix
index 85c668d..43f78ac 100644
--- a/modules/home/desktop/default.nix
+++ b/modules/home/desktop/default.nix
@@ -7,13 +7,14 @@
 }:
 let
   cfg = config.desktop;
-  inherit (lib) mkIf mkEnableOption;
+  upstreamCfg = osConfig.desktop;
+  inherit (lib) mkMerge mkIf mkEnableOption;
 in
 {
   options.desktop = {
     wayland.enableUtils = mkEnableOption "common Wayland utilities";
   };
-  config = lib.mkMerge [
+  config = mkIf upstreamCfg.enable (mkMerge [
     (mkIf cfg.wayland.enableUtils {
       home.packages = with pkgs; [
         wl-clipboard-rs
@@ -43,5 +44,5 @@ in
         ".config/sunshine"
       ];
     })
-  ];
+  ]);
 }
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index 7a88799..4347979 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -4,14 +4,19 @@
   pkgs,
   ...
 }:
+let
+  inherit (lib) mkEnableOption;
+  inherit (lib.pantheon) mkStrOption;
+in
 {
   imports = [
     ./windowManager.nix
   ];
 
   options.desktop = {
+    enable = mkEnableOption "";
     mainMonitor = {
-      id = lib.pantheon.mkStrOption;
+      id = mkStrOption;
       scale = lib.pantheon.mkStrOption;
       resolution = lib.pantheon.mkStrOption;
       refresh-rate = lib.pantheon.mkStrOption;
diff --git a/systems/x86_64-linux/desktop.nix b/systems/x86_64-linux/desktop.nix
index c7b8baf..b004fd7 100644
--- a/systems/x86_64-linux/desktop.nix
+++ b/systems/x86_64-linux/desktop.nix
@@ -1,5 +1,6 @@
 {
   desktop = {
+    enable = true;
     browser.firefox = {
       enable = true;
       syncedProfiles = [