merge master

config/.config/kak/kakrc

@@ -111,10 +111,6 @@ add-highlighter global/ wrap -word -indent
 #             format
 #         }
 #     }
-<<<<<<< HEAD
-=======
-
->>>>>>> master
 #     hook global -group autofmt BufSetOption filetype=(javascript) %{
 #         set-option buffer formatcmd 'prettier --tab-width 4 --parser typescript'
 #
@@ -147,10 +143,7 @@ add-highlighter global/ wrap -word -indent
 # enable-autofmt
 #
 #
-<<<<<<< HEAD
-=======
-#
->>>>>>> master
+
 ## Indentation ##
 set global tabstop 4
 set global indentwidth 4
@@ -459,7 +452,7 @@ define-command -docstring 'paste from clipboard' xpaste %{
 
 declare-user-mode config
 map -docstring 'enter config mode' global user e ':enter-user-mode config<ret>'
-map -docstring 'edit kakoune config' global config k ':cd ~/.config/kak/<ret>:e ./kakrc<ret>'
+map -docstring 'edit kakoune config' global config k ':e ~/.config/kak/kakrc<ret>'
 map -docstring 'edit tmux config' global config t ':e ~/.tmux.conf<ret>'
 map -docstring 'edit bash config' global config b ':e ~/.bashrc<ret>'
 map -docstring 'edit scripts folder' global config s ':cd ~/.scripts<ret>:fzf-edit<ret>'