2 files changed, 54 insertions, 51 deletions
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 819578661..b9509bca3 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -20,60 +20,10 @@ let {
     pkgs.tv.vimPlugins.hack
     pkgs.tv.vimPlugins.jq
     pkgs.tv.vimPlugins.showsyntax
+    pkgs.tv.vimPlugins.tv
     pkgs.tv.vimPlugins.vim
     pkgs.vimPlugins.fzfWrapper
     pkgs.vimPlugins.undotree
-    ((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
-      '';
-    }))
     ((rtp: rtp // { inherit rtp; }) (pkgs.write "vim-syntax-nix-nested" {
       "/syntax/haskell.vim".text = ''
         syn region String start=+\[[[:alnum:]]*|+ end=+|]+
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
+  '';
+})