diff --git a/home/modules/desktop/niri/default.nix b/home/modules/desktop/niri/default.nix
index aa92a3aa..a5e012e7 100644
--- a/home/modules/desktop/niri/default.nix
+++ b/home/modules/desktop/niri/default.nix
@@ -9,6 +9,15 @@
     ../../waybar
   ];
 
+  options.desktop.niri.enable = lib.mkEnableOption "niri desktop environment";
+
+  config = lib.mkIf config.desktop.niri.enable {
+  clipboard.enable = lib.mkDefault true;
+  fuzzel.enable = lib.mkDefault true;
+  mako.enable = lib.mkDefault true;
+  shikane.enable = lib.mkDefault true;
+  waybar.enable = lib.mkDefault true;
+
   home = {
     file.".config/niri/config.kdl".source = ./config.kdl;
     packages = with pkgs; [
diff --git a/home/modules/fuzzel/default.nix b/home/modules/fuzzel/default.nix
index ee6bc20e..91ffcb30 100644
--- a/home/modules/fuzzel/default.nix
+++ b/home/modules/fuzzel/default.nix
@@ -1,14 +1,27 @@
 {
-  programs.fuzzel = {
-    enable = true;
-    settings = {
-      main = {
-        horizontal-pad = 0;
-        vertical-pad = 0;
-      };
-      border = {
-        width = 2;
-        radius = 0;
+  config,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.fuzzel;
+in
+{
+  options.fuzzel.enable = lib.mkEnableOption "fuzzel";
+
+  config = lib.mkIf cfg.enable {
+    programs.fuzzel = {
+      enable = true;
+      settings = {
+        main = {
+          horizontal-pad = 0;
+          vertical-pad = 0;
+        };
+        border = {
+          width = 2;
+          radius = 0;
+        };
       };
     };
   };