Merge branch 'master' into arch-laptop
This commit is contained in:
@@ -111,6 +111,10 @@ 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'
|
||||
#
|
||||
@@ -143,6 +147,10 @@ add-highlighter global/ wrap -word -indent
|
||||
# enable-autofmt
|
||||
#
|
||||
#
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
#
|
||||
>>>>>>> master
|
||||
## Indentation ##
|
||||
set global tabstop 4
|
||||
set global indentwidth 4
|
||||
@@ -515,4 +523,10 @@ map -docstring 'next spell check' global spell n ':spell-next<ret>'
|
||||
map -docstring 'spell check replacements' global spell r ':spell-replace<ret>'
|
||||
|
||||
map -docstring 'quit kakoune' global user q ':q!<ret>'
|
||||
colorscheme carbonfox
|
||||
try %{
|
||||
colorscheme %sh{
|
||||
ruby -e "time = Time.new; if time.hour < 20 and time.hour > 6 then puts 'dawnfox' else puts 'carbonfox' end"
|
||||
}
|
||||
} catch %{
|
||||
colorscheme carbonfox
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user