Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@ runtime/syntax/just.vim @pbnj
runtime/syntax/jq.vim @vito-c
runtime/syntax/karel.vim @kirillmorozov
runtime/syntax/kconfig.vim @chrisbra
runtime/syntax/kitty.vim @OXY2DEV
runtime/syntax/kivy.vim @prophittcorey
runtime/syntax/kotlin.vim @udalov
runtime/syntax/kdl.vim @imsnif @jiangyinzuo
Expand Down
3 changes: 3 additions & 0 deletions runtime/filetype.vim
Original file line number Diff line number Diff line change
Expand Up @@ -1340,6 +1340,9 @@ au BufNewFile,BufRead *.jl setf julia
" Just
au BufNewFile,BufRead \c{,*.}justfile,\c*.just setf just

" Kitty
au BufNewFile,BufRead kitty.conf,*/kitty/*.conf setf kitty

" KAREL
au BufNewFile,BufRead *.kl setf karel
if has("fname_case")
Expand Down
118 changes: 118 additions & 0 deletions runtime/syntax/kitty.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
" Vim syntax file
" Language: Kitty configuration files
" Maintainer: MD. Mouinul Hossain Shawon <mdmouinulhossainshawon [at] gmail.com>
" Last Change: Sun Sep 14 13:56:41 +06 2025

if exists("b:current_syntax")
finish
endif

syn sync fromstart

" Option """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Format: `<option_name> ...`<

syn match kittyString /\S\+/ contains=Alpha contained
syn match kittyNumber /[+\-*\/]\{0,1}[0-9.]\+/ contained
syn match kittyAlpha /@[0-9.]\+/ contained
syn match kittyColor /#[0-9a-fA-F]\{3,6}/ nextgroup=Alpha contained
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be nextgroup=kittyAlpha?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, because you can use colour names(e.g. red@0.3).

And I didn't want to make a huge regex pattern for it(or use a very long syn keyword). I was also unsure if it would have performance issues since there's quite a few colour names.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Understood, but I think there's a typo: contains=Alpha versus contains=kittyAlpha?

Copy link
Contributor Author

@OXY2DEV OXY2DEV Sep 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's a typo. My bad. It should be kittyAlpha.

But, how do I push the changes? My new commit isn't showing up here anymore.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make a new PR with your changes please

syn keyword kittyBoolean contained yes no
syn keyword kittyConstant contained none auto monospace bold italic ratio always never

syn match kittyFlag /[+-]\{1,2}[a-zA-Z0-9-_]\+/ contained
syn match kittyParameter /-\{1,2}[a-zA-Z0-9-]\+=\S\+/ contained

syn cluster kittyPrimitive contains=kittyNumber,kittyBoolean,kittyConstant,kittyColor,kittyString,kittyFlag,kittyParameter,kittyAlpha

syn region kittyOption start="^\w" skip="[\n\r][ \t]*\\" end="[\r\n]" contains=kittyOptionName
syn match kittyOptionName /\w\+/ nextgroup=kittyOptionValue skipwhite contained
syn region kittyOptionValue start="\S" skip="[\r\n][ \t]*\\" end="\ze[\r\n]" contains=@kittyPrimitive contained

" Keyboard shortcut """""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Format: `map <keys> <action>?`

syn match kittyKey /[^ \t\r\n+>]\+/ contained
syn match kittyCtrl /\<\(ctrl\|control\)\>\|\^/ contained
syn match kittyAlt /\<\(alt\|opt\|option\)\>\|⌥/ contained
syn match kittyShift /\<\(shift\)\>\|⇧/ contained
syn match kittySuper /\<\(cmd\|super\|command\)\>\|⌘/ contained

syn match kittyAnd /+/ contained
syn match kittyWith />/ contained

syn region kittyMap start="^\s*map" skip="[\r\n][ \t]*\\" end="[\r\n]" contains=kittyMapName,kittyMapValue

syn keyword kittyMapName nextgroup=kittyMapValue skipwhite contained map
syn region kittyMapValue start="\S" skip="[\r\n][ \t]*\\" end="\ze[\r\n]" contains=kittyMapSeq,kittyMapAction contained

syn region kittyMapAction start="\S" skip="[\r\n][ \t]*\\" end="\ze[\r\n]" contains=@kittyPrimitive contained
syn region kittyMapSeq start="\S" end="\ze\s\|^\ze[ \t]*\\" nextgroup=kittyMapAction,kittyMouseMapType skipwhite contains=kittyCtrl,kittyAlt,kittyShift,kittySuper,kittyAnd,kittyWith,kittyKey contained

" Mouse shortcut """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Format: `mouse_map <keys> <type> <grabbed> <action>?`

syn region kittyMouseMap start="^\s*mouse_map" skip="[\r\n][ \t]*\\" end="[\r\n]" contains=kittyMouseMapName,kittyMouseMapValue

syn keyword kittyMouseMapName nextgroup=kittyMouseMapValue contained mouse_map
syn region kittyMouseMapValue start="\S" skip="[\r\n][ \t]*\\" end="\ze[\r\n]" contains=kittyMapSeq,kittyMouseMapType,kittyMouseMapGrabbed contained

syn region kittyMouseMapAction start="\S" skip="[\r\n][ \t]*\\" end="\ze[\r\n]" contains=@kittyPrimitive contained

syn keyword kittyMouseMapType nextgroup=kittyMouseMapGrabbed skipwhite contained press release doublepress triplepress click doubleclick
syn match kittyMouseMapGrabbed /\(grabbed\|ungrabbed\)\%(,\(grabbed\|ungrabbed\)\)\?/ nextgroup=kittyMouseMapAction skipwhite contained

" Kitty modifier """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Format: `kitty_mod <keys>`

syn region kittyMod start="^\s*kitty_mod" end="[\r\n]" contains=kittyModName,kittyMapSeq

syn keyword kittyModName nextgroup=kittyMapSeq contained kitty_mod

" Comment """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Format: `# <content>``

syn match kittyComment /^#.*$/

" Line continuation """""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Allows continuing lines by adding `\` at the start of a line.
" May have leading spaces & tabs.

syn match kittyLineContinue /^[ \t]*\\[ \t]*/ containedin=kittyOptionValue,kittyMap,kittyMapAction,kittyMouseMap,kittyMouseMapValue contained

