diff --git a/hosts/main-laptop/configuration.nix b/hosts/main-laptop/configuration.nix
index 7f173e0..5275c86 100644
--- a/hosts/main-laptop/configuration.nix
+++ b/hosts/main-laptop/configuration.nix
@@ -64,6 +64,7 @@
     programs.tailscale.enable = lib.mkForce true;
     programs.gnupg.enable = lib.mkForce true;
     programs.gnupg.ssh = lib.mkForce true;
+    programs.niri.enable = lib.mkForce true;
 
     drivers = {
       printer.M2020.enable = lib.mkForce true;
diff --git a/nixosModules/default.nix b/nixosModules/default.nix
index f75490f..b2bd731 100644
--- a/nixosModules/default.nix
+++ b/nixosModules/default.nix
@@ -39,6 +39,7 @@
     programs.powertop.enable = lib.mkDefault true;
     programs.gnupg.enable = lib.mkDefault true;
     programs.gnupg.ssh = lib.mkDefault true;
+    programs.niri.enable = lib.mkDefault false;
 
     drivers = {
       printer.M2020.enable = lib.mkDefault false;
diff --git a/nixosModules/programs/niri.nix b/nixosModules/programs/niri.nix
index eed493f..e4df8d9 100644
--- a/nixosModules/programs/niri.nix
+++ b/nixosModules/programs/niri.nix
@@ -1,15 +1,27 @@
-{ pkgs, ... }:
 {
-  programs.niri.enable = true;
-  programs.niri.package = pkgs.niri-unstable;
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
 
-  environment.systemPackages = with pkgs; [
-    swayosd
-    fuzzel
-    alacritty
-    wl-clipboard
-    wayland-utils
-    libsecret
-    xwayland-satellite-unstable
-  ];
+  options.settings.programs.niri = {
+    enable = lib.mkEnableOption "enables the niri window-manager";
+  };
+
+  config = lib.mkIf config.settings.programs.niri.enable {
+    programs.niri.enable = true;
+    programs.niri.package = pkgs.niri-unstable;
+
+    environment.systemPackages = with pkgs; [
+      swayosd
+      fuzzel
+      alacritty
+      wl-clipboard
+      wayland-utils
+      libsecret
+      xwayland-satellite-unstable
+    ];
+  };
 }