Consolidate to .vimrc, minor updates

diff --git a/dotbash_profile b/dotbash_profile
index da445e504c97b94bebd6548238358e550a51811c..f8b64a1b90e2f746e0c1ceda18995e2377d831fa 100644 (file)
--- a/dotbash_profile
+++ b/dotbash_profile
@@ -6,6 +6,7 @@ export GRADLE_HOME=$HOME/bin/gradle
 export ANDROID_PATH=/Applications/Android\ Studio.app/sdk/platform-tools:/Applications/Android\ Studio.app/sdk/tools
 export POSTGRES_PATH=/Applications/Postgres.app/Contents/Versions/9.3/bin
 export SCALA_HOME=~/bin/scala
+export ANT_HOME=$HOME"/projects/winston/build-support/apache-ant"
 export PATH=~/bin:/usr/local/bin:$PATH:$GRADLE_HOME/bin:$ANDROID_PATH:$POSTGRES_PATH:$SCALA_HOME/bin
 
 ##################################################
@@ -97,3 +98,4 @@ export JAVA_OPTS="-server -Xms512m -Xmx2048m -XX:PermSize=512M -XX:MaxPermSize=1
 
 alias git=/usr/local/git/bin/git
 alias preview="open -a Preview"
+alias jsoncb="pbpaste | python -mjson.tool | gvim -"

diff --git a/dotemacs b/dotemacs
index 0699c416f25ecc55ae496884bdd2949c854997a3..d1e42adc2204fe47ec2f03047c59971a683538de 100755 (executable)
--- a/dotemacs
+++ b/dotemacs
@@ -16,8 +16,8 @@
 (setq ring-bell-function 'ignore)
 
 ; Tramp
-(require 'tramp)
-(setq tramp-default-method "ssh")
+;(require 'tramp)
+;(setq tramp-default-method "ssh")
 
 (defun set-dark-theme ()
   (interactive)
@@ -85,13 +85,13 @@
     (erase-buffer)))
 
 ; Slime Config
-(setq inferior-lisp-program "/usr/local/bin/sbcl")
-(add-to-list 'load-path "~/Projects/slime")
-(require 'slime-autoloads)
-(slime-setup '(slime-repl slime-banner slime-references))
-
-(add-hook 'slime-mode-hook
-         (lambda ()
-           (unless (slime-connected-p)
-             (save-excursion (slime)))))
+; (setq inferior-lisp-program "/usr/local/bin/sbcl")
+; (add-to-list 'load-path "~/Projects/slime")
+; (require 'slime-autoloads)
+; (slime-setup '(slime-repl slime-banner slime-references))
+
+; (add-hook 'slime-mode-hook
+;        (lambda ()
+;          (unless (slime-connected-p)
+;            (save-excursion (slime)))))
 

diff --git a/dotgvimrc b/dotgvimrc
deleted file mode 100644 (file)
index 00fd402..0000000
--- a/dotgvimrc
+++ /dev/null
@@ -1,18 +0,0 @@
-set nocompatible
-"source $VIMRUNTIME/vimrc_example.vim
-
-colorscheme solarized 
-set background=dark
-set autoindent
-set cindent
-set number
-set expandtab
-set softtabstop=4
-set tabstop=4
-set shiftwidth=4
-set guioptions-=T
-set guifont=Menlo:h12
-
-map <C-t> :tabnew<cr>
-map <C-tab> :tabnext<cr>
-map <C-S-tab> :tabprevious<cr>

diff --git a/dotvimrc b/dotvimrc
index 9be42705f360f09d5f51d43a848000c65977f56c..f983c992c2313ae92d78116cd11e7862bd1631f8 100644 (file)
--- a/dotvimrc
+++ b/dotvimrc
@@ -1,10 +1,17 @@
 set nocompatible
+call pathogen#infect()
 
 filetype plugin indent on
-syntax on
+
+syntax enable
+set background=dark
+if has('gui_running')
+    colorscheme solarized 
+endif
 
 set autoindent
 set cindent
+set number
 set backupdir=~/.saves
 set noswapfile
 set expandtab
@@ -21,6 +28,12 @@ set switchbuf=usetab
 
 set mouse=a
 set ttymouse=xterm2
+set guioptions-=T
+set guifont=Menlo:h12
+
+map <C-t> :tabnew<cr>
+map <C-tab> :tabnext<cr>
+map <C-S-tab> :tabprevious<cr>
 
 set wildignore+=**/node_modules,**/node_modules/*,**/target,**/target/*
 
@@ -31,6 +44,8 @@ let NERDTreeShowHidden=1
 
 map <leader>f :CommandT<cr>
 map <leader>a :NERDTreeToggle<cr>
+map <leader>b :Gblame<cr>
+map <leader>d :Gdiff<cr>
 
 " Setup project/team-specific configurations
 function! SetupEnvironment()
@@ -46,6 +61,9 @@ function! SetupEnvironment()
         if &filetype == "css"
             setlocal tabstop=2 softtabstop=2 shiftwidth=2
         endif
+        if &filetype == "html"
+            setlocal tabstop=2 softtabstop=2 shiftwidth=2
+        endif
     endif
 endfunction
 
@@ -64,5 +82,3 @@ au BufNewFile,BufRead *.dat setlocal noexpandtab
 au BufNewFile,BufRead *.jade setlocal noexpandtab
 
 au BufNewFile,BufRead * call SetupEnvironment()
-
-call pathogen#infect()