clean up snippets a bit

10 files changed, 83 insertions, 80 deletions

diff --git a/vim/snippets/_.snippets b/vim/snippets/_.snippets
index 3d2afe4..982a614 100644
--- a/vim/snippets/_.snippets
+++ b/vim/snippets/_.snippets
@@ -1,4 +1,4 @@
 snippet now
-        `strftime("%Y-%m-%d %H:%M")`
+	`strftime("%Y-%m-%d %H:%M")`
 snippet nows
-        "`strftime("%Y-%m-%d %H:%M")`"
+	"`strftime("%Y-%m-%d %H:%M")`"
diff --git a/vim/snippets/c.snippets b/vim/snippets/c.snippets
index 17df051..eece346 100644
--- a/vim/snippets/c.snippets
+++ b/vim/snippets/c.snippets
@@ -1,13 +1,12 @@
 snippet guard
-        #ifndef ${1:`'_' . toupper(substitute(matchstr(expand("%"), '^.*/\zs.*\.h'), '[.-]', '_', 'g'))`}
-        #define $1
+	#ifndef ${1:`'_' . toupper(substitute(matchstr(expand("%"), '^.*/\zs.*\.h'), '[.-]', '_', 'g'))`}
+	#define $1
 
-        ${2}
-
-        #endif
+	${0}
 
+	#endif
 snippet main
-        int main(int argc, char *argv[])
-        {
-            ${1}
-        }
+	int main(int argc, char *argv[])
+	{
+		${0}
+	}
diff --git a/vim/snippets/perl.snippets b/vim/snippets/perl.snippets
index 76e7820..d522f63 100644
--- a/vim/snippets/perl.snippets
+++ b/vim/snippets/perl.snippets
@@ -1,48 +1,41 @@
-snippet try
-	try {
-	    ${1}
-	} catch {
-	    ${2}
-	};
-snippet st
-	map  { $_->[0] }
-	sort { $a->[1] ${3:cmp} $b->[1] }
-	map  { [$_, ${2:function}] }
-	${1:list}
 snippet tbl
 	local $Test::Builder::Level = $Test::Builder::Level + 1;
 snippet ccl
 	local $Carp::CarpLevel = $Carp::CarpLevel + 1;
 snippet linc
 	local $${1:a} = $$1 + ${2:1};
-	${3}
+	${0}
 snippet script
 	#!/usr/bin/env perl
 	use strict;
 	use warnings;
-	
-	${1}
+
+	${0}
 snippet test
 	#!/usr/bin/env perl
 	use strict;
 	use warnings;
 	use Test::More;
 
-	${1}
+	${0}
 
 	done_testing;
-snippet nac
-	use namespace::autoclean;
+snippet sub
+	sub ${1:foo} {
+		${0}
+	}
 snippet wd
 	use Data::Dump; ddx(${1});
+	${0}
 snippet wdd
 	use Data::Dump; push @Data::Dump::FILTERS, sub { return {dump => "$_[1]"} if $_[0]->depth > ${1:1} }; ddx(${2});
+	${0}
 snippet package
 	package ${1:`substitute(matchstr(expand("%"), '^lib/\zs.*\ze\.pm'), '/', '::', 'g')`};
 	use strict;
 	use warnings;
 
-	${2}
+	${0}
 
 	1;
 snippet test_psgi
@@ -52,7 +45,7 @@ snippet test_psgi
 			my $cb = shift;
 
 			{
-				${2}
+				${0}
 			}
 		};
 #
@@ -62,7 +55,7 @@ snippet class
 	package ${1:`substitute(matchstr(expand("%"), '^lib/\zs.*\ze\.pm'), '/', '::', 'g')`};
 	use Moose;
 
-	${2}
+	${0}
 
 	__PACKAGE__->meta->make_immutable;
 	no Moose;
@@ -76,7 +69,7 @@ snippet subclass
 	use Moose;
 	extends '${2:`matchstr(substitute(matchstr(expand("%"), '^lib/\zs.*\ze\.pm'), '/', '::', 'g'), '.*\ze::.*')`}';
 
-	${3}
+	${0}
 
 	__PACKAGE__->meta->make_immutable;
 	no Moose;
@@ -86,7 +79,7 @@ snippet role
 	package ${1:`substitute(matchstr(expand("%"), '^lib/\zs.*\ze\.pm'), '/', '::', 'g')`};
 	use Moose::Role;
 
-	${2}
+	${0}
 
 	no Moose::Role;
 
