diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-04-24 22:56:25 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-04-24 22:56:25 +0200 |
commit | 1c3d38c69b0b795a6a445a3fa3af3780cb4c8f06 (patch) | |
tree | 4de6beeb63581f6ae6eaee114662ec8848ad9c02 /pkgs/applications/editors/vim/ft-nix-support.patch | |
parent | 78d9bffc0a69fcf7acf40674211b395908aa39db (diff) |
vim_configurable: replace default ftNix patch with sources from vim-nix
Diffstat (limited to 'pkgs/applications/editors/vim/ft-nix-support.patch')
-rw-r--r-- | pkgs/applications/editors/vim/ft-nix-support.patch | 78 |
1 files changed, 1 insertions, 77 deletions
diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch index 5feb9c879517a..274d855731fdc 100644 --- a/pkgs/applications/editors/vim/ft-nix-support.patch +++ b/pkgs/applications/editors/vim/ft-nix-support.patch @@ -6,7 +6,7 @@ index a8e6261..2b008fc 100644 " Z80 assembler asz80 au BufNewFile,BufRead *.z8a setf z8a -+" NIX ++" Nix +au BufNewFile,BufRead *.nix setf nix + augroup END @@ -18,79 +18,3 @@ index a8e6261..2b008fc 100644 unlet s:cpo_save + + -diff --git a/runtime/syntax/nix.vim b/runtime/syntax/nix.vim -new file mode 100644 -index 0000000..a2f9918 ---- /dev/null -+++ b/runtime/syntax/nix.vim -@@ -0,0 +1,56 @@ -+" Vim syntax file -+" Language: nix -+" Maintainer: Marc Weber <marco-oweber@gmx.de> -+" Modify and commit if you feel that way -+" Last Change: 2011 Jun -+" -+" this syntax file can be still be enhanced very much.. -+" Don't ask, do it :-) -+" This file (github.com/MarcWeber/vim-addon-nix) is periodically synced with -+" the patch found in vim_configurable (nixpkgs) -+ -+" Quit when a (custom) syntax file was already loaded -+if exists("b:current_syntax") -+ finish -+endif -+ -+ -+sy cluster nixStrings contains=nixStringParam,nixStringIndented -+ -+syn keyword nixKeyword let throw inherit import true false null with -+syn keyword nixConditional if else then -+syn keyword nixBrace ( ) { } = -+syn keyword nixBuiltin __currentSystem __currentTime __isFunction __getEnv __trace __toPath __pathExists -+ \ __readFile __toXML __toFile __filterSource __attrNames __getAttr __hasAttr __isAttrs __listToAttrs __isList -+ \ __head __tail __add __sub __lessThan __substring __stringLength -+ -+syn region nixStringIndented start=+''+ skip=+'''\|''${\|"+ end=+''+ contains=nixStringParam -+" syn region nixString start=+"+ skip=+\\"+ end=+"+ -+syn match nixAttr "\w\+\ze\s*=" -+syn match nixFuncArg "\zs\w\+\ze\s*:" -+syn region nixStringParam start=+\${+ end=+}+ contains=@nixStrings -+syn region nixMultiLineComment start=+/\*+ skip=+\\"+ end=+\*/+ -+syn match nixEndOfLineComment "#.*$" -+ -+hi def link nixKeyword Keyword -+hi def link nixConditional Conditional -+hi def link nixBrace Special -+hi def link nixString String -+hi def link nixStringIndented String -+hi def link nixBuiltin Special -+hi def link nixStringParam Macro -+hi def link nixMultiLineComment Comment -+hi def link nixEndOfLineComment Comment -+hi def link nixAttr Identifier -+hi def link nixFuncArg Identifier -+ -+syn sync maxlines=20000 -+syn sync minlines=50000 -+ -+let b:current_syntax = "nix" -+ -+" thanks to domenkozar -+" scan backwards to find begining of multiline statements -+syn sync ccomment nixMultiLineComment minlines=10 maxlines=500 -+syn sync ccomment nixStringIndented minlines=10 maxlines=500 -+syn sync ccomment nixString maxlines=10 -diff --git a/runtime/ftplugin/nix.vim b/runtime/ftplugin/nix.vim -new file mode 100644 ---- /dev/null -+++ b/runtime/ftplugin/nix.vim -@@ -0,0 +1,2 @@ -+" Only do this when not done yet for this buffer -+if exists("b:did_ftplugin") -+ finish -+endif -+let b:did_ftplugin = 1 -+ -+" coding conventions -+setlocal shiftwidth=2 expandtab softtabstop=2 -+let b:undo_ftplugin = "setlocal sw< et< sts<" |