" Highlight groups """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""

hi link kittyString String
hi link kittyNumber Number
hi link kittyAlpha Type
hi link kittyColor Constant
hi link kittyBoolean Boolean
hi link kittyConstant Constant

hi link kittyFlag Constant
hi link kittyParameter Specual

hi link kittyOptionName Keyword
hi link kittyModName Keyword

hi link kittyKey Special
hi link kittyCtrl Constant
hi link kittyAlt Constant
hi link kittyShift Constant
hi link kittySuper Constant

hi link kittyAnd Operator
hi link kittyWith Operator

hi link kittyMapName Function

hi link kittyMouseMapName Function
hi link kittyMouseMapType Type
hi link kittyMouseMapGrabbed Constant

hi link kittyComment Comment
hi link kittyLineContinue Comment

""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

let b:current_syntax = "kitty"

1 change: 1 addition & 0 deletions src/testdir/test_filetype.vim
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ def s:GetFilenameChecks(): dict<list<string>>
karel: ['file.kl', 'file.KL'],
kconfig: ['Kconfig', 'Kconfig.debug', 'Kconfig.file', 'Config.in', 'Config.in.host'],
kdl: ['file.kdl'],
kitty: ['kitty.conf', '~/.config/kitty/colorscheme.conf'],
kivy: ['file.kv'],
kix: ['file.kix'],
kotlin: ['file.kt', 'file.ktm', 'file.kts'],
Expand Down