Merge remote-tracking branch 'lass/master'

10 files changed, 410 insertions, 0 deletions

diff --git a/tv/5pkgs/vim/default.nix b/tv/5pkgs/vim/default.nix
new file mode 100644
index 000000000..5582be3fd
--- /dev/null
+++ b/tv/5pkgs/vim/default.nix
@@ -0,0 +1,7 @@
+with import <stockholm/lib>;
+
+self: super: {
+  tv = super.tv // {
+    vimPlugins = mapNixDir (path: self.callPackage path {}) ./.;
+  };
+}
diff --git a/tv/5pkgs/vim/elixir.nix b/tv/5pkgs/vim/elixir.nix
new file mode 100644
index 000000000..2ffbbc82f
--- /dev/null
+++ b/tv/5pkgs/vim/elixir.nix
@@ -0,0 +1,9 @@
+{ pkgs }:
+pkgs.vimUtils.buildVimPlugin {
+  name = "vim-elixir-2018-08-17";
+  src = pkgs.fetchgit {
+    url = https://github.com/elixir-editors/vim-elixir;
+    rev = "0a847f0faed5ba2d94bb3d51f355c50f37ba025b";
+    sha256 = "1jl85wpgywhcvhgw02y8zpvqf0glr4i8522kxpvhsiacb1v1xh04";
+  };
+}
diff --git a/tv/5pkgs/vim/file-line.nix b/tv/5pkgs/vim/file-line.nix
new file mode 100644
index 000000000..22597265a
--- /dev/null
+++ b/tv/5pkgs/vim/file-line.nix
@@ -0,0 +1,10 @@
+{ pkgs }:
+
+pkgs.vimUtils.buildVimPlugin {
+  name = "file-line-1.0";
+  src = pkgs.fetchgit {
+    url = git://github.com/bogado/file-line;
+    rev = "refs/tags/1.0";
+    sha256 = "0z47zq9rqh06ny0q8lpcdsraf3lyzn9xvb59nywnarf3nxrk6hx0";
+  };
+}
diff --git a/tv/5pkgs/vim/fzf.nix b/tv/5pkgs/vim/fzf.nix
new file mode 100644
index 000000000..14b6900b5
--- /dev/null
+++ b/tv/5pkgs/vim/fzf.nix
@@ -0,0 +1,11 @@
+{ pkgs }:
+
+# cannot use pkgs.vimPlugins.fzf-vim as it's missing :Rg
+pkgs.vimUtils.buildVimPlugin {
+  name = "fzf-2018-11-14";
+  src = pkgs.fetchgit {
+    url = https://github.com/junegunn/fzf.vim;
+    rev = "ad1833ecbc9153b6e34a4292dc089a58c4bcb8dc";
+    sha256 = "1z2q71q6l9hq9fqfqpj1svhyk4yk1bzw1ljhksx4bnpz8gkfbx2m";
+  };
+}
diff --git a/tv/5pkgs/vim/hack.nix b/tv/5pkgs/vim/hack.nix
new file mode 100644
index 000000000..2145cc166
--- /dev/null
+++ b/tv/5pkgs/vim/hack.nix
@@ -0,0 +1,46 @@
+with import <stockholm/lib>;
+{ pkgs }:
+
+(rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
+  name = "hack";
+in {
+  name = "vim-color-${name}-1.0.2";
+  destination = "/colors/${name}.vim";
+  text = /* vim */ ''
+    set background=dark
+    hi clear
+    if exists("syntax_on")
+      syntax clear
+    endif
+
+    let colors_name = ${toJSON name}
+
+    hi Normal       ctermbg=235
+    hi Comment      ctermfg=242
+    hi Constant     ctermfg=255
+    hi Identifier   ctermfg=253
+    hi Function     ctermfg=253
+    hi Statement    ctermfg=253
+    hi PreProc      ctermfg=251
+    hi Type         ctermfg=251
+    hi Delimiter    ctermfg=251
+    hi Special      ctermfg=255
+
+    hi Garbage      ctermbg=088
+    hi TabStop      ctermbg=016
+    hi Todo         ctermfg=174 ctermbg=NONE
+
+    hi NixCode      ctermfg=040
+    hi NixData      ctermfg=046
+    hi NixQuote     ctermfg=071
+
+    hi diffNewFile  ctermfg=207
+    hi diffFile     ctermfg=207
+    hi diffLine     ctermfg=207
+    hi diffSubname  ctermfg=207
+    hi diffAdded    ctermfg=010
+    hi diffRemoved  ctermfg=009
+
+    hi Search       cterm=NONE ctermbg=216
+  '';
+}))
diff --git a/tv/5pkgs/vim/jq.nix b/tv/5pkgs/vim/jq.nix
new file mode 100644
index 000000000..523f49f02
--- /dev/null
+++ b/tv/5pkgs/vim/jq.nix
@@ -0,0 +1,10 @@
+{ pkgs }:
+
+pkgs.vimUtils.buildVimPlugin {
+ name = "vim-syntax-jq";
+ src = pkgs.fetchgit {
+   url = https://github.com/vito-c/jq.vim;
+   rev = "99d55a300047946a82ecdd7617323a751199ad2d";
+   sha256 = "09c94nah47wx0cr556w61h6pfznxld18pfblc3nv51ivbw7cjqyx";
+ };
+}
diff --git a/tv/5pkgs/vim/nix.nix b/tv/5pkgs/vim/nix.nix
new file mode 100644
index 000000000..a58a45b2d
--- /dev/null
+++ b/tv/5pkgs/vim/nix.nix
@@ -0,0 +1,222 @@
+with import <stockholm/lib>;
+{ pkgs }:
+
+(rtp: rtp // { inherit rtp; }) (pkgs.write "vim-syntax-nix-nested" {
+  "/syntax/haskell.vim".text = ''
+    syn region String start=+\[[[:alnum:]]*|+ end=+|]+
+
+    hi link ConId Identifier
+    hi link VarId Identifier
+    hi link hsDelimiter Delimiter
+  '';
+  "/syntax/nix.vim".text = ''
+    "" Quit when a (custom) syntax file was already loaded
+    "if exists("b:current_syntax")
+    "  finish
+    "endif
+
+    "setf nix
+
+    " Ref <nix/src/libexpr/lexer.l>
+    syn match NixID    /[a-zA-Z\_][a-zA-Z0-9\_\'\-]*/
+    syn match NixINT   /\<[0-9]\+\>/
+    syn match NixPATH  /[a-zA-Z0-9\.\_\-\+]*\(\/[a-zA-Z0-9\.\_\-\+]\+\)\+/
+    syn match NixHPATH /\~\(\/[a-zA-Z0-9\.\_\-\+]\+\)\+/
+    syn match NixSPATH /<[a-zA-Z0-9\.\_\-\+]\+\(\/[a-zA-Z0-9\.\_\-\+]\+\)*>/
+    syn match NixURI   /[a-zA-Z][a-zA-Z0-9\+\-\.]*:[a-zA-Z0-9\%\/\?\:\@\&\=\+\$\,\-\_\.\!\~\*\']\+/
+    syn region NixSTRING
+      \ matchgroup=NixSTRING
+      \ start='"'
+      \ skip='\\"'
+      \ end='"'
+    syn region NixIND_STRING
+      \ matchgroup=NixIND_STRING
+      \ start="'''"
+      \ skip="'''\('\|[$]\|\\[nrt]\)"
+      \ end="'''"
+
+    syn match NixOther /[-!+&<>|():/;=.,?\[\]*@]/
+
+    syn match NixCommentMatch /\(^\|\s\)#.*/
+    syn region NixCommentRegion start="/\*" end="\*/"
+
+    hi link NixCode Statement
+    hi link NixData Constant
+    hi link NixComment Comment
+
+    hi link NixCommentMatch NixComment
+    hi link NixCommentRegion NixComment
+    hi link NixID NixCode
+    hi link NixINT NixData
+    hi link NixPATH NixData
+    hi link NixHPATH NixData
+    hi link NixSPATH NixData
+    hi link NixURI NixData
+    hi link NixSTRING NixData
+    hi link NixIND_STRING NixData
+
+    hi link NixEnter NixCode
+    hi link NixOther NixCode
+    hi link NixQuote NixData
+
+    syn cluster nix_has_dollar_curly contains=@nix_ind_strings,@nix_strings
+    syn cluster nix_ind_strings contains=NixIND_STRING
+    syn cluster nix_strings contains=NixSTRING
+
+    ${concatStringsSep "\n" (mapAttrsToList (name: {
+      extraStart ? null,
+      lang ? name
+    }:
+    let
+      startAlts = filter isString [
+        ''/\* ${name} \*/''
+        extraStart
+      ];
+      sigil = ''\(${concatStringsSep ''\|'' startAlts}\)[ \t\r\n]*'';
+    in /* vim */ ''
+      syn include @nix_${lang}_syntax syntax/${lang}.vim
+      if exists("b:current_syntax")
+        unlet b:current_syntax
+      endif
+
+      syn match nix_${lang}_sigil
+        \ X${replaceStrings ["X"] ["\\X"] sigil}\ze\('''\|"\)X
+        \ nextgroup=nix_${lang}_region_IND_STRING,nix_${lang}_region_STRING
+        \ transparent
+
+      syn region nix_${lang}_region_STRING
+        \ matchgroup=NixSTRING
+        \ start='"'
+        \ skip='\\"'
+        \ end='"'
+        \ contained
+        \ contains=@nix_${lang}_syntax
+        \ transparent
+
+      syn region nix_${lang}_region_IND_STRING
+        \ matchgroup=NixIND_STRING
+        \ start="'''"
+        \ skip="'''\('\|[$]\|\\[nrt]\)"
+        \ end="'''"
+        \ contained
+        \ contains=@nix_${lang}_syntax
+        \ transparent
+
+      syn cluster nix_ind_strings
+        \ add=nix_${lang}_region_IND_STRING
+
+      syn cluster nix_strings
+        \ add=nix_${lang}_region_STRING
+
+      " This is required because containedin isn't transitive.
+      syn cluster nix_has_dollar_curly
+        \ add=@nix_${lang}_syntax
+    '') (let
+
+      # TODO move this higher
+      capitalize = s: let
+        xs = stringToCharacters s;
+      in
+        toUpper (head xs) + concatStrings (tail xs);
+
+      alts = xs: ''\(${concatStringsSep ''\|'' xs}\)'';
+      def = k: ''${k}[ \t\r\n]*='';
+      writer = k: ''write${k}[^ \t\r\n]*[ \t\r\n]*\("[^"]*"\|[a-z]\+\)'';
+
+      writerExt = k: writerName ''[^"]*\.${k}'';
+      writerName = k: ''write[^ \t\r\n]*[ \t\r\n]*"${k}"'';
+
+    in {
+      c = {};
+      cabal = {};
+      diff = {};
+      haskell = {};
+      jq.extraStart = alts [
+        (writer "Jq")
+        (writerExt "jq")
+      ];
+      javascript.extraStart = ''/\* js \*/'';
+      lua = {};
+      #nginx = {};
+      python.extraStart = ''/\* py \*/'';
+      sed.extraStart = writer "Sed";
+      sh.extraStart = let
+        phases = [
+          "unpack"
+          "patch"
+          "configure"
+          "build"
+          "check"
+          "install"
+          "fixup"
+          "installCheck"
+          "dist"
+        ];
+        shells = [
+          "ash"
+          "bash"
+          "dash"
+        ];
+      in alts [
+        (def "shellHook")
+        (def "${alts phases}Phase")
+        (def "${alts ["pre" "post"]}${alts (map capitalize phases)}")
+        (writer (alts (map capitalize shells)))
+      ];
+      yaml = {};
+      vim.extraStart = alts [
+        (def ''"[^"]*\.vim"\.text'')
+        (writerExt "vim")
+        (writerName ''\([^"]*\.\)\?vimrc'')
+      ];
+      xdefaults = {};
+      xmodmap = {};
+    }))}
+
+    " Clear syntax that interferes with nixINSIDE_DOLLAR_CURLY.
+    syn clear shVarAssign
+
+    syn region nixINSIDE_DOLLAR_CURLY
+      \ matchgroup=NixEnter
+      \ start="[$]{"
+      \ end="}"
+      \ contains=TOP
+      \ containedin=@nix_has_dollar_curly
+      \ transparent
+
+    syn region nix_inside_curly
+      \ matchgroup=NixEnter
+      \ start="{"
+      \ end="}"
+      \ contains=TOP
+      \ containedin=nixINSIDE_DOLLAR_CURLY,nix_inside_curly
+      \ transparent
+
+    syn match NixQuote /'''\(''$\|\\.\)/he=s+2
+      \ containedin=@nix_ind_strings
+      \ contained
+
+    syn match NixQuote /'''\('\|\\.\)/he=s+1
+      \ containedin=@nix_ind_strings
+      \ contained
+
+    syn match NixQuote /\\./he=s+1
+      \ containedin=@nix_strings
+      \ contained
+
+    syn sync fromstart
+
+    let b:current_syntax = "nix"
+
+    set isk=@,48-57,_,192-255,-,'
+  '';
+  "/syntax/sed.vim".text = ''
+    syn region sedBranch
+      \ matchgroup=sedFunction start="T"
+      \ matchgroup=sedSemicolon end=";\|$"
+      \ contains=sedWhitespace
+  '';
+  "/syntax/xmodmap.vim".text = ''
+    syn match xmodmapComment /^\s*!.*/
+  '';
+})
diff --git a/tv/5pkgs/vim/showsyntax.nix b/tv/5pkgs/vim/showsyntax.nix
new file mode 100644
index 000000000..a5547e46a
--- /dev/null
+++ b/tv/5pkgs/vim/showsyntax.nix
@@ -0,0 +1,26 @@
+{ pkgs }:
+
+(rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
+  name = "showsyntax";
+in {
+  name = "vim-plugin-${name}-1.0.0";
+  destination = "/plugin/${name}.vim";
+  text = /* vim */ ''
+    if exists('g:loaded_showsyntax')
+      finish
+    endif
+    let g:loaded_showsyntax = 0
+
+    fu! ShowSyntax()
+      let id = synID(line("."), col("."), 1)
+      let name = synIDattr(id, "name")
+      let transName = synIDattr(synIDtrans(id),"name")
+      if name != transName
+        let name .= " (" . transName . ")"
+      endif
+      echo "Syntax: " . name
+    endfu
+
+    command! -n=0 -bar ShowSyntax :call ShowSyntax()
+  '';
+}))
diff --git a/tv/5pkgs/vim/tv.nix b/tv/5pkgs/vim/tv.nix
new file mode 100644
index 000000000..ae6245b87
--- /dev/null
+++ b/tv/5pkgs/vim/tv.nix
@@ -0,0 +1,53 @@
+{ pkgs }:
+
+(rtp: rtp // { inherit rtp; }) (pkgs.write "vim-tv" {
+  #
+  # Haskell
+  #
+  "/ftplugin/haskell.vim".text = ''
+    if exists("g:vim_tv_ftplugin_haskell_loaded")
+      finish
+    endif
+    let g:vim_tv_ftplugin_haskell_loaded = 1
+
+    setlocal iskeyword+='
+  '';
+  #
+  # TODO
+  #
+  "/ftdetect/todo.vim".text = ''
+    au BufRead,BufNewFile TODO set ft=todo
+  '';
+  "/ftplugin/todo.vim".text = ''
+    setlocal foldmethod=syntax
+  '';
+  "/syntax/todo.vim".text = ''
+    syn match todoComment /#.*/
+
+    syn match todoDate /^[1-9]\S*/
+      \ nextgroup=todoSummary
+
+    syn region todoSummary
+      \ contained
+      \ contains=todoTag
+      \ start="." end="$\n"
+      \ nextgroup=todoBlock
+
+    syn match todoTag /\[[A-Za-z]\+\]/hs=s+1,he=e-1
+      \ contained
+
+    syn region todoBlock
+      \ contained
+      \ contains=Comment
+      \ fold
+      \ start="^[^1-9]" end="^[1-9]"re=s-1,he=s-1,me=s-1
+
+    syn sync minlines=1000
+
+    hi link todoComment Comment
+    hi todoDate ctermfg=255
+    hi todoSummary ctermfg=229
+    hi todoBlock ctermfg=248
+    hi todoTag ctermfg=217
+  '';
+})
diff --git a/tv/5pkgs/vim/vim.nix b/tv/5pkgs/vim/vim.nix
new file mode 100644
index 000000000..216ab6abb
--- /dev/null
+++ b/tv/5pkgs/vim/vim.nix
@@ -0,0 +1,16 @@
+with import <stockholm/lib>;
+{ pkgs }:
+
+(rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
+  name = "vim";
+in {
+  name = "vim-syntax-${name}-1.0.0";
+  destination = "/syntax/${name}.vim";
+  text = /* vim */ ''
+    ${concatMapStringsSep "\n" (s: /* vim */ ''
+      syn keyword vimColor${s} ${s}
+        \ containedin=ALLBUT,vimComment,vimLineComment
+      hi vimColor${s} ctermfg=${s}
+    '') (map (i: lpad 3 "0" (toString i)) (range 0 255))}
+  '';
+}))