diff --git a/.config/kak/autoload/lsp.kak b/.config/kak/autoload/lsp.kak
index 72fe94eb..d85f60c4 100644
--- a/.config/kak/autoload/lsp.kak
+++ b/.config/kak/autoload/lsp.kak
@@ -14,13 +14,18 @@ map global object t '<a-semicolon>lsp-object Class Interface Struct<ret>' -docst
 map global object d '<a-semicolon>lsp-diagnostic-object --include-warnings<ret>' -docstring 'LSP errors and warnings'
 map global object D '<a-semicolon>lsp-diagnostic-object<ret>' -docstring 'LSP errors'
 
-# set-option global lsp_auto_highlight_references false
-set-option global lsp_auto_show_code_actions true
-set-option global lsp_code_action_indicator ''
+# override the code actions icon in the modeline
+define-command -hidden -override lsp-show-code-actions -params 1.. %{
+    set-option buffer lsp_modeline_code_actions ""
+}
+define-command -hidden -override lsp-hide-code-actions %{
+    set-option buffer lsp_modeline_code_actions ""
+}
 # Server Config
 set-option global lsp_debug false
 lsp-inlay-hints-enable global
 # TODO: set up toggle binding for this
+# or even better, show them on hover...?
 # lsp-inlay-diagnostics-enable global
 
 remove-hooks global lsp-filetype-python
@@ -37,7 +42,7 @@ hook -group lsp-filetype-python global BufSetOption filetype=python %{
 	}
 }
 
-# remove-hooks global lsp-filetype-fish
+# use our custom fish-lsp wrapper because it sets env vars
 hook -group lsp-filetype-fish global BufSetOption filetype=fish %{
     set-option buffer lsp_servers %{
         [fish-lsp]
diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index 52dce01f..668aee4b 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -42,8 +42,10 @@ hook global WinCreate .* %{
 
 map -docstring "quit" global user q ": q<ret>"
 map -docstring "quit" global normal <c-q> ": q<ret>"
-map -docstring "quit" global user Q ": q!<ret>"
-map -docstring "quit" global normal <c-Q> ": q!<ret>"
+map -docstring "force quit" global user Q ": q!<ret>"
+map -docstring "force quit" global normal <c-Q> ": q!<ret>"
+map -docstring "kill session" global normal <a-q> ':kill<ret>'
+map -docstring "force kill session" global normal <a-q> ':kill!<ret>'
 map -docstring "save" global normal <c-v> ": write<ret>"
 map -docstring "save" global normal <a-v> ": write!<ret>"
 # map -docstring "save" global normal <a-v> ": write-all<ret>"
@@ -122,3 +124,4 @@ map -docstring %{
     pick line in buffer
 } global peneira '/' ': peneira-lines<ret>'
 
+map global normal <backspace> '"_'