diff --git a/flake.nix b/flake.nix
index 292c4e0..18d488c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,7 @@
 
     packages = eachSystem (
       system: {
-        inherit (import ./packages pkgsFor.${system}) helix fish;
+        inherit (import ./packages pkgsFor.${system}) fish helix kakoune;
       }
     );
 
diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix
index 059bcd6..19dbd40 100644
--- a/hosts/hermit/configuration.nix
+++ b/hosts/hermit/configuration.nix
@@ -59,7 +59,7 @@
       sound.enable = true;
     };
     usrEnv = {
-      desktops.hyprland.enable = true;
+      desktops.hyprland.enable = false;
 
       programs = {
         launchers = {
diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix
index e20b0d4..3fb34ff 100644
--- a/hosts/hermit/programs.nix
+++ b/hosts/hermit/programs.nix
@@ -90,6 +90,9 @@
       zapzap
       zip
       zoxide
+      kakoune
+      kakoune-lsp
+      television
       ;
     inherit (self.packages.${pkgs.stdenv.system}) helix;
   };
diff --git a/modules/wms/wayland/niri/module.nix b/modules/wms/wayland/niri/module.nix
new file mode 100644
index 0000000..fd08d72
--- /dev/null
+++ b/modules/wms/wayland/niri/module.nix
@@ -0,0 +1,31 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.programs.niri;
+  inherit (pkgs) xdg-desktop-portal-gtk xdg-desktop-portal-gnome;
+in {
+  programs.niri = {
+    enable = true;
+  };
+  programs.xwayland.enable = lib.mkForce false;
+  services.gnome.gnome-keyring.enable = lib.mkForce false;
+  environment.systemPackages = builtins.attrValues {
+    inherit (pkgs) wmenu swaylock;
+  };
+
+  xdg.portal = {
+    enable = lib.mkDefault true;
+
+    configPackages = [cfg.package];
+
+    # Recommended by upstream, required for screencast support
+    # https://github.com/YaLTeR/niri/wiki/Important-Software#portals
+    extraPortals = [
+      xdg-desktop-portal-gnome
+      xdg-desktop-portal-gtk
+    ];
+  };
+}
diff --git a/modules/wms/wayland/sway/module.nix b/modules/wms/wayland/sway/module.nix
index ea2b0e0..1a85c49 100644
--- a/modules/wms/wayland/sway/module.nix
+++ b/modules/wms/wayland/sway/module.nix
@@ -5,12 +5,4 @@
   ...
 }: let
 in {
-  programs.sway = {
-    enable = true;
-    xwayland.enable = true;
-  };
-
-  environment.systemPackages = builtins.attrValues {
-    inherit (pkgs) i3status;
-  };
 }
diff --git a/packages/default.nix b/packages/default.nix
index 804b9e7..bd69889 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,6 +1,6 @@
 pkgs: let
   helix = pkgs.callPackage ./helix.nix {};
-  kakoune = null;
+  kakoune = pkgs.callPackage ./kakoune.nix {};
   fish = pkgs.callPackage ./shell {};
 in {
   inherit helix kakoune fish;
diff --git a/packages/kakoune.nix b/packages/kakoune.nix
index 2664bf2..aa51912 100644
--- a/packages/kakoune.nix
+++ b/packages/kakoune.nix
@@ -11,8 +11,8 @@
     src = fetchFromGitHub {
       owner = "mawww";
       repo = "kakoune";
-      rev = "be82047dbf5f74f123e925b96e0e13962a4e0c09";
-      hash = "sha256-akSmIe0SUe9re8a90ssrykowCzThZnzqVow9erT+0U4=";
+      rev = "da5e5bc635fa6a3def21d3d59906b9ee0f1d1831";
+      hash = "sha256-+xqJrJr6nnmEpQaizQ3JMDEISCD8IMB84NJZiXJ74kY=";
     };
 
     makeFlags = ["debug=no" "PREFIX=${placeholder "out"}"];
@@ -32,7 +32,7 @@
     '';
   };
   plugins = builtins.attrValues {
-    inherit (kakounePlugins) fzf-kak kakoune-catppuccin;
+    inherit (kakounePlugins);
   };
 
   kakoune-wrapped = symlinkJoin {