diff --git a/apps/kak/.gitignore b/apps/kak/.gitignore
new file mode 100644
index 0000000..5a02d10
--- /dev/null
+++ b/apps/kak/.gitignore
@@ -0,0 +1 @@
+plugins
diff --git a/apps/kak/kakrc b/apps/kak/kakrc
new file mode 100644
index 0000000..730c97a
--- /dev/null
+++ b/apps/kak/kakrc
@@ -0,0 +1,23 @@
+source "%val{config}/plugins/plug.kak/rc/plug.kak"
+
+plug "andreyorst/fzf.kak"
+
+map global normal <c-p> ': fzf-mode<ret>'
+
+map global normal D '<a-l>d' -docstring 'delete to end of line'
+map global normal Y '<a-l>y' -docstring 'yank to end of line'
+
+hook global InsertChar k %{ try %{
+  exec -draft hh <a-k>jk<ret> d
+  exec <esc>
+}}
+hook global InsertChar j %{ try %{
+  exec -draft hh <a-k>jj<ret> d
+  exec <esc>
+}}
+
+set global tabstop 2
+set global indentwidth 2
+
+set-option global fzf_file_command 'rg'
+
diff --git a/apps/kak/setup-plugins.sh b/apps/kak/setup-plugins.sh
new file mode 100755
index 0000000..92c5dd3
--- /dev/null
+++ b/apps/kak/setup-plugins.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+git clone https://github.com/andreyorst/plug.kak.git ~/.config/kak/plugins/plug.kak
diff --git a/setup.bash b/setup.bash
index 5f40d0b..67f3925 100755
--- a/setup.bash
+++ b/setup.bash
@@ -74,6 +74,9 @@ links=(
 	# libinput configuration
 	"apps/de/libinput/gestures.conf"    "$XDG_CONFIG_HOME/libinput-gestures.conf"
 
+	# kakoune editor configuration
+	"apps/kak/"                         "$XDG_CONFIG_HOME/kak"
+
   # gpg config
   "apps/gpg/agent.conf"               "$HOME/.gnupg/gpg-agent.conf"