From 29c06b46e45e816c437f05469e3d793c67679cdb Mon Sep 17 00:00:00 2001
From: Jan-Jaap Korpershoek <jjkorpershoek96@gmail.com>
Date: Thu, 24 May 2018 21:47:45 +0200
Subject: [PATCH 2/3] Add syntax highlighting for i3/sway config file

---
 rc/extra/i3.kak | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 rc/extra/i3.kak

diff --git a/rc/extra/i3.kak b/rc/extra/i3.kak
new file mode 100644
index 00000000..f82a55fc
--- /dev/null
+++ b/rc/extra/i3.kak
@@ -0,0 +1,41 @@
+add-highlighter shared/ regions -default code i3 \
+    string %{"} %{"} "" \
+    string %{'} %{'} "" \
+    exec %{(?<=exec)} "$" "" \
+    comment "# " "$" ""
+
+add-highlighter shared/i3/string fill string
+add-highlighter shared/i3/comment fill comment
+add-highlighter shared/i3/exec fill string
+
+# Symbols
+add-highlighter shared/i3/code regex "[+|→]" 0:operator
+add-highlighter shared/i3/code regex "\$\w+" 0:variable
+
+# keys
+add-highlighter shared/i3/code regex "\b(Shift|Control|Ctrl|Mod1|Mod2|Mod3|Mod4|Mod5|Mode_switch|Return|Escape|Print)\b" 0:value
+
+# keywords
+add-highlighter shared/i3/code regex "\b(bind|bindcode|bindsym|assign|new_window|popup_during_fullscreen|font|floating_modifier|default_orientation|workspace_layout|for_window|focus_follows_mouse|bar|position|colors|output|tray_output|workspace_buttons|workspace_auto_back_and_forth|binding_mode_indicator|debuglog|floating_minimum_size|floating_maximum_size|force_focus_wrapping|force_xinerama|force_display_urgency_hint|hidden_state|modifier|new_float|shmlog|socket_path|verbose|mouse_warping|strip_workspace_numbers|focus_on_window_activation|no_focus|set|mode|set_from_resource)\b" 0:keyword
+# function keywords
+add-highlighter shared/i3/code regex "\b(exit|reload|restart|kill|fullscreen|global|layout|border|focus|move|open|split|append_layout|mark|unmark|resize|grow|shrink|show|nop|rename|title_format|sticky)\b" 0:function
+add-highlighter shared/i3/code regex "\b(exec|exec_always|i3bar_command|status_command)\b" 0:function
+# " these are not keywords but we add them for consistency
+add-highlighter shared/i3/code regex "\b(no|false|inactive)\b" 0:value
+
+# values
+add-highlighter shared/i3/code regex "\b(1pixel|default|stacked|tabbed|normal|none|tiling|stacking|floating|enable|disable|up|down|horizontal|vertical|auto|up|down|left|right|parent|child|px|or|ppt|leave_fullscreen|toggle|mode_toggle|scratchpad|width|height|top|bottom|client|hide|primary|yes|all|active|window|container|to|absolute|center|on|off|ms|smart|ignore|pixel|splith|splitv|output|true)\b" 0:value
+add-highlighter shared/i3/code regex "\b(next|prev|next_on_output|prev_on_output|back_and_forth|current|number|none|vertical|horizontal|both|dock|hide|invisible|gaps|smart_gaps|smart_borders|inner|outer|current|all|plus|minus|no_gaps)\b" 0:value
+
+# double-dash arguments
+add-highlighter shared/i3/code regex "--(release|border|whole-window|toggle|no-startup-id)" 0:attribute
+
+# color
+add-highlighter shared/i3/string regex "#[0-9a-fA-F]{6}" 0:value
+
+# attributes
+add-highlighter shared/i3/code regex "client\.(background|statusline|background|separator|statusline)" 1:attribute
+add-highlighter shared/i3/code regex "client\.(focused_inactive|focused|unfocused|urgent|inactive_workspace|urgent_workspace|focused_workspace|active_workspace|placeholder)" 1:attribute
+
+hook -group i3-highlight global WinSetOption filetype=i3 %{ add-highlighter window ref i3 }
+hook -group i3-highlight global WinSetOption filetype=(?!i3).* %{ remove-highlighter window/i3 }

From d1feae6716d266bbd0075afb66fd6a87d2f57c99 Mon Sep 17 00:00:00 2001
From: Jan-Jaap Korpershoek <jjkorpershoek96@gmail.com>
Date: Mon, 28 May 2018 11:04:34 +0200
Subject: [PATCH 3/3] Add check for i3 filetype

---
 rc/extra/i3.kak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rc/extra/i3.kak b/rc/extra/i3.kak
index f82a55fc..75cb2aaa 100644
--- a/rc/extra/i3.kak
+++ b/rc/extra/i3.kak
@@ -1,3 +1,7 @@
+hook global BufCreate .*(sway|i3)/config %{
+    set buffer filetype i3
+}
+
 add-highlighter shared/ regions -default code i3 \
     string %{"} %{"} "" \
     string %{'} %{'} "" \