Merge branch 'master' of git.barakmich.com:barak/dotfiles

.vim/after/ftplugin/haskell.vim

@@ -0,0 +1,2 @@
+setlocal omnifunc=necoghc#omnifunc
+let g:ycm_key_invoke_completion = '<Leader><TAB>'

.vim/bundle/delimitMate

@@ -0,0 +1 @@
+Subproject commit 35280c1444bf62d651f56ccaf03ad8db29c02383

.vim/bundle/ghcmod-vim

@@ -0,0 +1 @@
+Subproject commit 788b193dbeb1bebe303b0d0c6b17c09fdd1ebabb

.vim/bundle/neco-ghc

@@ -0,0 +1 @@
+Subproject commit 41c7160ee129209b758c5a9f0fc196ffeeb866f9

.vim/bundle/snipmate

@@ -1 +0,0 @@
-Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b

.vim/bundle/ultisnips

@@ -0,0 +1 @@
+Subproject commit ae611ccf950a93f93cab64542cbe48029f1e9c02

.vim/bundle/vimproc

@@ -0,0 +1 @@
+Subproject commit 11bd6853b25f73f3729cccbb9282fecade2bf50a

.vim/filetype.vim

@@ -43,6 +43,7 @@ au Filetype html,xml,xsl source ~/.vim/closetag.vim
 
 au BufRead,BufNewFile *.go set filetype=go
 
+au FileType cpp let b:delimitMate_matchpairs = "(:),[:],{:},<:>"
 
 "Settings per filetype
 augroup python

.vim/snippets/c.snippets

@@ -0,0 +1,87 @@
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+
+snippet ifndef "#ifndef ... #define ... #endif" !b
+#ifndef ${1/([A-Za-z0-9_]+).*/$1/}
+#define ${1:SYMBOL} ${2:value}
+#endif
+endsnippet
+
+snippet #if "#if #endif" !b
+#if ${1:0}
+${VISUAL}${0:${VISUAL/(.*)/(?1::code)/}}
+#endif
+endsnippet
+
+snippet main "main() (main)" !
+int main(int argc, char *argv[]) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+  return 0;
+}
+endsnippet
+
+snippet for "for loop (for)" !
+for (${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+
+snippet enum "Enumeration" !
+enum ${1:name} { 
+  $0 
+};
+endsnippet
+
+snippet wh "while loop" !
+while(${1:/* condition */}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet do "do...while loop (do)" !
+do {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+} while(${1:/* condition */});
+endsnippet
+
+snippet if "if .. (if)" !
+if (${1:/* condition */}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet el "else .. (else)" !
+else {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet eli "else if .. (eli)" !
+else if (${1:/* condition */}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet ife "if .. else (ife)" !
+if (${1:/* condition */}) {
+  ${2:/* code */}
+} else {
+  ${3:/* else */}
+}
+endsnippet
+
+snippet st "struct" !
+struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} {
+  ${0:/* data */}
+};
+endsnippet
+
+snippet fun "function" b!
+${1:void} ${2:function_name}(${3}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+# vim:ft=snippets:

.vim/snippets/cpp.snippets

@@ -0,0 +1,27 @@
+extends c
+
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+snippet beginend "$1.begin(), $1.end() (beginend)"
+${1:v}${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}begin(), $1${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}end()
+endsnippet
+
+snippet cl "class .. (class)" !
+class ${1:`!p snip.rv = snip.basename or "name"`} {
+ public:
+  ${1/(\w+).*/$1/}(${2:arguments});
+  virtual ~${1/(\w+).*/$1/}();
+
+ private:
+  ${0:/* data */}
+};
+endsnippet
+
+snippet ns "namespace .. (namespace)" !
+namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`} {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}  // namespace $1
+endsnippet
+
+# vim:ft=snippets: