Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

build

  • Loading branch information...
commit c53605ffcc44738e684aa6491cbb4e27f52c204d 1 parent 024b190
@svenfuchs authored
View
2  .ackrc
@@ -8,3 +8,5 @@
--ignore-dir=tmp
--ignore-dir=public
+--ignore-dir=bower_components
+--ignore-dir=node_modules
View
11 .gitconfig
@@ -4,7 +4,7 @@
name = Sven Fuchs
email = me@svenfuchs.com
[color]
- ui = true
+ ui = true
status = auto
diff = auto
branch = auto
@@ -28,7 +28,8 @@
g = grep -n
d = diff --word-diff
[merge]
- tool = diffmerge
+ tool = opendiff
+ conflictstyle = diff3
[core]
whitespace = fix
quotepath = false
@@ -38,7 +39,7 @@
[credential]
helper = osxkeychain
[mergetool "diffmerge"]
- cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
- trustExitCode = true
+ cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
+ trustExitCode = true
[push]
- default = upstream
+ default = upstream
View
18 .teamocil/travis-pro.yml
@@ -19,24 +19,6 @@ session:
- cmd: vim
- cmd: clear
width: 50
- - name: travis-pro-logs
- root: ~/Development/projects/travis/travis-pro-logs
- filters:
- before:
- - 'rbenv use jruby'
- splits:
- - cmd: vim
- - cmd: clear
- width: 50
- # - name: travis-pro-listener
- # root: ~/Development/projects/travis/travis-pro-listener
- # filters:
- # before:
- # - 'rbenv use 1.9.3'
- # splits:
- # - cmd: vim
- # - cmd: clear
- # width: 50
- name: travis-pro-core
root: ~/Development/projects/travis/travis-pro-core
filters:
View
9 .tmux/bin/tmux-vim-select-pane
@@ -15,9 +15,12 @@ fi
if $vim; then
dir="$(echo "${1#-}" | tr 'lLDUR' '\\hjkl')"
- tmux send-keys ":let nr = winnr() | wincmd $dir" C-m
- tmux send-keys ":if nr == winnr() | silent call system(\"$cmd\") | end"
- tmux send-keys C-m ':echo "\r"' C-m
+ tmux send-keys ":let nr = winnr()"
+ tmux send-keys C-m
+ tmux send-keys ":wincmd $dir"
+ tmux send-keys C-m
+ tmux send-keys ":if nr == winnr() | silent call system(\"$cmd\") | end | echo \"\r\""
+ tmux send-keys C-m
else
$cmd
fi
View
6 .vim/bundle.vim
@@ -12,15 +12,15 @@ Bundle 'terryma/vim-expand-region'
Bundle 'tpope/vim-surround'
Bundle 'tomtom/tcomment_vim'
Bundle 'mileszs/ack.vim'
-Bundle 'kien/ctrlp.vim'
+" Bundle 'kien/ctrlp.vim'
" LANGUAGES
Bundle 'vim-ruby/vim-ruby'
Bundle 'pangloss/vim-javascript'
Bundle 'kchmck/vim-coffee-script'
-Bundle 'nono/vim-handlebars'
-Bundle 'rstacruz/sparkup.git'
+" Bundle 'nono/vim-handlebars'
+" Bundle 'rstacruz/sparkup.git'
Bundle 'slim-template/vim-slim'
" Bundle 'tpope/vim-endwise'
" Bundle 'tpope/vim-markdown'
View
9 .zsh/exports.zsh
@@ -1,3 +1,6 @@
+export LC_CTYPE=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+#
# export EDITOR="/usr/bin/mate -w"
export EDITOR="/usr/local/bin/vim"
export PAGER=less
@@ -7,15 +10,20 @@ export PATH="/usr/local/bin:$PATH"
export PATH="$PATH:/usr/local/sbin"
export PATH="$PATH:/usr/local/git/libexec/git-core"
export PATH="$PATH:/Users/sven/.tmux/bin"
+export PATH="$PATH:/Users/sven/Development/projects/travis/travis-enterprise/build/bin"
# export PATH="$PATH:/Users/sven/Applications/bin"
# export PATH="$PATH:/Users/sven/.gem/ruby/1.8/bin"
export RUBYLIB=$RUBYLIB:~/.ruby
export JRUBY_OPTS=--1.9
+# export JRUBY_OPTS="--2.0 -X-C"
export ERL_LIBS='/usr/local/Cellar/rabbitmq/2.0.0/lib/rabbitmq/erlang/lib:$ERL_LIBS'
export PGDATA=/usr/local/var/postgres
export SILENCE_LOG_TAILER=yes
+export VAGRANT_DEFAULT_PROVIDER='vmware_fusion'
+export VAGRANT_VMWARE_CLONE_DIRECTORY='/Users/sven/.vagrant.d/vms'
+
export CC="/usr/bin/gcc"
export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
@@ -23,4 +31,5 @@ export CLASSPATH="/Users/sven/Library/Java/Extensions"
export GOPATH="/Users/sven/Development/play/go"
+export GEMFILE_OAUTH_TOKEN=fb0054b267c7f12dca77267796f676d443d8d29e
export LOCALEAPP_API_KEY=QfVzW8YumwGB20GPwgNAVK5ZEAfKSheRRQJ8qXy9dHIDRKWmEA
View
6 .zsh/functions.zsh
@@ -1,3 +1,9 @@
function zsh_stats() {
history | awk '{print $2}' | sort | uniq -c | sort -rn | head
}
+
+function trvs_show() {
+ local name=$1
+ local sha=$(hk releases -a $name | grep Deploy | tail -n 1 | awk '{ print $7 }')
+ git log --decorate --oneline | grep $sha
+}
View
7 .zshrc
@@ -20,3 +20,10 @@ source ~/.zsh/rbenv.zsh
### Added by the Heroku Toolbelt
export PATH="/usr/local/heroku/bin:$PATH"
+
+# added by travis gem
+source /Users/sven/.travis/travis.sh
+
+if [ -f ./.env ]; then
+ source ./.env
+fi
Please sign in to comment.
Something went wrong with that request. Please try again.