diff --git a/modules/features/niri.nix b/modules/features/niri.nix
new file mode 100644
index 0000000..20b2741
--- /dev/null
+++ b/modules/features/niri.nix
@@ -0,0 +1,27 @@
+{ self, inputs, ... }: {
+
+  flake.nixosModules.niri = { pkgs, lib, ... }: {
+    programs.niri = {
+      enable = true;
+      package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri;
+    }
+  };
+
+  perSystem = { pkgs, lib, ... }: {
+    packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap {
+      inherit pkgs;
+      settings = {
+        input.keyboard = {
+	  xkb.layout = "us,ua";
+	};
+
+	layout.gaps = 5;
+
+        binds = {
+	  "Mod+Return".spawn-sh = lib.getExe pkgs.alacritty;
+	  "Mod+Q".close-window = null;
+	};
+      };
+    };
+  };
+}
diff --git a/modules/hosts/fio/configuration.nix b/modules/hosts/fio/configuration.nix
index cc3637c..1e0b747 100644
--- a/modules/hosts/fio/configuration.nix
+++ b/modules/hosts/fio/configuration.nix
@@ -4,6 +4,7 @@
     
   imports = [
     self.nixosModules.fioHardware
+    self.nixosModules.niri
   ];
 
   # Bootloader.