diff --git a/flake.lock b/flake.lock
index 8091b18..304b732 100644
--- a/flake.lock
+++ b/flake.lock
@@ -511,6 +511,64 @@
         "url": "https://git.lelgenio.com/lelgenio/made-you-look"
       }
     },
+    "niri-flake": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": "niri-unstable",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable",
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1772572827,
+        "narHash": "sha256-d91kXM4t1G0KQ/MB0LTP514IslsDu6ZBt4HQE7hVvzs=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "7592181859ad2ab12913bbede47b45481b2b2938",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756556321,
+        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.08",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1772207631,
+        "narHash": "sha256-Jkkg+KqshFO3CbTszVVpkKN2AOObYz+wMsM3ONo1z5g=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "e708f546153f74acf33eb183b3b2992587a701e5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -571,6 +629,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1772465433,
+        "narHash": "sha256-ywy9troNEfpgh0Ee+zaV1UTgU8kYBVKtvPSxh6clYGU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c581273b8d5bdf1c6ce7e0a54da9841e6a763913",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1771369470,
@@ -739,6 +813,7 @@
         "home-manager": "home-manager",
         "lsfg-vk-flake": "lsfg-vk-flake",
         "made-you-look": "made-you-look",
+        "niri-flake": "niri-flake",
         "nix-index-database": "nix-index-database",
         "nixos-mailserver": "nixos-mailserver",
         "nixpkgs": "nixpkgs_5",
@@ -1018,6 +1093,39 @@
         "type": "github"
       }
     },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1755491097,
+        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.7",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1772429643,
+        "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
     "youre-wrong": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index beb7cdb..e914d82 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,6 +75,11 @@
       url = "git+https://git.lelgenio.com/lelgenio/hello-fonts";
       flake = false;
     };
+
+    niri-flake = {
+      url = "github:sodiboo/niri-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
   outputs =
     inputs:
diff --git a/system/configuration.nix b/system/configuration.nix
index 69badf0..1c55b88 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -12,7 +12,9 @@
     inputs.sops-nix.nixosModules.default
     inputs.home-manager.nixosModules.home-manager
     inputs.disko.nixosModules.disko
+    inputs.niri-flake.nixosModules.niri
 
+    ./niri.nix
     ./android.nix
     ./gaming.nix
     ./media-packages.nix
@@ -40,6 +42,7 @@
     android.enable = true;
     media-packages.enable = true;
     containers.enable = true;
+    niri.enable = true;
   };
 
   zramSwap.enable = true;
diff --git a/system/niri.nix b/system/niri.nix
new file mode 100644
index 0000000..1aef116
--- /dev/null
+++ b/system/niri.nix
@@ -0,0 +1,15 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  options.my.niri.enable = lib.mkEnableOption { };
+
+  config = lib.mkIf config.my.niri.enable {
+    programs.niri.enable = true;
+    niri-flake.cache.enable = true;
+    environment.systemPackages = with pkgs; [ fuzzel ];
+  };
+}
diff --git a/user/dummy.nix b/user/dummy.nix
index 7a0aac4..ce4ab15 100644
--- a/user/dummy.nix
+++ b/user/dummy.nix
@@ -7,5 +7,6 @@
     containers.enable = lib.mkEnableOption { };
     gnome.enable = lib.mkEnableOption { };
     kde.enable = lib.mkEnableOption { };
+    niri.enable = lib.mkEnableOption { };
   };
 }