diff --git a/README.md b/README.md index 481b01e1e..ef3ad8717 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ Optionally download one of the [releases](https://github.com/sheerun/vim-polyglo - [scala](https://github.com/derekwyatt/vim-scala) (syntax, indent, ftplugin, ftdetect) - [slim](https://github.com/slim-template/vim-slim) (syntax, indent, ftdetect) - [stylus](https://github.com/wavded/vim-stylus) (syntax, indent, ftplugin, ftdetect) +- [systemd](https://github.com/kurayama/systemd-vim-syntax) (syntax, ftdetect) - [textile](https://github.com/timcharper/textile.vim) (syntax, ftplugin, ftdetect) - [tmux](https://github.com/acustodioo/vim-tmux) (syntax, ftdetect) - [tomdoc](https://github.com/duwanis/tomdoc.vim) (syntax) diff --git a/build b/build index ae2b39816..1ce37ba04 100755 --- a/build +++ b/build @@ -110,6 +110,7 @@ PACKS=" scala:derekwyatt/vim-scala slim:slim-template/vim-slim stylus:wavded/vim-stylus + systemd:kurayama/systemd-vim-syntax textile:timcharper/textile.vim tmux:acustodioo/vim-tmux tomdoc:duwanis/tomdoc.vim diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index 46961a5a4..3024bb833 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -128,6 +128,14 @@ au BufRead,BufNewFile * call s:DetectScala() autocmd BufNewFile,BufRead *.slim set filetype=slim autocmd BufNewFile,BufReadPost *.styl set filetype=stylus autocmd BufNewFile,BufReadPost *.stylus set filetype=stylus +au BufNewFile,BufRead *.automount set filetype=systemd +au BufNewFile,BufRead *.mount set filetype=systemd +au BufNewFile,BufRead *.path set filetype=systemd +au BufNewFile,BufRead *.service set filetype=systemd +au BufNewFile,BufRead *.socket set filetype=systemd +au BufNewFile,BufRead *.swap set filetype=systemd +au BufNewFile,BufRead *.target set filetype=systemd +au BufNewFile,BufRead *.timer set filetype=systemd au BufRead,BufNewFile *.textile set filetype=textile autocmd BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux autocmd BufNewFile,BufRead *.toml set filetype=toml diff --git a/syntax/systemd.vim b/syntax/systemd.vim new file mode 100644 index 000000000..90f2e05f2 --- /dev/null +++ b/syntax/systemd.vim @@ -0,0 +1,273 @@ +" Filename: systemd.vim +" Purpose: Vim syntax file +" Language: systemd unit files +" Maintainer: Will Woods +" Last Change: Sep 15, 2011 + +if exists("b:current_syntax") && !exists ("g:syntax_debug") + finish +endif + +syn case match +syntax sync fromstart +setlocal iskeyword+=- + +" special sequences, common data types, comments, includes {{{1 +" hilight errors with this +syn match sdErr contained /\s*\S\+/ nextgroup=sdErr + +" environment args and format strings +syn match sdEnvArg contained /\$\i\+\|\${\i\+}/ +syn match sdFormatStr contained /%[inpINPfcrRt]/ containedin=ALLBUT,sdComment,sdErr + +" common data types +syn match sdUInt contained nextgroup=sdErr /\d\+/ +syn match sdInt contained nextgroup=sdErr /-\=\d\+/ +syn match sdOctal contained nextgroup=sdErr /0\o\{3,4}/ +syn match sdDuration contained nextgroup=sdErr /\d\+/ +syn match sdDuration contained nextgroup=sdErr /\%(\d\+\%(s\|min\|h\|d\|w\|ms\|us\)\s*\)\+/ +syn match sdDatasize contained nextgroup=sdErr /\d\+[KMGT]/ +syn match sdFilename contained nextgroup=sdErr /\/\S*/ +syn keyword sdBool contained nextgroup=sdErr 1 yes true on 0 no false off +syn match sdUnitName contained /\S\+\.\(automount\|mount\|swap\|socket\|service\|target\|path\|timer\|device\)\_s/ + +" .include +syn match sdInclude /^.include/ nextgroup=sdFilename + +" comments +syn match sdComment /^[;#].*/ contains=sdTodo containedin=ALL +syn keyword sdTodo contained TODO XXX FIXME NOTE + +" [Unit] {{{1 +" see systemd.unit(5) +syn region sdUnitBlock matchgroup=sdHeader start=/^\[Unit\]/ end=/^\[/me=e-2 contains=sdUnitKey +syn match sdUnitKey contained /^Description=/ +syn match sdUnitKey contained /^Documentation=/ nextgroup=sdDocURI +syn match sdUnitKey contained /^SourcePath=/ nextgroup=sdFilename,sdErr +syn match sdUnitKey contained /^\%(Requires\|RequiresOverridable\|Requisite\|RequisiteOverridable\|Wants\|BindsTo\|PartOf\|Conflicts\|Before\|After\|OnFailure\|Names|PropagatesReloadTo\|ReloadPropagatedFrom\)=/ nextgroup=sdUnitList +syn match sdUnitKey contained /^\%(OnFailureIsolate\|IgnoreOnIsolate\|IgnoreOnSnapshot\|StopWhenUnneeded\|RefuseManualStart\|RefuseManualStop\|AllowIsolate\|DefaultDependencies\)=/ nextgroup=sdBool,sdErr +syn match sdUnitKey contained /^JobTimeoutSec=/ nextgroup=sdDuration,sdErr +" ConditionXXX. Note that they all have an optional '|' after the '=' +syn match sdUnitKey contained /^Condition\(PathExists\|PathExistsGlob\|PathIsDirectory\|PathIsMountPoint\|PathIsReadWrite\|PathIsSymbolicLink\|DirectoryNotEmpty\|FileNotEmpty\|FileIsExecutable\)=|\=!\=/ contains=sdConditionFlag nextgroup=sdFilename,sdErr +syn match sdUnitKey contained /^ConditionVirtualization=|\=!\=/ contains=sdConditionFlag nextgroup=sdVirtType,sdErr +syn match sdUnitKey contained /^ConditionSecurity=|\=!\=/ contains=sdConditionFlag nextgroup=sdSecurityType,sdErr +syn match sdUnitKey contained /^ConditionCapability=|\=!\=/ contains=sdConditionFlag nextgroup=sdAnyCapName,sdErr +syn match sdUnitKey contained /^Condition\%(KernelCommandLine\|Host\)=|\=!\=/ contains=sdConditionFlag +syn match sdUnitKey contained /^Condition\%(ACPower\|Null\)=|\=/ contains=sdConditionFlag nextgroup=sdBool,sdErr +" extra bits +syn match sdUnitList contained /.*/ contains=sdUnitName,sdErr +syn match sdConditionFlag contained /[!|]/ +syn keyword sdVirtType contained nextgroup=sdErr vm container qemu kvm vmware microsoft oracle xen bochs chroot openvz lxc lxc-libvirt systemd-nspawn +syn keyword sdSecurityType contained nextgroup=sdErr selinux +syn match sdDocUri contained /\%(https\=:\/\/\|file:\|info:\|man:\)\S\+\s*/ nextgroup=sdDocUri,sdErr + +" [Install] {{{1 +" see systemd.unit(5) +syn region sdInstallBlock matchgroup=sdHeader start=/^\[Install\]/ end=/^\[/me=e-2 contains=sdInstallKey +syn match sdInstallKey contained /^\%(WantedBy\|Alias\|Also\)=/ nextgroup=sdUnitList + +" Execution options common to [Service|Socket|Mount|Swap] {{{1 +" see systemd.exec(5) +syn match sdExecKey contained /^Exec\%(Start\%(Pre\|Post\|\)\|Reload\|Stop\|StopPost\)=/ nextgroup=sdExecFlag,sdExecFile,sdErr +syn match sdExecKey contained /^\%(WorkingDirectory\|RootDirectory\|TTYPath\)=/ nextgroup=sdFilename,sdErr +" TODO: handle some of these better +" CPUAffinity is: list of uint +" BlockIOWeight is: uint\|filename uint +" BlockIO\%(Read\|Write\)Bandwidth is: filename datasize +syn match sdExecKey contained /^\%(User\|Group\|SupplementaryGroups\|CPUAffinity\|SyslogIdentifier\|PAMName\|TCPWrapName\|ControlGroup\|ControlGroupAttribute\|DeviceAllow\|DeviceDeny\|BlockIOWeight\|BlockIO\%(Read\|Write\)Bandwidth\|UtmpIdentifier\)=/ +syn match sdExecKey contained /^Limit\%(CPU\|FSIZE\|DATA\|STACK\|CORE\|RSS\|NOFILE\|AS\|NPROC\|MEMLOCK\|LOCKS\|SIGPENDING\|MSGQUEUE\|NICE\|RTPRIO\|RTTIME\)=/ nextgroup=sdRlimit +syn match sdExecKey contained /^\%(CPUSchedulingResetOnFork\|TTYReset\|TTYVHangup\|TTYVTDisallocate\|SyslogLevelPrefix\|ControlGroupModify\|PrivateTmp\|PrivateNetwork\)=/ nextgroup=sdBool,sdErr +syn match sdExecKey contained /^\%(Nice\|OOMScoreAdjust\)=/ nextgroup=sdInt,sdErr +syn match sdExecKey contained /^\%(CPUSchedulingPriority\|TimerSlackNSec\|CPUShares\)=/ nextgroup=sdUInt,sdErr +syn match sdExecKey contained /^\%(MemoryLimit\|MemorySoftLimit\)=/ nextgroup=sdDatasize,sdErr +syn match sdExecKey contained /^\%(ReadWrite\|ReadOnly\|Inaccessible\)Directories=/ nextgroup=sdFileList +syn match sdExecKey contained /^Device\%(Allow\|Deny\)=/ nextgroup=sdDevAllow,sdErr +syn match sdExecKey contained /^CapabilityBoundingSet=/ nextgroup=sdCapNameList +syn match sdExecKey contained /^Capabilities=/ nextgroup=sdCapability,sdErr +syn match sdExecKey contained /^UMask=/ nextgroup=sdOctal,sdErr +syn match sdExecKey contained /^StandardInput=/ nextgroup=sdStdin,sdErr +syn match sdExecKey contained /^Standard\%(Output\|Error\)=/ nextgroup=sdStdout,sdErr +syn match sdExecKey contained /^SecureBits=/ nextgroup=sdSecureBitList +syn match sdExecKey contained /^SyslogFacility=/ nextgroup=sdSyslogFacil,sdErr +syn match sdExecKey contained /^SyslogLevel=/ nextgroup=sdSyslogLevel,sdErr +syn match sdExecKey contained /^IOSchedulingClass=/ nextgroup=sdIOSchedClass,sdErr +syn match sdExecKey contained /^IOSchedulingPriority=/ nextgroup=sdIOSchedPrio,sdErr +syn match sdExecKey contained /^CPUSchedulingPolicy=/ nextgroup=sdCPUSchedPol,sdErr +syn match sdExecKey contained /^MountFlags=/ nextgroup=sdMountFlags,sdErr +syn match sdExecKey contained /^Environment=/ nextgroup=sdEnvDefs +syn match sdExecKey contained /^EnvironmentFile=-\=/ contains=sdEnvDashFlag nextgroup=sdFilename,sdErr + +syn match sdExecFlag contained /-\=@\=/ nextgroup=sdExecFile,sdErr +syn match sdExecFile contained /\/\S\+/ nextgroup=sdExecArgs +syn match sdExecArgs contained /.*/ contains=sdEnvArg +syn match sdEnvDefs contained /.*/ contains=sdEnvDef +syn match sdEnvDashFlag contained /-/ nextgroup=sdFilename,sdErr +syn match sdEnvDef contained /\i\+=/he=e-1 +syn match sdFileList contained /.*/ contains=sdFilename,sdErr +" CAPABILITIES WOOO {{{ +syn case ignore +syn match sdCapNameList contained /.*/ contains=sdAnyCapName,sdErr +syn match sdAnyCapName contained /CAP_[A-Z_]\+\s*/ contains=sdCapName +syn keyword sdCapName contained CAP_AUDIT_CONTROL CAP_AUDIT_WRITE CAP_CHOWN CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH +syn keyword sdCapName contained CAP_FOWNER CAP_FSETID CAP_IPC_LOCK CAP_IPC_OWNER CAP_KILL CAP_LEASE +syn keyword sdCapName contained CAP_LINUX_IMMUTABLE CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_MKNOD +syn keyword sdCapName contained CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW +syn keyword sdCapName contained CAP_SETGID CAP_SETFCAP CAP_SETPCAP CAP_SETUID +syn keyword sdCapName contained CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT +syn keyword sdCapName contained CAP_SYS_PTRACE CAP_SYS_RAWIO CAP_SYS_RESOURCE CAP_SYS_TIME CAP_SYS_TTY_CONFIG +syn case match +syn cluster sdCap contains=sdCapName,sdCapOps,sdCapFlags +syn match sdCapOps contained /[=+-]/ +syn match sdCapFlags contained /\<[eip]\+/ +syn match sdCapability contained /\%(\%([A-Za-z_]\+,\=\)*\|all\)\%(=[eip]*\|[+-][eip]\+\)\s*/ contains=@sdCap nextgroup=sdCapability,sdErr +"}}} +syn match sdDevAllow contained /\/\S\+\s\+/ nextgroup=sdDevAllowPerm +syn match sdDevAllowPerm contained /\S\+/ contains=sdDevAllowErr nextgroup=sdErr +syn match sdDevAllowErr contained /[^rwm]\+/ +syn keyword sdStdin contained nextgroup=sdErr null tty-force tty-fail socket tty +syn match sdStdout contained nextgroup=sdErr /\%(syslog\|kmsg\|journal\)\%(+console\)\=/ +syn keyword sdStdout contained nextgroup=sdErr inherit null tty socket +syn keyword sdSyslogFacil contained nextgroup=sdErr kern user mail daemon auth syslog lpr news uucp cron authpriv ftp +syn match sdSyslogFacil contained nextgroup=sdErr /\/ +syn keyword sdSyslogLevel contained nextgroup=sdErr emerg alert crit err warning notice info debug +syn keyword sdIOSchedClass contained nextgroup=sdErr 0 1 2 3 none realtime best-effort idle +syn keyword sdIOSchedPrio contained nextgroup=sdErr 0 1 2 3 4 5 6 7 +syn keyword sdCPUSchedPol contained nextgroup=sdErr other batch idle fifo rr +syn keyword sdMountFlags contained nextgroup=sdErr shared slave private +syn match sdRlimit contained nextgroup=sdErr /\<\%(\d\+\|infinity\)\>/ +syn keyword sdSecureBits contained nextgroup=sdErr keep-caps keep-caps-locked noroot noroot-locked no-setuid-fixup no-setuid-fixup-locked + +" These are also shared by [Service|Socket|Mount|Swap], although they're not +" listed in systemd.exec(5) +syn match sdExecKey contained /^TimeoutSec=/ nextgroup=sdDuration,sdErr +syn match sdExecKey contained /^KillSignal=/ nextgroup=sdSignal,sdOtherSignal,sdErr +syn match sdExecKey contained /^SendSIGKill=/ nextgroup=sdBool,sdErr +syn match sdExecKey contained /^KillMode=/ nextgroup=sdKillMode,sdErr +syn keyword sdSignal contained nextgroup=sdErr SIGHUP SIGINT SIGQUIT SIGKILL SIGTERM SIGUSR1 SIGUSR2 +syn match sdOtherSignal contained nextgroup=sdErr /\<\%(\d\+\|SIG[A-Z]\{2,6}\)\>/ +syn match sdKillMode contained nextgroup=sdErr /\%(control-group\|process\|none\)/ + +" [Service] {{{1 +syn region sdServiceBlock matchgroup=sdHeader start=/^\[Service\]/ end=/^\[/me=e-2 contains=sdServiceKey,sdExecKey +syn match sdServiceKey contained /^BusName=/ +syn match sdServiceKey contained /^\%(RemainAfterExit\|GuessMainPID\|PermissionsStartOnly\|RootDirectoryStartOnly\|NonBlocking\|ControlGroupModify\)=/ nextgroup=sdBool,sdErr +syn match sdServiceKey contained /^\%(SysVStartPriority\|FsckPassNo\)=/ nextgroup=sdUInt,sdErr +syn match sdServiceKey contained /^\%(Restart\|Timeout\)Sec=/ nextgroup=sdDuration,sdErr +syn match sdServiceKey contained /^Sockets=/ nextgroup=sdUnitList +syn match sdServiceKey contained /^PIDFile=/ nextgroup=sdFilename,sdErr +syn match sdServiceKey contained /^Type=/ nextgroup=sdServiceType,sdErr +syn match sdServiceKey contained /^Restart=/ nextgroup=sdRestartType,sdErr +syn match sdServiceKey contained /^NotifyAccess=/ nextgroup=sdNotifyType,sdErr +syn keyword sdServiceType contained nextgroup=sdErr simple forking dbus oneshot notify idle +syn keyword sdRestartType contained nextgroup=sdErr no on-success on-failure on-abort always +syn keyword sdNotifyType contained nextgroup=sdErr none main all + +" [Socket] {{{1 +syn region sdSocketBlock matchgroup=sdHeader start=/^\[Socket\]/ end=/^\[/me=e-2 contains=sdSocketKey,sdExecKey +syn match sdSocketKey contained /^Listen\%(Stream\|Datagram\|SequentialPacket\|FIFO\|Special\|Netlink\|MessageQueue\)=/ +syn match sdSocketKey contained /^Listen\%(FIFO\|Special\)=/ nextgroup=sdFilename,sdErr +syn match sdSocketKey contained /^\%(Socket\|Directory\)Mode=/ nextgroup=sdOctal,sdErr +syn match sdSocketKey contained /^\%(Backlog\|MaxConnections\|Priority\|ReceiveBuffer\|SendBuffer\|IPTTL\|Mark\|PipeSize\|MessageQueueMaxMessages\|MessageQueueMessageSize\)=/ nextgroup=sdUInt,sdErr +syn match sdSocketKey contained /^\%(Accept\|KeepAlive\|FreeBind\|Transparent\|Broadcast\)=/ nextgroup=sdBool,sdErr +syn match sdSocketKey contained /^BindToDevice=/ +syn match sdSocketKey contained /^Service=/ nextgroup=sdUnitList +syn match sdSocketKey contained /^BindIPv6Only=/ nextgroup=sdBindIPv6,sdErr +syn match sdSocketKey contained /^IPTOS=/ nextgroup=sdIPTOS,sdUInt,sdErr +syn match sdSocketKey contained /^TCPCongestion=/ nextgroup=sdTCPCongest +syn keyword sdBindIPv6 contained nextgroup=sdErr default both ipv6-only +syn keyword sdIPTOS contained nextgroup=sdErr low-delay throughput reliability low-cost +syn keyword sdTCPCongest contained nextgroup=sdErr westwood veno cubic lp + +" [Timer|Automount|Mount|Swap|Path] {{{1 +" [Timer] +syn region sdTimerBlock matchgroup=sdHeader start=/^\[Timer\]/ end=/^\[/me=e-2 contains=sdTimerKey +syn match sdTimerKey contained /^On\%(Active\|Boot\|Startup\|UnitActive\|UnitInactive\)Sec=/ nextgroup=sdDuration,sdErr +syn match sdTimerKey contained /^Unit=/ nextgroup=sdUnitList + +" [Automount] +syn region sdAutoMountBlock matchgroup=sdHeader start=/^\[Automount\]/ end=/^\[/me=e-2 contains=sdAutomountKey +syn match sdAutomountKey contained /^Where=/ nextgroup=sdFilename,sdErr +syn match sdAutomountKey contained /^DirectoryMode=/ nextgroup=sdOctal,sdErr + +" [Mount] +syn region sdMountBlock matchgroup=sdHeader start=/^\[Mount\]/ end=/^\[/me=e-2 contains=sdMountKey,sdAutomountKey,sdExecKey +syn match sdMountKey contained /^\%(What\|Type\|Options\)=/ + +" [Swap] +syn region sdSwapBlock matchgroup=sdHeader start=/^\[Swap\]/ end=/^\[/me=e-2 contains=sdSwapKey,sdExecKey +syn match sdSwapKey contained /^What=/ nextgroup=sdFilename,sdErr +syn match sdSwapKey contained /^Priority=/ nextgroup=sdUInt,sdErr + +" [Path] +syn region sdPathBlock matchgroup=sdHeader start=/^\[Path\]/ end=/^\[/me=e-2 contains=sdPathKey +syn match sdPathKey contained /^\%(PathExists\|PathExistsGlob\|PathChanged\|DirectoryNotEmpty\)=/ nextgroup=sdFilename,sdErr +syn match sdPathKey contained /^MakeDirectory=/ nextgroup=sdBool,sdErr +syn match sdPathKey contained /^DirectoryMode=/ nextgroup=sdOctal,sdErr +syn match sdPathKey contained /^Unit=/ nextgroup=sdUnitList + +" Coloring definitions {{{1 +hi def link sdComment Comment +hi def link sdTodo Todo +hi def link sdInclude PreProc +hi def link sdHeader Type +hi def link sdEnvArg PreProc +hi def link sdFormatStr Special +hi def link sdErr Error +hi def link sdEnvDef Identifier +hi def link sdUnitName PreProc +hi def link sdKey Statement +hi def link sdValue Constant +hi def link sdSymbol Special + +" Coloring links: keys {{{1 + +" It'd be nice if this worked.. +"hi def link sd.\+Key sdKey +hi def link sdUnitKey sdKey +hi def link sdInstallKey sdKey +hi def link sdExecKey sdKey +hi def link sdSocketKey sdKey +hi def link sdServiceKey sdKey +hi def link sdServiceCommonKey sdKey +hi def link sdTimerKey sdKey +hi def link sdMountKey sdKey +hi def link sdAutomountKey sdKey +hi def link sdSwapKey sdKey +hi def link sdPathKey sdKey + +" Coloring links: constant values {{{1 +hi def link sdInt sdValue +hi def link sdUInt sdValue +hi def link sdBool sdValue +hi def link sdOctal sdValue +hi def link sdDuration sdValue +hi def link sdVirtType sdValue +hi def link sdServiceType sdValue +hi def link sdNotifyType sdValue +hi def link sdSecurityType sdValue +hi def link sdSecureBits sdValue +hi def link sdMountFlags sdValue +hi def link sdKillMode sdValue +hi def link sdRestartType sdValue +hi def link sdSignal sdValue +hi def link sdStdin sdValue +hi def link sdStdout sdValue +hi def link sdSyslogFacil sdValue +hi def link sdSyslogLevel sdValue +hi def link sdIOSched sdValue +hi def link sdCPUSched sdValue +hi def link sdRlimit sdValue +hi def link sdCapName sdValue +hi def link sdDevAllowPerm sdValue +hi def link sdDevAllowErr Error + +" Coloring links: symbols/flags {{{1 +hi def link sdExecFlag sdSymbol +hi def link sdConditionFlag sdSymbol +hi def link sdEnvDashFlag sdSymbol +hi def link sdCapOps sdSymbol +hi def link sdCapFlags Identifier +"}}} + +let b:current_syntax = "systemd" +" vim: fdm=marker