diff --git a/dotfiles/dot_config/niri/config.kdl b/dotfiles/dot_config/niri/config.kdl
index 93042ef..99a1464 100644
--- a/dotfiles/dot_config/niri/config.kdl
+++ b/dotfiles/dot_config/niri/config.kdl
@@ -3,9 +3,9 @@
 // Check the wiki for a full description of the configuration:
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Overview
 
-debug {
-    wait-for-frame-completion-before-queueing
-}
+// debug {
+//     wait-for-frame-completion-before-queueing
+// }
 
 input {
     keyboard {
@@ -45,6 +45,8 @@ output "PNP(BNQ) BenQ PD2725U N2N00414019" {
     transform "normal"
 }
 
+// TODO setup defaults for hdmi output
+
 environment {
     DISPLAY ":0"
     QT_QPA_PLATFORM "wayland"
diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix
index 18abf32..a13fee1 100644
--- a/system/eddie/configuration.nix
+++ b/system/eddie/configuration.nix
@@ -9,6 +9,7 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ./razer-speaker-fix.nix
+      ../niri
     ];
 
   nixpkgs = {
@@ -280,13 +281,6 @@
     vSync = true;
   };
 
-  programs.niri = {
-    enable = true;
-    package = inputs.niri.packages.x86_64-linux.niri;
-  };
-
-  # programs.waybar.enable = true;
-
   programs.nh = {
     enable = true;
     clean = {
diff --git a/system/niri/default.nix b/system/niri/default.nix
new file mode 100644
index 0000000..6df3ef1
--- /dev/null
+++ b/system/niri/default.nix
@@ -0,0 +1,8 @@
+{ inputs, config, lib, pkgs, ... }:
+
+{
+  programs.niri = {
+    enable = true;
+    package = inputs.niri.packages.x86_64-linux.niri;
+  };
+}