@@ -94,7 +87,7 @@ snippet role
 snippet has
 	has ${1:attr} => (
 		is  => '${2:ro}',
-		isa => '${3:Str}',${4}
+		isa => '${3:Str}',${0}
 	);
 snippet hasl
 	has ${1:attr} => (
@@ -105,26 +98,26 @@ snippet hasl
 
 	sub _build_$1 {
 		my $self = shift;
-		${5}
+		${0}
 	}
 snippet m
 	sub ${1:foo} {
 		my $self = shift;
-		${2}
+		${0}
 	}
 snippet around
 	around ${1:foo} => sub {
 		my $orig = shift;
 		my $self = shift;
-		${2}
+		${0}
 	};
 snippet after
 	after ${1:foo} => sub {
 		my $self = shift;
-		${2}
+		${0}
 	};
 snippet before
 	before ${1:foo} => sub {
 		my $self = shift;
-		${2}
+		${0}
 	};
diff --git a/vim/snippets/python.snippets b/vim/snippets/python.snippets
index 4887167..fc0dd70 100644
--- a/vim/snippets/python.snippets
+++ b/vim/snippets/python.snippets
@@ -1,8 +1,8 @@
 snippet test
-        import unittest
-        
-        ${1}
-        
-        class ${2:`join(map(split(matchstr(expand("%"), '^t\(ests\?\)\?/\zs.*\ze\.py'), '_'), 'toupper(v:val[0]) . v:val[1:]'), '')`}(unittest.TestCase):
-                def test_${3}(self):
-                        ${4}
+	import unittest
+
+	${1}
+
+	class ${2:`join(map(split(matchstr(expand("%"), '^t\(ests\?\)\?/\zs.*\ze\.py'), '_'), 'toupper(v:val[0]) . v:val[1:]'), '')`}(unittest.TestCase):
+		def test_${3}(self):
+	        	${0}
diff --git a/vim/snippets/ruby.snippet b/vim/snippets/ruby.snippet
deleted file mode 100644
index df01fdc..0000000
--- a/vim/snippets/ruby.snippet
+++ /dev/null
@@ -1,10 +0,0 @@
-snippet script
-	#!/usr/bin/env ruby
-	
-	def main
-		${1}
-	end
-	
-	if __FILE__ == \$0
-		main
-	end
diff --git a/vim/snippets/ruby.snippets b/vim/snippets/ruby.snippets
new file mode 100644
index 0000000..721fa94
--- /dev/null
+++ b/vim/snippets/ruby.snippets
@@ -0,0 +1,22 @@
+snippet script
+	#!/usr/bin/env ruby
+
+	def main
+		${0}
+	end
+
+	if __FILE__ == \$0
+		main(*ARGV)
+	end
+snippet def
+	def ${1:foo}
+		${0}
+	end
+snippet class
+	class ${1:Foo}
+		${0}
+	end
+snippet module
+	module ${1:Foo}
+		${0}
+	end
diff --git a/vim/snippets/rust.snippets b/vim/snippets/rust.snippets
index eb4963f..f9e885d 100644
--- a/vim/snippets/rust.snippets
+++ b/vim/snippets/rust.snippets
@@ -1,19 +1,16 @@
 snippet main
-        fn main () {
-                ${1}
-        }
-
+	fn main () {
+		${0}
+	}
 snippet pr
-        println!(${1})
-
+        println!(${0});
 snippet struct
-        #[deriving(PartialEq, Eq, Show)]
-        struct ${1} {
-                ${2}
-        }
-
+	#[deriving(PartialEq, Eq, Show)]
+	struct ${1} {
+		${0}
+	}
 snippet test
-        #[test]
-        fn ${1} () {
-                ${2}
-        }
+	#[test]
+	fn ${1} () {
+		${0}
+	}
diff --git a/vim/snippets/sh.snippets b/vim/snippets/sh.snippets
index 68f7431..2a8e4b0 100644
--- a/vim/snippets/sh.snippets
+++ b/vim/snippets/sh.snippets
@@ -1,5 +1,6 @@
 snippet script
-        #!/usr/bin/env bash
-        set -eux
-        set -o pipefail
+	#!/usr/bin/env bash
+	set -eux
+	set -o pipefail
 
+	${0}
diff --git a/vim/snippets/tex.snippets b/vim/snippets/tex.snippets
index 3de89bf..3a79579 100644
--- a/vim/snippets/tex.snippets
+++ b/vim/snippets/tex.snippets
@@ -1,13 +1,13 @@
 snippet article
 	\documentclass[11pt]{article}
 	\usepackage{jesse}
-	
+
 	\headers{${1}}
 	        {\huge \textbf{${2}}}
 	        {${3}}
-	
+
 	\begin{document}
-	
-	${4}
-	
+
+	${0}
+
 	\end{document}
diff --git a/vim/snippets/xs.snippets b/vim/snippets/xs.snippets
index 4818063..eada925 100644
--- a/vim/snippets/xs.snippets
+++ b/vim/snippets/xs.snippets
@@ -8,8 +8,9 @@ snippet xs
 	PROTOTYPES: DISABLE
 
 
+	${0}
 snippet xsub
 	${3:void}
 	${1:name}(${2})
 	  CODE:
-		
+		${0}