Update

git-svn-id: http://photonzero.com/dotfiles/trunk@81 23f722f6-122a-0410-8cef-c75bd312dd78

.bash_aliases

@@ -53,7 +53,7 @@ alias ppjson="python -mjson.tool"
 #alias naim="naim --noscreen"
 alias wallall="wallall -p"
 #alias cal="cal -3"
-alias google='surfraw google'
+#alias google='surfraw google'
 alias hd='od -Ax -tx1z -v'
 alias gcal='gcalcli'
 

.bash_profile

@@ -1,12 +1,14 @@
-# $FreeBSD: src/share/skel/dot.profile,v 1.19.2.2 2002/07/13 16:29:10 mp Exp $
+# ~/.profile: executed by the command interpreter for login shells.
-#
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
-# .profile - Bourne Shell startup script for login shells
+# exists.
-#
+# see /usr/share/doc/bash/examples/startup-files for examples.
-# see also sh(1), environ(7).
+# the files are located in the bash-doc package.
-#
 
-# remove /usr/games and /usr/X11R6/bin if you want
+# the default umask is set in /etc/profile; for setting the umask
-PATH=/$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:/$HOME/.gem/ruby/1.9/bin; export PATH
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+
+PATH=/$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:/$HOME/.gem/ruby/1.9/bin:$PATH; export PATH
 case `uname` in
 SunOS)
 	UCB_PATH=/usr/sww/lang/acl:/usr/sww/lang/jdk-1.5.0/bin:/usr/openwin/bin:/usr/dt/bin:/usr/sww/opt/java/bin:/usr/sww/bin:/share/b/grading/bin:/share/b/grading/sbin:/share/b/runas/sun4u:/share/b/bin:/home/aa/projects/scheme/bin:/usr/ucb:/usr/ccs/bin:/usr/sfw/bin; export UCB_PATH
@@ -20,27 +22,11 @@ Darwin)
 	;;
 esac
 
-# Setting TERM is normally done through /etc/ttys.  Do only override
+# if running bash
-# if you're sure that you'll never log in via telnet or xterm or a
+if [ -n "$BASH_VERSION" ]; then
-# serial line.
+    # include .bashrc if it exists
-# Use cons25l1 for iso-* fonts
+    if [ -f "$HOME/.bashrc" ]; then
-# TERM=cons25; 	export TERM
+	. "$HOME/.bashrc"
+    fi
+fi
 
-BLOCKSIZE=K;	export BLOCKSIZE
-EDITOR=vim;   	export EDITOR
-PAGER=less;  	export PAGER
-
-# set ENV to a file invoked each time sh is started for interactive use.
-ENV=$HOME/.bashrc; export ENV
-
-MAILPATH=/var/spool/mail/$USER
-for i in ~/mail/*
-do
-	MAILPATH=$MAILPATH:$i'?You have new mail in your ${_##*/} folder'
-done
-export MAILPATH
-unset i
-
-#alias ls='ls -FG'
-#alias la='ls -FGal'
-source ~/.bashrc

.bashrc

@@ -5,6 +5,21 @@
 # If not running interactively, don't do anything
 [ -z "$PS1" ] && return
 
+BLOCKSIZE=K;	export BLOCKSIZE
+EDITOR=vim;   	export EDITOR
+PAGER=less;  	export PAGER
+
+# set ENV to a file invoked each time sh is started for interactive use.
+ENV=$HOME/.bashrc; export ENV
+
+MAILPATH=/var/spool/mail/$USER
+for i in ~/mail/*
+do
+	MAILPATH=$MAILPATH:$i'?You have new mail in your ${_##*/} folder'
+done
+export MAILPATH
+unset i
+
 # don't put duplicate lines in the history. See bash(1) for more options
 export HISTCONTROL=ignoredups
 
@@ -22,6 +37,8 @@ fi
 
 
 PERL5LIB=$HOME/local/lib64/perl5/site_perl/5.8.8/
+
+#Go Language stuff
 export GOROOT=$HOME/local/go
 export GOARCH=amd64
 export GOOS=linux
@@ -33,7 +50,9 @@ FreeBSD)
 	export GOOS=freebsd
 	;;
 esac
+
 # set a fancy prompt (non-color, unless we know we "want" color)
+
 #case "$TERM" in
 #xterm-color)
 #    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
@@ -100,6 +119,10 @@ if [ -f /etc/bash_completion ]; then
     . /etc/bash_completion
 fi
 
+if [ -f ~/.bash_google ]; then
+    . ~/.bash_google
+fi
+
 if [ -n "`which fortune`" ]; then
     fortune
 fi

.tmux.conf

@@ -4,6 +4,8 @@ bind-key C-a last-window
 bind-key a send-prefix
 bind-key j select-pane -t:-
 bind-key k select-pane -t:+
+bind-key h select-pane -t:.+
+bind-key l select-pane -t:.-
 bind-key C-n next-window
 bind-key C-p previous-window
 set -g set-titles off

.vimrc

@@ -71,6 +71,10 @@ let Tlist_Inc_Winwidth = 0
 let Tlist_WinWidth = 40
 let Tlist_Show_One_File = 0
 
+let g:ConqueTerm_CWInsert = 1
+let g:ConqueTerm_InsertOnEnter = 0
+let g:ConqueTerm_SendVisKey = '<Leader>ss'
+
 "MiniBufExplore Options
 "let g:miniBufExplMapWindowNavVim = 1
 "let g:miniBufExplMapWindowNavArrows = 1
@@ -239,7 +243,7 @@ function! HighlightTooLongLines()
 endfunction
 
 let g:google = 0
-
+let g:disable_google_optional_settings = 1
 if filereadable("/usr/share/vim/google/google.vim")
   source /usr/share/vim/google/google.vim
   let g:google = 1
@@ -266,7 +270,23 @@ if filereadable("/home/build/nonconf/google3/tools/tags/gtags.vim")
     nmap <C-]> :exe 'Gtlist ' . expand('<cword>')<CR>
 endif
 
+" new shell execute that pipes output to window
+function! s:ExecuteInShell(command)
+  let command = join(map(split(a:command), 'expand(v:val)'))
+  let winnr = bufwinnr('^' . command . '$')
+  silent! execute  winnr < 0 ? 'botright new ' . fnameescape(command) : winnr . 'wincmd w'
+  setlocal buftype=nowrite bufhidden=wipe nobuflisted noswapfile wrap number
+  echo 'Executing ' . command . '...'
+  silent! execute 'silent %!'. command
+" uncomment this if you want the new buffer to try to grow to accommodate the output
+  "silent! execute 'resize ' . line('$')
+  silent! redraw
+  silent! execute 'au BufUnload <buffer> execute bufwinnr(' . bufnr('#') . ') . ''wincmd w'''
+  silent! execute 'nnoremap <silent> <buffer> <LocalLeader>r :call <SID>ExecuteInShell(''' . command . ''')<CR>'
+  echo 'Execution of ' . command . ' complete.'
+endfunction
 
-
+command! -complete=shellcmd -nargs=+ Shell call s:ExecuteInShell(<q-args>)
-
+command! -nargs=* Make call s:ExecuteInShell('make '.<q-args>)
+command! -nargs=* Git call s:ExecuteInShell('git '.<q-args>)