added colorscheme and ctags file

.ctags

@@ -0,0 +1,75 @@
+# Basic options
+--recurse=yes
+--tag-relative=yes
+--exclude=.git
+--exclude=*.min.js
+--exclude=vendor
+--exclude=node_modules
+
+# Regex for Clojure
+--langdef=Clojure
+--langmap=Clojure:.clj
+--regex-clojure=/\([ \t]*create-ns[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/n,namespace/
+--regex-clojure=/\([ \t]*def[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/d,definition/
+--regex-clojure=/\([ \t]*defn-?[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/f,function/
+--regex-clojure=/\([ \t]*defmacro[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/m,macro/
+--regex-clojure=/\([ \t]*definline[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/i,inline/
+--regex-clojure=/\([ \t]*defmulti[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/a,multimethod definition/
+--regex-clojure=/\([ \t]*defmethod[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/b,multimethod instance/
+--regex-clojure=/\([ \t]*defonce[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/c,definition (once)/
+--regex-clojure=/\([ \t]*defstruct[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/s,struct/
+--regex-clojure=/\([ \t]*intern[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/v,intern/
+--regex-clojure=/\([ \t]*ns[ \t]+([-[:alnum:]*+!_:\/.?]+)/\1/n,namespace/
+
+# PHP
+--langmap=php:.engine.inc.module.theme.install.php --PHP-kinds=+cf-v
+
+# Typescript
+--langdef=typescript
+--langmap=typescript:.ts
+--regex-typescript=/^[ \t]*(export[ \t]+([a-z]+[ \t]+)?)?class[ \t]+([a-zA-Z0-9_$]+)/\3/c,classes/
+--regex-typescript=/^[ \t]*(declare[ \t]+)?namespace[ \t]+([a-zA-Z0-9_$]+)/\2/c,modules/
+--regex-typescript=/^[ \t]*(export[ \t]+)?module[ \t]+([a-zA-Z0-9_$]+)/\2/n,modules/
+--regex-typescript=/^[ \t]*(export[ \t]+)?(async[ \t]+)?function[ \t]+([a-zA-Z0-9_$]+)/\3/f,functions/
+--regex-typescript=/^[ \t]*export[ \t]+(var|let|const)[ \t]+([a-zA-Z0-9_$]+)/\2/v,variables/
+--regex-typescript=/^[ \t]*(var|let|const)[ \t]+([a-zA-Z0-9_$]+)[ \t]*=[ \t]*function[ \t]*[*]?[ \t]*\(\)/\2/v,varlambdas/
+--regex-typescript=/^[ \t]*(export[ \t]+)?(public|protected|private)[ \t]+(static[ \t]+)?(abstract[ \t]+)?(((get|set)[ \t]+)|(async[ \t]+[*]*[ \t]*))?([a-zA-Z1-9_$]+)/\9/m,members/
+--regex-typescript=/^[ \t]*(export[ \t]+)?interface[ \t]+([a-zA-Z0-9_$]+)/\2/i,interfaces/
+--regex-typescript=/^[ \t]*(export[ \t]+)?type[ \t]+([a-zA-Z0-9_$]+)/\2/t,types/
+--regex-typescript=/^[ \t]*(export[ \t]+)?enum[ \t]+([a-zA-Z0-9_$]+)/\2/e,enums/
+--regex-typescript=/^[ \t]*import[ \t]+([a-zA-Z0-9_$]+)/\1/I,imports/
+
+# Rust
+--langdef=Rust
+--langmap=Rust:.rs
+--regex-Rust=/fn +([a-zA-Z0-9_]+) *[(<{]/\1/f,functions,function definitions/
+--regex-Rust=/(type|enum|struct|trait)[ \t]+([a-zA-Z0-9_]+) *[<{(;]/\2/T,types,type definitions/
+--regex-Rust=/mod[ \t]+([a-zA-Z0-9_]+) *[<{(;]/\1/M,modules,module definitions/
+--regex-Rust=/(static|const) +([a-zA-Z0-9_]+) *[:=]/\2/c,consts,static constants/
+--regex-Rust=/macro_rules! +([a-zA-Z0-9_]+) *{/\1/d,macros,macro definitions/
+--regex-Rust=/impl([ \t\n]*<[^>]*>)?[ \t]+(([a-zA-Z0-9_:]+)[ \t]*(<[^>]*>)?[ \t]+(for)[ \t]+)?([a-zA-Z0-9_]+)/\6/i,impls,trait implementations/
+
+
+
+# LESS
+--langdef=less
+--langmap=less:.less
+--regex-less=/^[ t]*.([A-Za-z0-9_-]+)/1/c,class,classes/
+--regex-less=/^[ t]*#([A-Za-z0-9_-]+)/1/i,id,ids/
+--regex-less=/^[ t]*(([A-Za-z0-9_-]+[ tn,]+)+){/1/t,tag,tags/
+--regex-less=/^[ t]*@medias+([A-Za-z0-9_-]+)/1/m,media,medias/
+
+# Javascript (ES6)
+--langdef=js
+--langmap=js:.js
+--regex-js=/([A-Za-z0-9._$]+)[ t]*[:=][ t]*{/1/,object/
+--regex-js=/([A-Za-z0-9._$()]+)[ t]*[:=][ t]*function[ t]*(/1/,function/
+--regex-js=/function[ t]+([A-Za-z0-9._$]+)[ t]*(([^)]))/1/,function/
+--regex-js=/([A-Za-z0-9._$]+)[ t]*[:=][ t]*[/1/,array/
+--regex-js=/([^= ]+)[ t]*=[ t]*[^"]'[^']*/1/,string/
+--regex-js=/([^= ]+)[ t]*=[ t]*[^']"[^"]*/1/,string/
+--regex-js=/^[ \t]*(export[ \t]+([a-z]+[ \t]+)?)?class[ \t]+([a-zA-Z0-9_$]+)/\3/c,classes/
+--regex-js=/^[ \t]*import[ \t]+([a-zA-Z0-9_$]+)/\1/I,imports/
+--regex-js=/^[ \t]*(export[ \t]+)?(async[ \t]+)?function[ \t]+([a-zA-Z0-9_$]+)/\3/f,functions/
+--regex-js=/^[ \t]*export[ \t]+(var|let|const)[ \t]+([a-zA-Z0-9_$]+)/\2/v,variables/
+--regex-js=/^[ \t]*(var|let|const)[ \t]+([a-zA-Z0-9_$]+)[ \t]*=[ \t]*function[ \t]*[*]?[ \t]*\(\)/\2/v,varlambdas/

.environment

@@ -35,7 +35,6 @@ if [ -d "${HOME}/.bin" ] ; then
     PATH=${HOME}/.bin:${PATH}
 fi
 
-
 export GIT_EDITOR=vim
 
 # give windows boxes a chance to override environment
@@ -48,6 +47,7 @@ if [ -d "/c/Windows" ]; then
   fi
 else
   export GOPATH=~/projects/go
+  export DOTNETPATH=~/.dotnet/
 fi
 
 export EDITOR=$GIT_EDITOR
@@ -57,7 +57,7 @@ if [ -d "${HOME}/tools/vim" ] ; then
     PATH=${HOME}/tools/vim:${PATH}
 fi
 
-PATH=/usr/local/bin:${GOPATH}/bin:${GOROOT}/bin:${PATH}
+PATH=/usr/local/bin:${GOPATH}/bin:${GOROOT}/bin:${DOTNETPATH}:${PATH}
 
 # http://stackoverflow.com/questions/410616/increasing-the-maximum-number-of-tcp-ip-connections-in-linux
 # run these to increase concurrent connections in linux

.gitconfig

@@ -64,20 +64,11 @@
  # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
  # instead of a/b/c/d as prefixes for patches
   mnemonicprefix = true
-  guitool=p4diff
-  tool=p4diff
-
-[difftool "p4diff"]
-  cmd=p4merge.exe -db -nb Base -nl Mine-local -nr Theirs-remote  $BASE $LOCAL $REMOTE
+  tool = vimdiff
 
 [merge]
-  tool = p4merge
-
-[mergetool "p4merge"]
-  cmd = p4merge.exe $BASE $LOCAL $REMOTE $MERGED
-  keepTemporaries = false
-  trustExitCode = false
-  keepBackup = false
+  tool = vimdiff
+  conflictstyle = diff3
 
 [mergetool]
   prompt = false

.vimrc

@@ -1,5 +1,5 @@
 " change runtime path
-set runtimepath=~/tools/vim
+set runtimepath=~/tools/vim/
 
 execute pathogen#infect()
 execute pathogen#helptags()
@@ -8,34 +8,44 @@ execute pathogen#helptags()
 set nocompatible
 
 "color schemes
-colorscheme desert
+"colorscheme desert
 "colorscheme jellybeans
 "colorscheme molokai
+"colorscheme wombat256mod
 "colorscheme hickop
+colorscheme torte
+"colorscheme deus
 "colorscheme moria
-"colorscheme CandyPaper
-"colorscheme sunburst
 "colorscheme pablo
-"colorscheme torte
 "colorscheme slate
 "colorscheme evening
 "colorscheme darkblue
 "colorscheme base16-flat
 "colorscheme inkpot
 "colorscheme liquidcarbon
-"colorscheme pinksea
 "colorscheme sonofobsidian
 "colorscheme vividchalk
-"colorscheme wombat256mod
 "colorscheme evening
-"colorscheme koehler
 "colorscheme morning
 "colorscheme elflord
+"colorscheme koehler
+"colorscheme delek
+"colorscheme ron
+"colorscheme shine
+"colorscheme peachpuff
+"colorscheme peaksea
+"colorscheme murphy
+"colorscheme zellner
+
+
+"colorscheme sunburst
+"colorscheme pinksea
+"colorscheme CandyPaper
 
 set omnifunc=syntaxcomplete#Complete
 set completeopt-=preview
 
-set wildignore=*.png,*.jpg,node_modules,*.min.js,*.txt,*.bak,*.exe
+set wildignore=*.png,*.jpg,node_modules,*.min.js,*.txt,*.bak,*.exe,vendor.js
 set autochdir
 set tags=./.git/tags,tags;$HOME
 set noswapfile
@@ -65,7 +75,7 @@ map <leader><Space> :HardTimeToggle<CR>
 map <Space> :noh<CR>
 
 "replace 
 with regular newlines
-map <leader>nf :%s/
//g<CR>
+map <leader>ff :%s/
//g<CR>
 
 "list buffers
 map <leader>w :buffers<CR>
@@ -124,7 +134,7 @@ map <F1> <Nop>
 noremap <leader>W :w !sudo tee % > /dev/null<CR>
 
 " generate tags
-nnoremap <leader>c ctags -R -f ./.git/tags .
+nnoremap <leader>c :! ctags -R -f ./.git/tags .<CR>
 
 " enable neocomplete
 let g:neocomplete#enable_at_startup = 0