diff --git a/machines/haze/configuration.nix b/machines/haze/configuration.nix
index 9dc529f..1946ccd 100644
--- a/machines/haze/configuration.nix
+++ b/machines/haze/configuration.nix
@@ -9,6 +9,7 @@
     ./chat.nix
     ./gimp.nix
     ./hibernate.nix
+    ./niri.nix
     ./ssh.nix
     ./network.nix
     ./syncthing.nix
@@ -16,7 +17,6 @@
     self.nixosModules.atuin-config
     self.nixosModules.desktop
     self.nixosModules.lanzaboote
-    self.nixosModules.niri
     self.nixosModules.nix-defaults
     self.nixosModules.steam
 
@@ -66,6 +66,7 @@
     wheelNeedsPassword = false;
   };
 
+
   services.displayManager.autoLogin = {
     enable = true;
     user = "rpqt";
diff --git a/nixosModules/niri.nix b/machines/haze/niri.nix
similarity index 100%
rename from nixosModules/niri.nix
rename to machines/haze/niri.nix
diff --git a/machines/renoir/configuration.nix b/machines/renoir/configuration.nix
index ee57b43..d62ad49 100644
--- a/machines/renoir/configuration.nix
+++ b/machines/renoir/configuration.nix
@@ -7,7 +7,6 @@
   imports = [
     self.nixosModules.atuin-config
     self.nixosModules.desktop
-    self.nixosModules.niri
     self.nixosModules.nix-defaults
     self.nixosModules.steam
     ../haze/syncthing.nix
@@ -36,9 +35,21 @@
     }
 
     {
+      programs.niri.enable = true;
+
+      environment.systemPackages = with pkgs; [
+        pavucontrol
+        playerctl
+        xwayland-satellite
+      ];
+
+      services.gnome.gnome-keyring.enable = true;
+
+      environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+      programs.dms-shell.enable = true;
+
       security.acme.acceptTerms = true;
     }
   ];
-
-  time.timeZone = "Europe/Paris";
 }