From cacc9c628b86c70de5cb902c4dfbdde87ba19a67 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 28 Dec 2013 12:32:06 -0500 Subject: [PATCH 01/34] This is my actual ~/.zshrc, dangit --- zshrc | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 79 insertions(+), 12 deletions(-) diff --git a/zshrc b/zshrc index 480edbc..91f3865 100644 --- a/zshrc +++ b/zshrc @@ -1,13 +1,80 @@ -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=robbyrussell + +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=( + gitfast + ruby + vi-mode + autoenv + bundler + golang + rbenv +) + +source $ZSH/oh-my-zsh.sh + +unsetopt correct_all + +path=( + $HOME/bin + $HOME/.rbenv/bin + $HOME/.rbenv/shims + $HOME/src/gocode/bin + /usr/local/sbin + /usr/local/bin + /usr/sbin + /usr/bin + /sbin + /bin + /usr/games + /usr/local/games +) + +if [ -f ~/.gvm/scripts/gvm ] ; then + source ~/.gvm/scripts/gvm + gvm use go1.2 + if [ -f ~/src/gocode/src/.env ] ; then + unset _GOCODE_DID_SETUP + source ~/src/gocode/src/.env + fi +fi + +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 } From c28d07b10cfd23b0b5a597d3efbcffe617bd4cd3 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 28 Dec 2013 12:32:38 -0500 Subject: [PATCH 02/34] Disabling the gvm bits in bash (for now?) --- bash_profile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bash_profile b/bash_profile index 858a5b7..148634f 100644 --- a/bash_profile +++ b/bash_profile @@ -70,9 +70,9 @@ _bash_profile_main() { get_ssh_agent get_gpg_agent - _source_if_exists "$HOME/.gvm/scripts/gvm" - _source_if_exists "$HOME/.gvmrc" - _source_if_exists "$HOME/src/gocode/src/.env" + #_source_if_exists "$HOME/.gvm/scripts/gvm" + #_source_if_exists "$HOME/.gvmrc" + #_source_if_exists "$HOME/src/gocode/src/.env" unset _get_hostname unset _source_host_specific_rcfile From befd833b5d7861beddefe9837ad42a8e1a184efe Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 28 Dec 2013 12:32:55 -0500 Subject: [PATCH 03/34] Might as well ignore more junk in ~/.janus --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 31c49e7..f74f180 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/janus/go +/janus/* From 6da0a419ce62b329369614ba6c86639a76a6dbd8 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 28 Dec 2013 12:33:25 -0500 Subject: [PATCH 04/34] Aliasing tmux to make powerline worky good --- bash_aliases | 1 + 1 file changed, 1 insertion(+) diff --git a/bash_aliases b/bash_aliases index 024210f..0c43b11 100644 --- a/bash_aliases +++ b/bash_aliases @@ -17,6 +17,7 @@ alias s="cat $HOME/.ssh/config | grep '^Host ' | sed \"s/Host //\" | sort | uniq alias sS='TERM=xterm screen -Rd -S ' alias scr='TERM=xterm screen -Rd' alias sl="screen -ls" +alias tmux='TERM=xterm-256color tmux -2' case "$(uname | tr '[:upper:]' '[:lower:]')" in darwin) From 1f0c5097c2c5c5dfc80a69694067605e73781633 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 28 Dec 2013 12:33:59 -0500 Subject: [PATCH 05/34] Yes, I'm using zsh these days, and I want powerline --- tmux.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tmux.conf b/tmux.conf index 47da08e..741283b 100644 --- a/tmux.conf +++ b/tmux.conf @@ -2,8 +2,8 @@ setw -g mode-keys vi # note to self: learn ye a zsh -set -g default-command /bin/bash -set -g default-shell /bin/bash +set -g default-command /usr/bin/zsh +set -g default-shell /usr/bin/zsh # copy-pasta in a vi-like way unbind [ @@ -24,3 +24,6 @@ set -s escape-time 0 # i forget easily set -g history-limit 100000 + +# colors! +set -g default-terminal 'screen-256color' From 9b974d742a69c47a2afe77e198ea979ef929b5aa Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 28 Dec 2013 12:35:21 -0500 Subject: [PATCH 06/34] Autocmd mapping comma-t for everything else (I hope) --- vimrc.after | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimrc.after b/vimrc.after index 8384cb4..e110443 100644 --- a/vimrc.after +++ b/vimrc.after @@ -4,7 +4,7 @@ set tabstop=4 set shiftwidth=4 set softtabstop=4 -map ,t :w +autocmd FileType * map ,t :w map ,m :w\|:make map ,- :nohl From 707ec42796d797da95b05d7ef00caf62085fc165 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 28 Dec 2013 12:36:17 -0500 Subject: [PATCH 07/34] More comma-t mapping and 80-column crap --- vimrc.after | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/vimrc.after b/vimrc.after index e110443..fbb15a8 100644 --- a/vimrc.after +++ b/vimrc.after @@ -13,12 +13,23 @@ autocmd BufNew,BufRead *.feature,*.rb,*.ru,*.xml,*.html,*.htm,Gemfile,Rakefile,P \| set tabstop=2 \| set softtabstop=2 +autocmd FileType ruby set shiftwidth=2 + \| set tabstop=2 + \| set softtabstop=2 + \| map ,t :RuboCop:w + +autocmd BufNew,BufRead *.ino,*.pde setf arduino + " Set up some sane java compilation bits autocmd BufNew,BufRead *.java set efm=%A\ %#[javac]\ %f:%l:\ %m,%-Z\ %#[javac]\ %p^,%-C%.%# \| set makeprg=ant\ -find\ build.xml -" remap ',t' in Go buffers to do :Fmt first -autocmd BufNew,BufRead *.go map ,t :Fmt:w +" never expand tabs (multiline-strings) and remap ',t' to do :Fmt first in Go +autocmd FileType go set noexpandtab + \| map ,t :Fmt:w + +" add color column for a few file types +autocmd FileType go,python,ruby set colorcolumn=80 " highlighting sbt as scala, too autocmd BufNew,BufRead *.sbt set syn=scala @@ -92,6 +103,7 @@ endfun " call it right away for certain files autocmd FileType python call LambastOver80Wide() autocmd FileType moin call LambastOver80Wide() +" autocmd FileType go call LambastOver80Wide() " autocmd FileType javascript call LambastOver80Wide() " autocmd FileType actionscript call LambastOver80Wide() autocmd FileType mail call LambastOver80Wide() From 3bd64cb38422ac507ada1b8566f30fea8c20cfd8 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 28 Dec 2013 12:37:46 -0500 Subject: [PATCH 08/34] Minor gitconfig tweaks + normalizing whitespace (tabs) --- gitconfig | 122 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 63 insertions(+), 59 deletions(-) diff --git a/gitconfig b/gitconfig index 4ee978b..7ca511f 100644 --- a/gitconfig +++ b/gitconfig @@ -1,80 +1,84 @@ [user] - name = Dan Buch - email = daniel.buch@gmail.com + name = Dan Buch + email = dan@meatballhat.com + +[github] + user = meatballhat [core] - excludesfile = ~/.git-global-ignores - autocrlf = false + excludesfile = ~/.git-global-ignores + autocrlf = false + pager = less -FRX [daemon] - uploadpack = true - uploadarch = true - receivepack = true + uploadpack = true + uploadarch = true + receivepack = true [push] - default = simple + default = tracking [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 + + cm = checkout master + lm = log master.. + + rt = rebase trunk + lt = log trunk.. + ct = checkout svn/trunk + + logv = log --name-status [clean] - requireForce = false + requireForce = false -# vim:filetype=cfg +# vim: set filetype=cfg noexpandtab: From 507145b0db2225a5ac5f6bcb1414dc81e75dabca Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 28 Dec 2013 12:39:39 -0500 Subject: [PATCH 09/34] You know, resolving some conflicts... --- bash_profile | 2 +- gitconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bash_profile b/bash_profile index 148634f..f45010d 100644 --- a/bash_profile +++ b/bash_profile @@ -68,7 +68,7 @@ _bash_profile_main() { _source_bash_extras get_ssh_agent - get_gpg_agent + which gpg-agent && test -d ~/.gnupg && get_gpg_agent #_source_if_exists "$HOME/.gvm/scripts/gvm" #_source_if_exists "$HOME/.gvmrc" diff --git a/gitconfig b/gitconfig index 7ca511f..19c9aeb 100644 --- a/gitconfig +++ b/gitconfig @@ -16,7 +16,7 @@ receivepack = true [push] - default = tracking + default = matching [color] ui = auto From f0257ada1182daf31c3fdff7ac77e9148eff8115 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 28 Dec 2013 12:49:14 -0500 Subject: [PATCH 10/34] Re (?) adding ^R binding in zsh --- zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/zshrc b/zshrc index 91f3865..e3365b4 100644 --- a/zshrc +++ b/zshrc @@ -40,6 +40,7 @@ plugins=( source $ZSH/oh-my-zsh.sh unsetopt correct_all +bindkey '^R' history-incremental-search-backward path=( $HOME/bin From e77de2c918ce8d9e9837fb1d070915e20b189c56 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 8 Feb 2014 18:44:04 -0500 Subject: [PATCH 11/34] Adding completion for travis gem --- zshrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zshrc b/zshrc index e3365b4..abbce87 100644 --- a/zshrc +++ b/zshrc @@ -79,3 +79,6 @@ function dump-ssh-agent() { function load-ssh-agent() { source ~/.ssh/agent.out } + +# added by travis gem +[[ -f ~/.travis/travis.sh ]] && source ~/.travis/travis.sh From 2f68be8e4af6bc7cc0fcf25b5c022f6fbb39c1ea Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 8 Feb 2014 18:45:25 -0500 Subject: [PATCH 12/34] Adding travis gem completion to ~/.bash_profile --- bash_profile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bash_profile b/bash_profile index f45010d..144e7ff 100644 --- a/bash_profile +++ b/bash_profile @@ -83,4 +83,7 @@ _bash_profile_main() { _bash_profile_main +# added by travis gem +[[ -f ~/.travis/travis.sh ]] && source ~/.travis/travis.sh + # vim:filetype=sh From 064b840f5c8096391eccf946dee5968e0f152d86 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 8 Feb 2014 18:45:54 -0500 Subject: [PATCH 13/34] Adding astyle bits for arduino + a smidge of unrelated cleanup --- vimrc.after | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/vimrc.after b/vimrc.after index fbb15a8..031e73c 100644 --- a/vimrc.after +++ b/vimrc.after @@ -20,6 +20,11 @@ autocmd FileType ruby set shiftwidth=2 autocmd BufNew,BufRead *.ino,*.pde setf arduino +autocmd FileType arduino set tabstop=4 + \| set softtabstop=4 + \| let g:syntastic_cpp_check_header=0 + \| map ,t :w:execute '!astyle' shellescape(expand('%'), 1):e:make + " Set up some sane java compilation bits autocmd BufNew,BufRead *.java set efm=%A\ %#[javac]\ %f:%l:\ %m,%-Z\ %#[javac]\ %p^,%-C%.%# \| set makeprg=ant\ -find\ build.xml @@ -50,7 +55,7 @@ endfunction " MyNext() and MyPrev(): Movement between tabs OR buffers function! MyNext() - if exists( '*tabpagenr' ) && tabpagenr('$') != 1 + if exists('*tabpagenr') && tabpagenr('$') != 1 " Tab support && tabs open normal gt else @@ -59,7 +64,7 @@ function! MyNext() endif endfunction function! MyPrev() - if exists( '*tabpagenr' ) && tabpagenr('$') != '1' + if exists('*tabpagenr') && tabpagenr('$') != '1' " Tab support && tabs open normal gT else @@ -72,6 +77,9 @@ endfunction nnoremap L :call MyNext() nnoremap H :call MyPrev() +" astyle the whole thing +map ,a :execute '!astyle' shellescape(expand('%'), 1):e + " easy indentation in visual mode " This keeps the visual selection active after indenting. " Usually the visual selection is lost after you indent it. From ea3b5a76c743748ff040dfde18f3347eff0b04b4 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 15 Feb 2014 19:53:48 -0500 Subject: [PATCH 14/34] zzz --- git-global-ignores | 1 + vimrc.after | 2 ++ zshrc | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/git-global-ignores b/git-global-ignores index 0995b1d..53b2095 100644 --- a/git-global-ignores +++ b/git-global-ignores @@ -5,3 +5,4 @@ tags TAGS *.rbc *.class +.vagrant diff --git a/vimrc.after b/vimrc.after index 031e73c..fca3cce 100644 --- a/vimrc.after +++ b/vimrc.after @@ -18,6 +18,8 @@ autocmd FileType ruby set shiftwidth=2 \| set softtabstop=2 \| map ,t :RuboCop:w +autocmd FileType ruby map ,r :RuboCop + autocmd BufNew,BufRead *.ino,*.pde setf arduino autocmd FileType arduino set tabstop=4 diff --git a/zshrc b/zshrc index abbce87..99a2a6d 100644 --- a/zshrc +++ b/zshrc @@ -28,7 +28,7 @@ COMPLETION_WAITING_DOTS="true" # DISABLE_UNTRACKED_FILES_DIRTY="true" plugins=( - gitfast + git ruby vi-mode autoenv From 88e4ac8215ec6ac6846aa6807948ad9b29e6978f Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sun, 23 Mar 2014 10:41:17 -0400 Subject: [PATCH 15/34] byobu goop --- .gitignore | 1 + byobu/.tmux.conf | 0 byobu/color.tmux | 5 +++++ byobu/keybindings.tmux | 0 byobu/prompt | 1 + 5 files changed, 7 insertions(+) create mode 100644 byobu/.tmux.conf create mode 100644 byobu/color.tmux create mode 100644 byobu/keybindings.tmux create mode 100644 byobu/prompt diff --git a/.gitignore b/.gitignore index f74f180..ea12c4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /janus/* +byobu/.ssh-agent diff --git a/byobu/.tmux.conf b/byobu/.tmux.conf new file mode 100644 index 0000000..e69de29 diff --git a/byobu/color.tmux b/byobu/color.tmux new file mode 100644 index 0000000..a1e60dd --- /dev/null +++ b/byobu/color.tmux @@ -0,0 +1,5 @@ +BYOBU_DARK=black +BYOBU_LIGHT=white +BYOBU_ACCENT=magenta +BYOBU_HIGHLIGHT=red +MONOCHROME=0 \ No newline at end of file diff --git a/byobu/keybindings.tmux b/byobu/keybindings.tmux new file mode 100644 index 0000000..e69de29 diff --git a/byobu/prompt b/byobu/prompt new file mode 100644 index 0000000..c0a7eeb --- /dev/null +++ b/byobu/prompt @@ -0,0 +1 @@ +[ -r /usr/share/byobu/profiles/bashrc ] && . /usr/share/byobu/profiles/bashrc #byobu-prompt# From 4021a7e0b0c39ca4ff8e0bd2d5052f592dc84222 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Wed, 24 Sep 2014 23:38:37 -0400 Subject: [PATCH 16/34] Removing old aspen submodule --- .gitmodules | 3 --- janus/aspen | 1 - 2 files changed, 4 deletions(-) delete mode 160000 janus/aspen diff --git a/.gitmodules b/.gitmodules index 87b7de7..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "janus/aspen"] - path = janus/aspen - url = git://github.com/patcoll/aspen.vim.git diff --git a/janus/aspen b/janus/aspen deleted file mode 160000 index 7225b21..0000000 --- a/janus/aspen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7225b212474c2add040259114061ec1d9a7721d7 From 4dad87874c2712fd9326a476f4876baa73e44b34 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Wed, 24 Sep 2014 23:42:16 -0400 Subject: [PATCH 17/34] Egad boom --- ackrc | 1 - git-global-ignores | 1 + janus/aspen | 1 - janus/protobuf/ftdetect/proto.vim | 91 ------------------- .../syntastic-syntax-checkers-scala.vim.patch | 42 --------- vimrc | 21 +++++ vimrc.after | 2 +- xinitrc | 30 +----- zshrc | 27 ++++-- 9 files changed, 42 insertions(+), 174 deletions(-) delete mode 160000 janus/aspen delete mode 100644 janus/protobuf/ftdetect/proto.vim delete mode 100644 janus/syntastic-syntax-checkers-scala.vim.patch create mode 100644 vimrc diff --git a/ackrc b/ackrc index 4c9eb88..e69de29 100644 --- a/ackrc +++ b/ackrc @@ -1 +0,0 @@ ---all-types diff --git a/git-global-ignores b/git-global-ignores index 53b2095..7d92966 100644 --- a/git-global-ignores +++ b/git-global-ignores @@ -6,3 +6,4 @@ TAGS *.rbc *.class .vagrant +*.swp diff --git a/janus/aspen b/janus/aspen deleted file mode 160000 index 7225b21..0000000 --- a/janus/aspen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7225b212474c2add040259114061ec1d9a7721d7 diff --git a/janus/protobuf/ftdetect/proto.vim b/janus/protobuf/ftdetect/proto.vim deleted file mode 100644 index 19c0d4c..0000000 --- a/janus/protobuf/ftdetect/proto.vim +++ /dev/null @@ -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 - else - command -nargs=+ HiLink hi def link - 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" diff --git a/janus/syntastic-syntax-checkers-scala.vim.patch b/janus/syntastic-syntax-checkers-scala.vim.patch deleted file mode 100644 index a819af5..0000000 --- a/janus/syntastic-syntax-checkers-scala.vim.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7a9d955c0141d4adb148ba0b128d302b82f2f307 Mon Sep 17 00:00:00 2001 -From: Spencer Deinum -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 ---- - 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 - diff --git a/vimrc b/vimrc new file mode 100644 index 0000000..8511c36 --- /dev/null +++ b/vimrc @@ -0,0 +1,21 @@ +syntax on + +filetype on +filetype indent on +filetype plugin on + +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 +map ,- :nohl + +call pathogen#infect() diff --git a/vimrc.after b/vimrc.after index fca3cce..fe8d9bf 100644 --- a/vimrc.after +++ b/vimrc.after @@ -142,7 +142,7 @@ if !has('gui_running') set t_Co=256 "colorscheme gardener "colorscheme inkpot - colorscheme delek + colorscheme molokai endif let g:valgrind_arguments='--leak-check=yes --num-callers=50' diff --git a/xinitrc b/xinitrc index 5197462..04fde2f 100644 --- a/xinitrc +++ b/xinitrc @@ -2,35 +2,7 @@ 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 +exec gnome-session # vim:filetype=sh diff --git a/zshrc b/zshrc index 99a2a6d..3d7c599 100644 --- a/zshrc +++ b/zshrc @@ -44,9 +44,10 @@ bindkey '^R' history-incremental-search-backward path=( $HOME/bin + $HOME/.goenv/bin + $HOME/gopath/bin $HOME/.rbenv/bin $HOME/.rbenv/shims - $HOME/src/gocode/bin /usr/local/sbin /usr/local/bin /usr/sbin @@ -57,14 +58,22 @@ path=( /usr/local/games ) -if [ -f ~/.gvm/scripts/gvm ] ; then - source ~/.gvm/scripts/gvm - gvm use go1.2 - if [ -f ~/src/gocode/src/.env ] ; then - unset _GOCODE_DID_SETUP - source ~/src/gocode/src/.env - fi -fi +#if [ -f ~/.gvm/scripts/gvm ] ; then + #source ~/.gvm/scripts/gvm + #gvm use go1.2 + #if [ -f ~/src/gocode/src/.env ] ; then + #unset _GOCODE_DID_SETUP + #source ~/src/gocode/src/.env + #fi +#fi + +eval "$(goenv init -)" +export GOPATH="$HOME/gopath" + +CDPATH="$HOME/src:$HOME/repos" +for prefix in github.com code.google.com/p ; do + CDPATH="$HOME/gopath/src/$prefix:$CDPATH" +done source ~/.bash_aliases From 94205740000acbb8f877cb2af1da70dee101c9f6 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Thu, 25 Sep 2014 00:14:05 -0400 Subject: [PATCH 18/34] Updates while getting new machine set up whatebbs --- tmux.conf | 4 ++-- zshrc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tmux.conf b/tmux.conf index 741283b..4eb6cbf 100644 --- a/tmux.conf +++ b/tmux.conf @@ -2,8 +2,8 @@ setw -g mode-keys vi # note to self: learn ye a zsh -set -g default-command /usr/bin/zsh -set -g default-shell /usr/bin/zsh +set -g default-command /bin/zsh +set -g default-shell /bin/zsh # copy-pasta in a vi-like way unbind [ diff --git a/zshrc b/zshrc index 3d7c599..4e55642 100644 --- a/zshrc +++ b/zshrc @@ -70,7 +70,7 @@ path=( eval "$(goenv init -)" export GOPATH="$HOME/gopath" -CDPATH="$HOME/src:$HOME/repos" +CDPATH="$HOME/workspace:$HOME/src:$HOME/repos" for prefix in github.com code.google.com/p ; do CDPATH="$HOME/gopath/src/$prefix:$CDPATH" done From 81324225e9b61603b063d9216f156ee1b1320504 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Fri, 26 Sep 2014 20:26:09 -0400 Subject: [PATCH 19/34] Stealing some gitconfig settings from work --- gitconfig | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gitconfig b/gitconfig index 19c9aeb..0aedc74 100644 --- a/gitconfig +++ b/gitconfig @@ -7,16 +7,23 @@ [core] excludesfile = ~/.git-global-ignores + editor = vim + filemode = true autocrlf = false pager = less -FRX +[branch] + autosetuprebase = remote + autosetupmerge = true + mergeoptions = --no-commit --no-ff + [daemon] uploadpack = true uploadarch = true receivepack = true [push] - default = matching + default = current [color] ui = auto @@ -77,7 +84,6 @@ logv = log --name-status - [clean] requireForce = false From 04dfcf94cfbbcff52b7ac7019076880b4a9450e0 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 29 Sep 2014 22:53:33 -0400 Subject: [PATCH 20/34] Trivial goop in gitconfig --- gitconfig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gitconfig b/gitconfig index 0aedc74..0b12d94 100644 --- a/gitconfig +++ b/gitconfig @@ -12,6 +12,9 @@ autocrlf = false pager = less -FRX +[clean] + requireForce = false + [branch] autosetuprebase = remote autosetupmerge = true @@ -75,6 +78,8 @@ spush = svn dcommit srb = rebase git-svn + rpo = remote prune origin + cm = checkout master lm = log master.. @@ -84,7 +89,4 @@ logv = log --name-status -[clean] - requireForce = false - # vim: set filetype=cfg noexpandtab: From b66805c52c799e79fa99754a059833ad9bc62cce Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Tue, 30 Sep 2014 22:23:54 -0400 Subject: [PATCH 21/34] Yes I depend on backspace I am a bad person --- vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/vimrc b/vimrc index 8511c36..87e4709 100644 --- a/vimrc +++ b/vimrc @@ -4,6 +4,7 @@ filetype on filetype indent on filetype plugin on +set backspace=indent,eol,start set directory^=~/.vim/_temp// set hlsearch set ignorecase From 57dbc0368fc9dd971a7410aa666d93739ee0d9c6 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Tue, 30 Sep 2014 22:27:46 -0400 Subject: [PATCH 22/34] Why not have some Travis action --- .travis.yml | 2 ++ Makefile | 18 +++++------------- todo.cfg | 3 +-- xinitrc | 8 -------- 4 files changed, 8 insertions(+), 23 deletions(-) create mode 100644 .travis.yml delete mode 100644 xinitrc diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..544909e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,2 @@ +--- +language: c diff --git a/Makefile b/Makefile index 3e71321..c7b84cf 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,13 @@ -SOURCES := $(shell ls | egrep -v 'README|Makefile') +SOURCES := $(shell ls | grep -E -v 'README|Makefile') TARGETS := $(patsubst %,$(HOME)/.%,$(SOURCES)) - $(HOME)/.%: % - ln -sv $(PWD)/'$^' '$@' - - -all: $(TARGETS) $(HOME)/.janus/go + if [[ ! -e '$@' ]] ; then ln -sv '$(PWD)/$^' '$@' ; fi +.PHONY: all +all: $(TARGETS) +.PHONY: echo echo: @echo SOURCES=$(SOURCES) @echo TARGETS=$(TARGETS) - - -$(HOME)/.janus/go: - test -n "$$GOROOT" && ln -sv $$GOROOT/misc/vim ~/.janus/go ; true - - -.PHONY: all echo diff --git a/todo.cfg b/todo.cfg index 10c89fe..ca65303 100644 --- a/todo.cfg +++ b/todo.cfg @@ -1,8 +1,7 @@ # === EDIT FILE LOCATIONS BELOW === # Your todo.txt directory -#export TODO_DIR="/Users/gina/Documents/todo" -export TODO_DIR="$HOME/Dropbox/buchfam/todo" +export TODO_DIR="$HOME/Dropbox/dan/todo" # Your todo/done/report.txt locations export TODO_FILE="$TODO_DIR/todo.txt" diff --git a/xinitrc b/xinitrc deleted file mode 100644 index 04fde2f..0000000 --- a/xinitrc +++ /dev/null @@ -1,8 +0,0 @@ -test -f /etc/rc.conf && source /etc/rc.conf -setxkbmap ${KEYMAP-dvorak} - - -exec gnome-session - - -# vim:filetype=sh From a77884de04f9e2529e3667800333057a4d8d0606 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Tue, 30 Sep 2014 22:32:38 -0400 Subject: [PATCH 23/34] Maybe we'll try this --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 544909e..bc4614a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,3 @@ --- -language: c +language: generic +script: make From 6b98ca459f3aec0c6e753ac80c74df04b75cc60f Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Tue, 30 Sep 2014 22:34:15 -0400 Subject: [PATCH 24/34] docker worker yey --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bc4614a..14f571b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ --- language: generic +sudo: false script: make From 39aa7597b3e2fa77f59759fcfeb8ac2880bd1577 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Tue, 30 Sep 2014 22:37:55 -0400 Subject: [PATCH 25/34] Simplifying linking bit --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c7b84cf..0d594bf 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SOURCES := $(shell ls | grep -E -v 'README|Makefile') TARGETS := $(patsubst %,$(HOME)/.%,$(SOURCES)) $(HOME)/.%: % - if [[ ! -e '$@' ]] ; then ln -sv '$(PWD)/$^' '$@' ; fi + $(RM) '$@' && ln -svf '$(PWD)/$^' '$@' .PHONY: all all: $(TARGETS) From 700658defc760ddd7b0c2b5fec2ef26b28b1f7cf Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 6 Oct 2014 14:34:11 -0400 Subject: [PATCH 26/34] zsh and git foo --- bashrc | 3 +++ gitconfig | 2 +- zshrc | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bashrc b/bashrc index b48afa3..fd2ad40 100644 --- a/bashrc +++ b/bashrc @@ -12,3 +12,6 @@ then fi # vim:filetype=sh + +### Added by the Heroku Toolbelt +export PATH="/usr/local/heroku/bin:$PATH" diff --git a/gitconfig b/gitconfig index 0b12d94..b7f6857 100644 --- a/gitconfig +++ b/gitconfig @@ -1,6 +1,6 @@ [user] name = Dan Buch - email = dan@meatballhat.com + email = daniel.buch@gmail.com [github] user = meatballhat diff --git a/zshrc b/zshrc index 4e55642..5f46424 100644 --- a/zshrc +++ b/zshrc @@ -38,6 +38,7 @@ plugins=( ) source $ZSH/oh-my-zsh.sh +[[ -e ~/.zshenv ]] && source ~/.zshenv unsetopt correct_all bindkey '^R' history-incremental-search-backward @@ -70,7 +71,7 @@ path=( eval "$(goenv init -)" export GOPATH="$HOME/gopath" -CDPATH="$HOME/workspace:$HOME/src:$HOME/repos" +CDPATH="$HOME/workspace:$HOME/src:$HOME/Development/src:$HOME/repos" for prefix in github.com code.google.com/p ; do CDPATH="$HOME/gopath/src/$prefix:$CDPATH" done From 110244ebd661531aa8be7da647477defb1cf7181 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 6 Oct 2014 15:24:23 -0400 Subject: [PATCH 27/34] more zshrc cleanup --- zshrc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/zshrc b/zshrc index 5f46424..f9fc88c 100644 --- a/zshrc +++ b/zshrc @@ -38,7 +38,6 @@ plugins=( ) source $ZSH/oh-my-zsh.sh -[[ -e ~/.zshenv ]] && source ~/.zshenv unsetopt correct_all bindkey '^R' history-incremental-search-backward @@ -59,15 +58,6 @@ path=( /usr/local/games ) -#if [ -f ~/.gvm/scripts/gvm ] ; then - #source ~/.gvm/scripts/gvm - #gvm use go1.2 - #if [ -f ~/src/gocode/src/.env ] ; then - #unset _GOCODE_DID_SETUP - #source ~/src/gocode/src/.env - #fi -#fi - eval "$(goenv init -)" export GOPATH="$HOME/gopath" @@ -90,5 +80,7 @@ function load-ssh-agent() { source ~/.ssh/agent.out } +[[ -e ~/.zshenv ]] && source ~/.zshenv + # added by travis gem [[ -f ~/.travis/travis.sh ]] && source ~/.travis/travis.sh From 10e4fad35d2eb6d037ccb4cacb8a0675f33eb6fa Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Wed, 12 Nov 2014 11:00:11 -0500 Subject: [PATCH 28/34] Yet more changes changes changes wat --- gemrc | 2 +- gitconfig | 2 ++ gittemplate | 9 +++++++++ vimrc | 4 ++++ zshrc | 9 +++++++++ 5 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gittemplate diff --git a/gemrc b/gemrc index 4635fc5..882316e 100644 --- a/gemrc +++ b/gemrc @@ -1 +1 @@ -gem: --no-rdoc --ri +gem: --no-rdoc --no-ri diff --git a/gitconfig b/gitconfig index b7f6857..d4ab999 100644 --- a/gitconfig +++ b/gitconfig @@ -90,3 +90,5 @@ logv = log --name-status # vim: set filetype=cfg noexpandtab: +[commit] + template = /Users/me/.gittemplate diff --git a/gittemplate b/gittemplate new file mode 100644 index 0000000..da61024 --- /dev/null +++ b/gittemplate @@ -0,0 +1,9 @@ +# 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. diff --git a/vimrc b/vimrc index 87e4709..5bdda52 100644 --- a/vimrc +++ b/vimrc @@ -19,4 +19,8 @@ set textwidth=67 map ,t :w map ,- :nohl +let g:go_fmt_command = "goimports" + call pathogen#infect() + +colo summerfruit256 diff --git a/zshrc b/zshrc index f9fc88c..834a65f 100644 --- a/zshrc +++ b/zshrc @@ -37,8 +37,15 @@ plugins=( rbenv ) +fpath=(/usr/local/share/zsh/site-functions $fpath) + source $ZSH/oh-my-zsh.sh +# 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 @@ -66,6 +73,8 @@ for prefix in github.com code.google.com/p ; do CDPATH="$HOME/gopath/src/$prefix:$CDPATH" done +export GPG_TTY=$(tty) + source ~/.bash_aliases function dump-ssh-agent() { From f7946f23f5aecb6c72ffc5b4ef50ef34d33938a4 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Thu, 4 Dec 2014 10:11:43 -0500 Subject: [PATCH 29/34] *time-based commit* :boom: --- git-global-ignores | 1 + gittemplate | 2 ++ zshrc | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/git-global-ignores b/git-global-ignores index 7d92966..a3e3f8c 100644 --- a/git-global-ignores +++ b/git-global-ignores @@ -7,3 +7,4 @@ TAGS *.class .vagrant *.swp +.DS_Store diff --git a/gittemplate b/gittemplate index da61024..8818fed 100644 --- a/gittemplate +++ b/gittemplate @@ -1,3 +1,5 @@ + + # 50-character subject line # # 72-character wrapped longer description. This should answer: diff --git a/zshrc b/zshrc index 834a65f..90285d0 100644 --- a/zshrc +++ b/zshrc @@ -69,7 +69,7 @@ eval "$(goenv init -)" export GOPATH="$HOME/gopath" CDPATH="$HOME/workspace:$HOME/src:$HOME/Development/src:$HOME/repos" -for prefix in github.com code.google.com/p ; do +for prefix in github.com github.com/travis-ci github.com/meatballhat code.google.com/p ; do CDPATH="$HOME/gopath/src/$prefix:$CDPATH" done From b17b5736ec20dd0470b25a26cc213855414f930a Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Tue, 3 Feb 2015 11:19:06 -0500 Subject: [PATCH 30/34] moar #hugops all the time :heart: :heart: :heart: --- gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/gitconfig b/gitconfig index d4ab999..8184b63 100644 --- a/gitconfig +++ b/gitconfig @@ -88,6 +88,7 @@ ct = checkout svn/trunk logv = log --name-status + hug = blame # vim: set filetype=cfg noexpandtab: [commit] From 19a722eb7f546a6dec79628378a15e801243f504 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Tue, 3 Feb 2015 11:20:36 -0500 Subject: [PATCH 31/34] Switch to gimme --- zshrc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zshrc b/zshrc index 90285d0..4342a20 100644 --- a/zshrc +++ b/zshrc @@ -51,7 +51,6 @@ bindkey '^R' history-incremental-search-backward path=( $HOME/bin - $HOME/.goenv/bin $HOME/gopath/bin $HOME/.rbenv/bin $HOME/.rbenv/shims @@ -65,7 +64,7 @@ path=( /usr/local/games ) -eval "$(goenv init -)" +eval "$(gimme 1.4.1)" 2>/dev/null export GOPATH="$HOME/gopath" CDPATH="$HOME/workspace:$HOME/src:$HOME/Development/src:$HOME/repos" @@ -93,3 +92,6 @@ function load-ssh-agent() { # added by travis gem [[ -f ~/.travis/travis.sh ]] && source ~/.travis/travis.sh + +# added by travis gem +[ -f /Users/me/.travis/travis.sh ] && source /Users/me/.travis/travis.sh From 2ade61352b1fd08640bd42f70d7dc04b9f76c33f Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Tue, 3 Feb 2015 11:20:51 -0500 Subject: [PATCH 32/34] travis gem integration bit --- bashrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bashrc b/bashrc index fd2ad40..21c5690 100644 --- a/bashrc +++ b/bashrc @@ -15,3 +15,6 @@ fi ### Added by the Heroku Toolbelt export PATH="/usr/local/heroku/bin:$PATH" + +# added by travis gem +[ -f /Users/me/.travis/travis.sh ] && source /Users/me/.travis/travis.sh From 777f86082bb1e687d673e5cac43b71b84def6cdc Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Wed, 25 Feb 2015 08:31:00 -0500 Subject: [PATCH 33/34] Yet more oh my zsh plugins --- zshrc | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/zshrc b/zshrc index 4342a20..77bc328 100644 --- a/zshrc +++ b/zshrc @@ -28,13 +28,31 @@ COMPLETION_WAITING_DOTS="true" # DISABLE_UNTRACKED_FILES_DIRTY="true" plugins=( - git - ruby - vi-mode autoenv + aws bundler + cabal + command-not-found + cp + docker + gem + git + git-hubflow golang + heroku + osx + pip + postgres + python + rails + rake-fast rbenv + redis-cli + rsync + ruby + tmux + vagrant + vi-mode ) fpath=(/usr/local/share/zsh/site-functions $fpath) From 44d3d31ffe4a0bc692224ebaeb3f489328a4258d Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Tue, 18 Aug 2015 20:14:39 -0400 Subject: [PATCH 34/34] What even is a commit message --- git-global-ignores | 1 + gitconfig | 3 ++- meatballhat.zsh-theme | 7 +++++++ vimrc | 1 + zshrc | 24 +++++++++++++++++------- 5 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 meatballhat.zsh-theme diff --git a/git-global-ignores b/git-global-ignores index a3e3f8c..1905e5c 100644 --- a/git-global-ignores +++ b/git-global-ignores @@ -8,3 +8,4 @@ TAGS .vagrant *.swp .DS_Store +.~lock* diff --git a/gitconfig b/gitconfig index 8184b63..6de28c9 100644 --- a/gitconfig +++ b/gitconfig @@ -10,7 +10,7 @@ editor = vim filemode = true autocrlf = false - pager = less -FRX + pager = less -FRXx2 [clean] requireForce = false @@ -89,6 +89,7 @@ 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: set filetype=cfg noexpandtab: [commit] diff --git a/meatballhat.zsh-theme b/meatballhat.zsh-theme new file mode 100644 index 0000000..283563e --- /dev/null +++ b/meatballhat.zsh-theme @@ -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]%})" diff --git a/vimrc b/vimrc index 5bdda52..2f9d28c 100644 --- a/vimrc +++ b/vimrc @@ -18,6 +18,7 @@ set textwidth=67 map ,t :w map ,- :nohl +map ,w :%s/ *$// let g:go_fmt_command = "goimports" diff --git a/zshrc b/zshrc index 77bc328..aecce74 100644 --- a/zshrc +++ b/zshrc @@ -1,5 +1,5 @@ ZSH=$HOME/.oh-my-zsh -ZSH_THEME=robbyrussell +ZSH_THEME=meatballhat CASE_SENSITIVE="true" @@ -40,6 +40,8 @@ plugins=( git-hubflow golang heroku + hk + knife osx pip postgres @@ -59,6 +61,8 @@ 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 @@ -72,6 +76,7 @@ path=( $HOME/gopath/bin $HOME/.rbenv/bin $HOME/.rbenv/shims + $HOME/.phpenv/bin /usr/local/sbin /usr/local/bin /usr/sbin @@ -82,7 +87,14 @@ path=( /usr/local/games ) -eval "$(gimme 1.4.1)" 2>/dev/null +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" @@ -108,8 +120,6 @@ function load-ssh-agent() { [[ -e ~/.zshenv ]] && source ~/.zshenv -# added by travis gem -[[ -f ~/.travis/travis.sh ]] && source ~/.travis/travis.sh - -# added by travis gem -[ -f /Users/me/.travis/travis.sh ] && source /Users/me/.travis/travis.sh +[ -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