From 1ddbdddc696316986b07376a7fc5e33aaf228e89 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 5 Nov 2015 00:31:14 +0100
Subject: tv vim: set et ts=2 sts=2 sw=2

---
 tv/2configs/vim.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tv/2configs/vim.nix')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 8c6c9fb45..14f086e5c 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -50,6 +50,8 @@ let
     set wildmenu
     set wildmode=longest,full
 
+    set et ts=2 sts=2 sw=2
+
     filetype plugin indent on
 
     set t_Co=256
-- 
cgit v1.2.3


From 5ec7cd4ad5ce3f40ca13b5b92d258b84409cd43b Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 6 Nov 2015 10:47:18 +0100
Subject: tv vim: isk, INTs, and comments

---
 tv/2configs/vim.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tv/2configs/vim.nix')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 14f086e5c..295c78aff 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -66,9 +66,10 @@ let
 
     au BufRead,BufNewFile *.nix so ${pkgs.writeText "nix.vim" ''
       setf nix
+      set isk=@,48-57,_,192-255,-,'
 
       " Ref <nix/src/libexpr/lexer.l>
-      syn match INT   /[0-9]\+/
+      syn match INT   /\<[0-9]\+\>/
       syn match PATH  /[a-zA-Z0-9\.\_\-\+]*\(\/[a-zA-Z0-9\.\_\-\+]\+\)\+/
       syn match HPATH /\~\(\/[a-zA-Z0-9\.\_\-\+]\+\)\+/
       syn match SPATH /<[a-zA-Z0-9\.\_\-\+]\+\(\/[a-zA-Z0-9\.\_\-\+]\+\)*>/
@@ -80,7 +81,7 @@ let
       hi link URI Constant
 
       syn match String /"\([^"]\|\\\"\)*"/
-      syn match Comment /\s#.*/
+      syn match Comment /\(^\|\s\)#.*/
     ''}
 
     au BufRead,BufNewFile /dev/shm/* set nobackup nowritebackup noswapfile
-- 
cgit v1.2.3


From a2a3838e41db2260e84e377c158482309b9d0123 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 6 Nov 2015 12:04:34 +0100
Subject: tv vim: match strings harder!

---
 tv/2configs/vim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/2configs/vim.nix')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 295c78aff..04b1480c1 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -80,7 +80,7 @@ let
       hi link SPATH Constant
       hi link URI Constant
 
-      syn match String /"\([^"]\|\\\"\)*"/
+      syn match String /"\([^\\"]\|\\.\)*"/
       syn match Comment /\(^\|\s\)#.*/
     ''}
 
-- 
cgit v1.2.3