diff --git a/kakoune/.config/kak/kakrc b/kakoune/.config/kak/kakrc
index aca0164..05c97b3 100644
--- a/kakoune/.config/kak/kakrc
+++ b/kakoune/.config/kak/kakrc
@@ -1,2 +1,23 @@
-add-highlighter global/ number-lines
+source "%val{config}/plugins/plug.kak/rc/plug.kak"
+
+plug "lePerdu/kakboard" %{
+    hook global WinCreate .* %{ kakboard-enable }
+}
+
+hook global WinCreate ^[^*]+$ %{
+    try editorconfig-load
+}
+
+hook global WinSetOption filetype=(markdown|yaml|yml) %{
+    set window indentwidth 2
+}
+
+hook global WinSetOption filetype=go %{
+    noexpandtab
+    set window indentwidth 0
+}
+
+add-highlighter global/number-lines number-lines
+add-highlighter global/show-whitespaces show-whitespaces
+
 colorscheme solarized-light
diff --git a/kakoune/.config/kak/plugins/kakboard b/kakoune/.config/kak/plugins/kakboard
new file mode 160000
index 0000000..2f13f5c
--- /dev/null
+++ b/kakoune/.config/kak/plugins/kakboard
@@ -0,0 +1 @@
+Subproject commit 2f13f5cd99591b76ad5cba230815b80138825120
diff --git a/kakoune/.config/kak/plugins/plug.kak b/kakoune/.config/kak/plugins/plug.kak
new file mode 160000
index 0000000..cf02b00
--- /dev/null
+++ b/kakoune/.config/kak/plugins/plug.kak
@@ -0,0 +1 @@
+Subproject commit cf02b00f3764cbd03ce9ab6eec2f4eed035c0737