diff --git a/flake.nix b/flake.nix
index efc9189..4a16d06 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,7 @@
 
         vicinae.url          = "github:vicinaehq/vicinae";
         ghostty.url          = "github:ghostty-org/ghostty";
-        niri.url             = "github:sodiboo/niri-flake";
+        niri-flake.url             = "github:sodiboo/niri-flake";
 
         quickshell = {
             url = "github:outfoxxed/quickshell";
diff --git a/modules/core/niri.nix b/modules/core/niri.nix
index f58d4d1..6e16b96 100644
--- a/modules/core/niri.nix
+++ b/modules/core/niri.nix
@@ -2,64 +2,5 @@
 {
   programs.niri = {
     enable = true;
-    package = pkgs.niri-unstable;
-    settings = {
-      input.touchpad = { 
-        natural-scroll = true;
-        scroll-method = "two-finger";
-        click-method = "clickfinger";
-      };
-      
-      # Doracura color
-      layout = {
-        focus-ring = {
-          active.color = "#bd93f9" ;
-          inactive.color = "#6272a4";
-        };
-        border = {
-          active.color = "#ffc87f" ;
-          inactive.color = "#505050";
-          urgent.color = "#9b0000";
-        };
-        shadow = {
-          color = "#0007";
-        };
-      };
-
-      binds = {
-        "Mod+T" = {
-          action.spawn = "ghostty";
-          hotkey-overlay.title = "Open a Terminal: ghostty";
-        };
-        "Mod+D" = {
-          action.spawn = [ "vicinae" "toggle"];
-          hotkey-overlay.title = "Run an Application: vicinae";
-        };
-        "Super+Alt+L" = {
-          action.spawn = [ "noctalia-shell" "ipc" "call" "lockScreen" "lock" ];
-          hotkey-overlay.title = "Lock the Screen: noctalia";
-        };
-        
-        "XF86AudioRaiseVolume" = {
-          action.spawn = [ "noctalia-shell" "ipc" "call" "volume" "increase" ];
-        };
-        "XF86AudioLowerVolume" = {
-          action.spawn = [ "noctalia-shell" "ipc" "call" "volume" "decrease" ];
-        };
-        "XF86AudioMute" = {
-          action.spawn = [ "noctalia-shell" "ipc" "call" "volume" "muteOutput" ];
-        };
-        "XF86AudioMicMute" = {
-          action.spawn = [ "noctalia-shell" "ipc" "call" "volume" "muteInput" ];
-        };
-        
-        "XF86MonBrightnessUp" = {
-          action.spawn = [ "noctalia-shell" "ipc" "call" "brightness" "increase" ];
-        };
-        "XF86MonBrightnessDown" = {
-          action.spawn = [ "noctalia-shell" "ipc" "call" "brightness" "decrease" ];
-        };
-      };
-    };
   };
 }
\ No newline at end of file
diff --git a/modules/home/niri.nix b/modules/home/niri.nix
new file mode 100644
index 0000000..7e0ab1a
--- /dev/null
+++ b/modules/home/niri.nix
@@ -0,0 +1,64 @@
+{ inputs, ... }:
+{
+  imports = [ inputs.niri-flake.homeModules.niri ];
+  programs.niri.package = pkgs.niri;
+
+  programs.niri.settings = {
+    input.touchpad = { 
+      natural-scroll = true;
+      scroll-method = "two-finger";
+      click-method = "clickfinger";
+    };
+    
+    # Doracura color
+    layout = {
+      focus-ring = {
+        active.color = "#bd93f9" ;
+        inactive.color = "#6272a4";
+      };
+      border = {
+        active.color = "#ffc87f" ;
+        inactive.color = "#505050";
+        urgent.color = "#9b0000";
+      };
+      shadow = {
+        color = "#0007";
+      };
+    };
+
+    binds = {
+      "Mod+T" = {
+        action.spawn = "ghostty";
+        hotkey-overlay.title = "Open a Terminal: ghostty";
+      };
+      "Mod+D" = {
+        action.spawn = [ "vicinae" "toggle"];
+        hotkey-overlay.title = "Run an Application: vicinae";
+      };
+      "Super+Alt+L" = {
+        action.spawn = [ "noctalia-shell" "ipc" "call" "lockScreen" "lock" ];
+        hotkey-overlay.title = "Lock the Screen: noctalia";
+      };
+      
+      "XF86AudioRaiseVolume" = {
+        action.spawn = [ "noctalia-shell" "ipc" "call" "volume" "increase" ];
+      };
+      "XF86AudioLowerVolume" = {
+        action.spawn = [ "noctalia-shell" "ipc" "call" "volume" "decrease" ];
+      };
+      "XF86AudioMute" = {
+        action.spawn = [ "noctalia-shell" "ipc" "call" "volume" "muteOutput" ];
+      };
+      "XF86AudioMicMute" = {
+        action.spawn = [ "noctalia-shell" "ipc" "call" "volume" "muteInput" ];
+      };
+      
+      "XF86MonBrightnessUp" = {
+        action.spawn = [ "noctalia-shell" "ipc" "call" "brightness" "increase" ];
+      };
+      "XF86MonBrightnessDown" = {
+        action.spawn = [ "noctalia-shell" "ipc" "call" "brightness" "decrease" ];
+      };
+    };
+  };
+}
\ No newline at end of file