diff --git a/machines/haze/configuration.nix b/machines/haze/configuration.nix
index 1946ccd..9dc529f 100644
--- a/machines/haze/configuration.nix
+++ b/machines/haze/configuration.nix
@@ -9,7 +9,6 @@
     ./chat.nix
     ./gimp.nix
     ./hibernate.nix
-    ./niri.nix
     ./ssh.nix
     ./network.nix
     ./syncthing.nix
@@ -17,6 +16,7 @@
     self.nixosModules.atuin-config
     self.nixosModules.desktop
     self.nixosModules.lanzaboote
+    self.nixosModules.niri
     self.nixosModules.nix-defaults
     self.nixosModules.steam
 
@@ -66,7 +66,6 @@
     wheelNeedsPassword = false;
   };
 
-
   services.displayManager.autoLogin = {
     enable = true;
     user = "rpqt";
diff --git a/machines/renoir/configuration.nix b/machines/renoir/configuration.nix
index d62ad49..ee57b43 100644
--- a/machines/renoir/configuration.nix
+++ b/machines/renoir/configuration.nix
@@ -7,6 +7,7 @@
   imports = [
     self.nixosModules.atuin-config
     self.nixosModules.desktop
+    self.nixosModules.niri
     self.nixosModules.nix-defaults
     self.nixosModules.steam
     ../haze/syncthing.nix
@@ -35,21 +36,9 @@
     }
 
     {
-      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";
 }
diff --git a/machines/haze/niri.nix b/nixosModules/niri.nix
similarity index 100%
rename from machines/haze/niri.nix
rename to nixosModules/niri.nix