diff --git a/flake.nix b/flake.nix
index f76fe57..3b58cc3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -153,25 +153,10 @@
           };
         };
         vscodeExtensions = nix-vscode-extensions.overlays.default;
+        niri = niri.overlays.niri;
       };
 
-      nixosModules = (importModuleDir ./nixosModules) // {
-        niri =
-          { lib, config, ... }:
-          {
-            imports = [ niri.nixosModules.niri ];
-
-            options.my.niri.enable = lib.mkEnableOption "niri wayland compositor";
-
-            config = lib.mkIf config.my.niri.enable {
-              nixpkgs.overlays = [ niri.overlays.niri ];
-              programs.niri = {
-                enable = true;
-                #package = pkgs.niri-stable;
-              };
-            };
-          };
-      };
+      nixosModules = importModuleDir ./nixosModules;
 
       homeModules = importModuleDir ./homeModules;
       homeConfigurations = {
@@ -202,7 +187,6 @@
             home-manager.nixosModules.home-manager
             lanzaboote.nixosModules.lanzaboote
             nova-shell.nixosModules.default
-            self.nixosModules.niri
             servicepoint-cli.nixosModules.default
             servicepoint-simulator.nixosModules.default
             servicepoint-tanks.nixosModules.default
@@ -236,7 +220,7 @@
                 globalinstalls.enable = true;
                 lixIsNix.enable = true;
                 openssh.enable = true;
-                prometheusNode.enable = true;
+                # prometheusNode.enable = true;
                 systemdBoot.enable = true;
                 tailscale.enable = true;
               };
@@ -276,7 +260,6 @@
                 gnome.enable = true;
                 kdeconnect.enable = true;
                 modernDesktop.enable = true;
-                niri.enable = true;
                 nixLd.enable = true;
                 quietBoot.enable = true;
                 stylix.enable = true;
diff --git a/nixosModules/muede-desktop-settings.nix b/nixosModules/muede-desktop-settings.nix
index 3203524..8f25f62 100644
--- a/nixosModules/muede-desktop-settings.nix
+++ b/nixosModules/muede-desktop-settings.nix
@@ -2,12 +2,18 @@
   lib,
   config,
   pkgs,
+  niri,
   ...
 }:
 {
+  imports = [ niri.nixosModules.niri ];
+
   options.my.muedeDesktopSettings.enable = lib.mkEnableOption "muede desktop settings (Firefox, Logitech, RDP)";
 
   config = lib.mkIf config.my.muedeDesktopSettings.enable {
+    my.overlays.niri.enable = true;
+    programs.niri.enable = true;
+
     programs.firefox.enable = true;
 
     environment.systemPackages = with pkgs; [