Dan Buch
8 years ago
commit
08907faa6f
@ -1 +1,2 @@
|
||||
/janus/go
|
||||
/janus/*
|
||||
byobu/.ssh-agent
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
[submodule "janus/aspen"]
|
||||
path = janus/aspen
|
||||
url = git://github.com/patcoll/aspen.vim.git
|
||||
@ -0,0 +1,4 @@
|
||||
---
|
||||
language: generic
|
||||
sudo: false
|
||||
script: make
|
||||
@ -0,0 +1,5 @@
|
||||
BYOBU_DARK=black
|
||||
BYOBU_LIGHT=white
|
||||
BYOBU_ACCENT=magenta
|
||||
BYOBU_HIGHLIGHT=red
|
||||
MONOCHROME=0
|
||||
@ -0,0 +1 @@
|
||||
[ -r /usr/share/byobu/profiles/bashrc ] && . /usr/share/byobu/profiles/bashrc #byobu-prompt#
|
||||
@ -1,80 +1,96 @@
|
||||
[user]
|
||||
name = Dan Buch
|
||||
email = daniel.buch@gmail.com
|
||||
name = Dan Buch
|
||||
email = daniel.buch@gmail.com
|
||||
|
||||
[github]
|
||||
user = meatballhat
|
||||
|
||||
[core]
|
||||
excludesfile = ~/.git-global-ignores
|
||||
autocrlf = false
|
||||
excludesfile = ~/.git-global-ignores
|
||||
editor = vim
|
||||
filemode = true
|
||||
autocrlf = false
|
||||
pager = less -FRXx2
|
||||
|
||||
[clean]
|
||||
requireForce = false
|
||||
|
||||
[branch]
|
||||
autosetuprebase = remote
|
||||
autosetupmerge = true
|
||||
mergeoptions = --no-commit --no-ff
|
||||
|
||||
[daemon]
|
||||
uploadpack = true
|
||||
uploadarch = true
|
||||
receivepack = true
|
||||
uploadpack = true
|
||||
uploadarch = true
|
||||
receivepack = true
|
||||
|
||||
[push]
|
||||
default = matching
|
||||
default = current
|
||||
|
||||
[color]
|
||||
ui = auto
|
||||
ui = auto
|
||||
|
||||
[color "branch"]
|
||||
current = yellow reverse
|
||||
local = yellow
|
||||
remote = green
|
||||
current = yellow reverse
|
||||
local = yellow
|
||||
remote = green
|
||||
|
||||
[color "diff"]
|
||||
meta = yellow bold
|
||||
frag = magenta bold
|
||||
old = red bold
|
||||
new = green bold
|
||||
meta = yellow bold
|
||||
frag = magenta bold
|
||||
old = red bold
|
||||
new = green bold
|
||||
|
||||
[color "status"]
|
||||
added = yellow
|
||||
changed = green
|
||||
untracked = cyan
|
||||
added = yellow
|
||||
changed = green
|
||||
untracked = cyan
|
||||
|
||||
[alias]
|
||||
a = add
|
||||
ad = add
|
||||
addd = add
|
||||
br = branch
|
||||
bra = branch -a
|
||||
brr = branch -r
|
||||
ci = commit
|
||||
co = checkout
|
||||
d = diff
|
||||
dc = diff --cached
|
||||
di = diff
|
||||
dif = diff
|
||||
l = ls-files
|
||||
ls = ls-files
|
||||
nuke = clean -dfx
|
||||
pr = pull --rebase
|
||||
s = status --short
|
||||
st = status
|
||||
sta = stash
|
||||
stcq = diff --cached --name-only
|
||||
stq = diff --name-only
|
||||
t = tag
|
||||
ta = tag
|
||||
tags = tag
|
||||
|
||||
slog = log git-svn..
|
||||
sup = svn fetch --all
|
||||
spush = svn dcommit
|
||||
srb = rebase git-svn
|
||||
|
||||
cm = checkout master
|
||||
lm = log master..
|
||||
|
||||
rt = rebase trunk
|
||||
lt = log trunk..
|
||||
ct = checkout svn/trunk
|
||||
|
||||
logv = log --name-status
|
||||
a = add
|
||||
ad = add
|
||||
addd = add
|
||||
br = branch
|
||||
bra = branch -a
|
||||
brr = branch -r
|
||||
ci = commit
|
||||
co = checkout
|
||||
d = diff
|
||||
dc = diff --cached
|
||||
di = diff
|
||||
dif = diff
|
||||
l = ls-files
|
||||
ls = ls-files
|
||||
nuke = clean -dfx
|
||||
pr = pull --rebase
|
||||
s = status --short
|
||||
st = status
|
||||
sta = stash
|
||||
stcq = diff --cached --name-only
|
||||
stq = diff --name-only
|
||||
t = tag
|
||||
ta = tag
|
||||
tags = tag
|
||||
|
||||
slog = log git-svn..
|
||||
sup = svn fetch --all
|
||||
spush = svn dcommit
|
||||
srb = rebase git-svn
|
||||
|
||||
[clean]
|
||||
requireForce = false
|
||||
rpo = remote prune origin
|
||||
|
||||
cm = checkout master
|
||||
lm = log master..
|
||||
|
||||
rt = rebase trunk
|
||||
lt = log trunk..
|
||||
ct = checkout svn/trunk
|
||||
|
||||
logv = log --name-status
|
||||
hug = blame
|
||||
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
||||
|
||||
# vim:filetype=cfg
|
||||
# vim: set filetype=cfg noexpandtab:
|
||||
[commit]
|
||||
template = /Users/me/.gittemplate
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
|
||||
|
||||
# 50-character subject line
|
||||
#
|
||||
# 72-character wrapped longer description. This should answer:
|
||||
#
|
||||
# - Why was this change necessary?
|
||||
# - How does it address the problem?
|
||||
# - Are there any side effects?
|
||||
#
|
||||
# Include a link to the ticket, if any.
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 7225b212474c2add040259114061ec1d9a7721d7
|
||||
@ -1,91 +0,0 @@
|
||||
" Protocol Buffers - Google's data interchange format
|
||||
" Copyright 2008 Google Inc.
|
||||
"
|
||||
" Licensed under the Apache License, Version 2.0 (the "License");
|
||||
" you may not use this file except in compliance with the License.
|
||||
" You may obtain a copy of the License at
|
||||
"
|
||||
" http:"www.apache.org/licenses/LICENSE-2.0
|
||||
"
|
||||
" Unless required by applicable law or agreed to in writing, software
|
||||
" distributed under the License is distributed on an "AS IS" BASIS,
|
||||
" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
" See the License for the specific language governing permissions and
|
||||
" limitations under the License.
|
||||
|
||||
" This is the Vim syntax file for Google Protocol Buffers.
|
||||
"
|
||||
" Usage:
|
||||
"
|
||||
" 1. cp proto.vim ~/.vim/syntax/
|
||||
" 2. Add the following to ~/.vimrc:
|
||||
"
|
||||
" augroup filetype
|
||||
" au! BufRead,BufNewFile *.proto setfiletype proto
|
||||
" augroup end
|
||||
"
|
||||
" Or just create a new file called ~/.vim/ftdetect/proto.vim with the
|
||||
" previous lines on it.
|
||||
|
||||
if version < 600
|
||||
syntax clear
|
||||
elseif exists("b:current_syntax")
|
||||
finish
|
||||
endif
|
||||
|
||||
syn case match
|
||||
|
||||
syn keyword pbTodo contained TODO FIXME XXX
|
||||
syn cluster pbCommentGrp contains=pbTodo
|
||||
|
||||
syn keyword pbSyntax syntax import option
|
||||
syn keyword pbStructure package message group
|
||||
syn keyword pbRepeat optional required repeated
|
||||
syn keyword pbDefault default
|
||||
syn keyword pbExtend extend extensions to max
|
||||
syn keyword pbRPC service rpc returns
|
||||
|
||||
syn keyword pbType int32 int64 uint32 uint64 sint32 sint64
|
||||
syn keyword pbType fixed32 fixed64 sfixed32 sfixed64
|
||||
syn keyword pbType float double bool string bytes
|
||||
syn keyword pbTypedef enum
|
||||
syn keyword pbBool true false
|
||||
|
||||
syn match pbInt /-\?\<\d\+\>/
|
||||
syn match pbInt /\<0[xX]\x+\>/
|
||||
syn match pbFloat /\<-\?\d*\(\.\d*\)\?/
|
||||
" TODO: .proto also supports C-style block comments;
|
||||
" see /usr/share/vim/vim70/syntax/c.vim for how it's done.
|
||||
syn region pbComment start="//" skip="\\$" end="$" keepend contains=@pbCommentGrp
|
||||
syn region pbString start=/"/ skip=/\\"/ end=/"/
|
||||
syn region pbString start=/'/ skip=/\\'/ end=/'/
|
||||
|
||||
if version >= 508 || !exists("did_proto_syn_inits")
|
||||
if version < 508
|
||||
let did_proto_syn_inits = 1
|
||||
command -nargs=+ HiLink hi link <args>
|
||||
else
|
||||
command -nargs=+ HiLink hi def link <args>
|
||||
endif
|
||||
|
||||
HiLink pbTodo Todo
|
||||
|
||||
HiLink pbSyntax Include
|
||||
HiLink pbStructure Structure
|
||||
HiLink pbRepeat Repeat
|
||||
HiLink pbDefault Keyword
|
||||
HiLink pbExtend Keyword
|
||||
HiLink pbRPC Keyword
|
||||
HiLink pbType Type
|
||||
HiLink pbTypedef Typedef
|
||||
HiLink pbBool Boolean
|
||||
|
||||
HiLink pbInt Number
|
||||
HiLink pbFloat Float
|
||||
HiLink pbComment Comment
|
||||
HiLink pbString String
|
||||
|
||||
delcommand HiLink
|
||||
endif
|
||||
|
||||
let b:current_syntax = "proto"
|
||||
@ -1,42 +0,0 @@
|
||||
From 7a9d955c0141d4adb148ba0b128d302b82f2f307 Mon Sep 17 00:00:00 2001
|
||||
From: Spencer Deinum <spencerdeinum@gmail.com>
|
||||
Date: Thu, 30 Aug 2012 00:43:12 -0400
|
||||
Subject: [PATCH] Edited scala checker to use scalac, with the
|
||||
-Ystop-after:refchecks option.
|
||||
|
||||
This means syntax checking is done via the compiler instead of the
|
||||
interpreter, so it won't choke on things like package definitions.
|
||||
|
||||
The -Ystop-after:refchecks option will stop before code is actually
|
||||
generated, so we don't emit any class files.
|
||||
|
||||
Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>
|
||||
---
|
||||
syntax_checkers/scala.vim | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/syntax_checkers/scala.vim b/syntax_checkers/scala.vim
|
||||
index f6f05af..d603246 100644
|
||||
--- a/syntax_checkers/scala.vim
|
||||
+++ b/syntax_checkers/scala.vim
|
||||
@@ -15,7 +15,7 @@ endif
|
||||
let loaded_scala_syntax_checker = 1
|
||||
|
||||
"bail if the user doesnt have the scala binary installed
|
||||
-if !executable("scala")
|
||||
+if !executable("scalac")
|
||||
finish
|
||||
endif
|
||||
|
||||
@@ -24,7 +24,7 @@ if !exists("g:syntastic_scala_options")
|
||||
endif
|
||||
|
||||
function! SyntaxCheckers_scala_GetLocList()
|
||||
- let makeprg = 'scala '. g:syntastic_scala_options .' '. shellescape(expand('%')) . ' /dev/null'
|
||||
+ let makeprg = 'scalac -Ystop-after:refchecks '. g:syntastic_scala_options .' '. shellescape(expand('%'))
|
||||
|
||||
let errorformat = '%f\:%l: %trror: %m'
|
||||
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -0,0 +1,7 @@
|
||||
local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)"
|
||||
PROMPT='$(date -u +%Y-%m-%dT%H:%M:%S) ${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
|
||||
|
||||
ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
|
||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}🙀 %{$reset_color%}"
|
||||
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
|
||||
@ -0,0 +1,27 @@
|
||||
syntax on
|
||||
|
||||
filetype on
|
||||
filetype indent on
|
||||
filetype plugin on
|
||||
|
||||
set backspace=indent,eol,start
|
||||
set directory^=~/.vim/_temp//
|
||||
set hlsearch
|
||||
set ignorecase
|
||||
set incsearch
|
||||
set laststatus=2
|
||||
set nowrap
|
||||
set number
|
||||
set smartcase
|
||||
set tabstop=4
|
||||
set textwidth=67
|
||||
|
||||
map ,t :w<CR>
|
||||
map ,- :nohl<CR>
|
||||
map ,w :%s/ *$//<CR>
|
||||
|
||||
let g:go_fmt_command = "goimports"
|
||||
|
||||
call pathogen#infect()
|
||||
|
||||
colo summerfruit256
|
||||
@ -1,36 +0,0 @@
|
||||
test -f /etc/rc.conf && source /etc/rc.conf
|
||||
setxkbmap ${KEYMAP-dvorak}
|
||||
|
||||
|
||||
DEFAULT="ratpoison"
|
||||
|
||||
|
||||
case "$1" in
|
||||
awe*)
|
||||
exec awesome
|
||||
;;
|
||||
evil*)
|
||||
exec evilwm
|
||||
;;
|
||||
open*)
|
||||
exec openbox-session
|
||||
;;
|
||||
win*)
|
||||
exec wmaker
|
||||
;;
|
||||
flux*)
|
||||
exec startfluxbox
|
||||
;;
|
||||
gno*)
|
||||
exec gnome-session
|
||||
;;
|
||||
rat*)
|
||||
exec ratpoison
|
||||
;;
|
||||
*)
|
||||
exec $DEFAULT
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
# vim:filetype=sh
|
||||
@ -1,13 +1,125 @@
|
||||
HISTFILE=~/.zsh-histfile
|
||||
HISTSIZE=10000
|
||||
SAVEHIST=100000
|
||||
setopt appendhistory extendedglob nomatch
|
||||
unsetopt autocd beep notify
|
||||
bindkey -v
|
||||
autoload -Uz compinit
|
||||
compinit
|
||||
|
||||
export PS1="\$ "
|
||||
function precmd() {
|
||||
echo "$USER@$HOST:$(truncpwd)"
|
||||
ZSH=$HOME/.oh-my-zsh
|
||||
ZSH_THEME=meatballhat
|
||||
|
||||
CASE_SENSITIVE="true"
|
||||
|
||||
# Comment this out to disable bi-weekly auto-update checks
|
||||
# DISABLE_AUTO_UPDATE="true"
|
||||
|
||||
# Uncomment to change how often before auto-updates occur? (in days)
|
||||
export UPDATE_ZSH_DAYS=3
|
||||
|
||||
# Uncomment following line if you want to disable colors in ls
|
||||
# DISABLE_LS_COLORS="true"
|
||||
|
||||
# Uncomment following line if you want to disable autosetting terminal title.
|
||||
DISABLE_AUTO_TITLE="true"
|
||||
|
||||
# Uncomment following line if you want to disable command autocorrection
|
||||
DISABLE_CORRECTION="true"
|
||||
|
||||
# Uncomment following line if you want red dots to be displayed while waiting
|
||||
# for completion
|
||||
COMPLETION_WAITING_DOTS="true"
|
||||
|
||||
# Uncomment following line if you want to disable marking untracked files under
|
||||
# VCS as dirty. This makes repository status check for large repositories much,
|
||||
# much faster.
|
||||
# DISABLE_UNTRACKED_FILES_DIRTY="true"
|
||||
|
||||
plugins=(
|
||||
autoenv
|
||||
aws
|
||||
bundler
|
||||
cabal
|
||||
command-not-found
|
||||
cp
|
||||
docker
|
||||
gem
|
||||
git
|
||||
git-hubflow
|
||||
golang
|
||||
heroku
|
||||
hk
|
||||
knife
|
||||
osx
|
||||
pip
|
||||
postgres
|
||||
python
|
||||
rails
|
||||
rake-fast
|
||||
rbenv
|
||||
redis-cli
|
||||
rsync
|
||||
ruby
|
||||
tmux
|
||||
vagrant
|
||||
vi-mode
|
||||
)
|
||||
|
||||
fpath=(/usr/local/share/zsh/site-functions $fpath)
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
unalias gb
|
||||
|
||||
# The completion for aws is not compatible with $fpath :scream_cat:
|
||||
if [[ -f /usr/local/share/zsh/site-functions/_aws ]] ; then
|
||||
source /usr/local/share/zsh/site-functions/_aws
|
||||
fi
|
||||
|
||||
unsetopt correct_all
|
||||
bindkey '^R' history-incremental-search-backward
|
||||
|
||||
path=(
|
||||
$HOME/bin
|
||||
$HOME/gopath/bin
|
||||
$HOME/.rbenv/bin
|
||||
$HOME/.rbenv/shims
|
||||
$HOME/.phpenv/bin
|
||||
/usr/local/sbin
|
||||
/usr/local/bin
|
||||
/usr/sbin
|
||||
/usr/bin
|
||||
/sbin
|
||||
/bin
|
||||
/usr/games
|
||||
/usr/local/games
|
||||
)
|
||||
|
||||
if which pyenv > /dev/null ; then
|
||||
eval "$(pyenv init -)"
|
||||
fi
|
||||
export PYENV_ROOT='/usr/local/var/pyenv'
|
||||
|
||||
eval "$(phpenv init -)"
|
||||
|
||||
eval "$(gimme 1.4.2)" 2>/dev/null
|
||||
export GOPATH="$HOME/gopath"
|
||||
|
||||
CDPATH="$HOME/workspace:$HOME/src:$HOME/Development/src:$HOME/repos"
|
||||
for prefix in github.com github.com/travis-ci github.com/meatballhat code.google.com/p ; do
|
||||
CDPATH="$HOME/gopath/src/$prefix:$CDPATH"
|
||||
done
|
||||
|
||||
export GPG_TTY=$(tty)
|
||||
|
||||
source ~/.bash_aliases
|
||||
|
||||
function dump-ssh-agent() {
|
||||
env | awk '/SSH/ {
|
||||
sub(/=/, "=\"", $1)
|
||||
sub(/$/, "\"", $1)
|
||||
print "export " $1
|
||||
}' | tee ~/.ssh/agent.out
|
||||
}
|
||||
|
||||
function load-ssh-agent() {
|
||||
source ~/.ssh/agent.out
|
||||
}
|
||||
|
||||
[[ -e ~/.zshenv ]] && source ~/.zshenv
|
||||
|
||||
[ -f ~/.travis/travis.sh ] && source ~/.travis/travis.sh
|
||||
[ -f ~/google-cloud-sdk/path.zsh.inc ] && source ~/google-cloud-sdk/path.zsh.inc
|
||||
[ -f ~/google-cloud-sdk/completion.zsh.inc ] && source ~/google-cloud-sdk/completion.zsh.inc
|
||||
|
||||
Loading…
Reference in new issue