Permalink
Browse files

updates

  • Loading branch information...
1 parent 985a2b2 commit 1ab69fe5678dace20f28631aca3638300949c94a @puzzlet committed Aug 22, 2012
Showing with 14 additions and 1 deletion.
  1. +8 −0 .bash_profile
  2. +2 −0 .emscripten
  3. +2 −0 .gitconfig
  4. +2 −1 .vimrc
View
@@ -1,3 +1,7 @@
+if [ -f ~/.bashrc ]; then
+ . ~/.bashrc
+fi
+
export PS1="${debian_chroot:+($debian_chroot)}\u@\h:\w\$"
export PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w `git branch 2> /dev/null | grep -e ^* | sed -E s/^\\\\\*\ \(.+\)$/\(\\\\\1\)\ /`\[\033[37m\]$\[\033[00m\] '
@@ -11,3 +15,7 @@ export EDITOR=vim
eval `dircolors ~/devel/_solarized/dircolors-solarized/dircolors.ansi-universal`
. /usr/share/autojump/autojump.sh
+
+if [ -f ~/.bash_profile_private ]; then
+ . ~/.bash_profile_private
+fi
View
@@ -12,6 +12,8 @@ V8_ENGINE = os.path.expanduser('~/Dev/v8/d8')
TEMP_DIR = '/tmp'
+JAVA = 'java'
+
########################################################################################################
View
@@ -1,3 +1,5 @@
+[include]
+ path = ~/.gitconfig_private
[diff]
tool = vimdiff
[difftool]
View
3 .vimrc
@@ -6,8 +6,9 @@ set shiftwidth=4
set modeline
-autocmd BufNewFile,BufRead *.pde setf arduino
autocmd BufNewFile,BufRead *.j2 set filetype=jinjahtml
+autocmd BufNewFile,BufRead *.pde setf arduino
+autocmd BufNewFile,BufRead *.yaml,*.yml so ~/.vim/yaml.vim
"autocmd FileType python compiler pylint

0 comments on commit 1ab69fe

Please sign in to comment.