From: Ben Beltran Date: Sun, 10 Aug 2014 22:14:04 +0000 (-0500) Subject: Updates the prezto config X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/a40a5ec5e33473ce65da647d7eda28c8168cd1f6?ds=inline;hp=150c37fac6c34559f5ae754572e9aaa78dd15eb3 Updates the prezto config --- diff --git a/ben-prose.zsh-theme b/ben-prose.zsh-theme deleted file mode 100644 index dc21546..0000000 --- a/ben-prose.zsh-theme +++ /dev/null @@ -1,31 +0,0 @@ -if [ "x$OH_MY_ZSH_HG" = "x" ]; then - OH_MY_ZSH_HG="hg" -fi - -function rvm_info { - echo '('`rvm-prompt`') ' -} - -function box_name { - [ -f ~/.box-name ] && cat ~/.box-name || hostname -s -} - -function zle-line-init zle-keymap-select { - local return_status="%{$fg[red]%}%(?..✘)%{$reset_color%}" - RPS1="${${KEYMAP/vicmd/-- NORMAL --}/(main|viins)/-- INSERT --}${return_status}%{$reset_color%}" - RPS2=$RPS1 - zle reset-prompt -} -zle -N zle-line-init -zle -N zle-keymap-select - -PROMPT=' -%{$fg[red]%}%n%{$reset_color%} at %{$fg[yellow]%}$(box_name)%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) %{$fg[black]%}$(rvm_info)%{$reset_color%} -%(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )$ ' - -ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[blue]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!" -ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?" -ZSH_THEME_GIT_PROMPT_CLEAN="" - diff --git a/gitconfig b/gitconfig index 3be84db..957c18a 100644 --- a/gitconfig +++ b/gitconfig @@ -5,3 +5,5 @@ editor = vim [color] diff = auto +[push] + default = simple diff --git a/prezto b/prezto new file mode 160000 index 0000000..e455514 --- /dev/null +++ b/prezto @@ -0,0 +1 @@ +Subproject commit e455514100092e85d2adaa4771ccaea650b5f9df diff --git a/prompt_ben_setup b/prompt_ben_setup new file mode 100644 index 0000000..3c16c78 --- /dev/null +++ b/prompt_ben_setup @@ -0,0 +1,67 @@ +function prompt_ben_precmd { + git-info +} + +function rvm_info { + echo '('`rvm-prompt v p g`')' +} + +function virtualenv_info { + if [[ -z "$VIRTUAL_ENV" ]]; then + venv="default" + else + venv="${VIRTUAL_ENV##*/}" + fi + echo "(${venv})" +} + +function box_name { + [ -f ~/.box-name ] && cat ~/.box-name || hostname -s +} + +function zle-line-init zle-keymap-select { + local return_status="%{%F{red}%}%(?..✘)%{$reset_color%}" + RPS1="${${KEYMAP/vicmd/-- NORMAL --}/(main|viins)/-- INSERT --}${return_status}%{$reset_color%}" + RPS2=$RPS1 + zle reset-prompt +} +zle -N zle-line-init +zle -N zle-keymap-select + +function prompt_ben_setup { + setopt LOCAL_OPTIONS + unsetopt XTRACE KSH_ARRAYS + prompt_opts=(cr percent subst) + + # Load required functions. + autoload -Uz add-zsh-hook + + # Add hook for calling git-info before each command. + add-zsh-hook precmd prompt_ben_precmd + + # Set git-info parameters. + zstyle ':prezto:module:git:info' verbose 'yes' + zstyle ':prezto:module:git:info:branch' format '@%F{blue}%b%f' + zstyle ':prezto:module:git:info:clean' format '' + zstyle ':prezto:module:git:info:added' format '%{%F{green}%}!' + zstyle ':prezto:module:git:info:modified' format '%{%F{green}%}?' + zstyle ':prezto:module:git:info:untracked' format '%{%F{red}%}?' + zstyle ':prezto:module:git:info:keys' format \ + 'prompt' '%b%a%m%u' + + # Define prompts. + PROMPT=' +%{%F{red}%}%n%{%f%}@%{%F{yellow}%}$(box_name)%{%f%} %{%B%F{green}%}${PWD/#$HOME/~}%{%f%b%}${git_info[prompt]} %{%F{black}%}$(rvm_info)$(virtualenv_info)%{%f%} +%(?,,%{${%B%F{white}%}[%?]%{%f%b%} )$ ' +} + +prompt_ben_setup "$@" + +#setopt PROMPT_SUBST + +ZSH_THEME_GIT_PROMPT_PREFIX="@%{%F{blue}%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{%F{green}%}!" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{%F{green}%}?" +ZSH_THEME_GIT_PROMPT_CLEAN="" + diff --git a/weechat/weechat.log b/weechat/weechat.log deleted file mode 100644 index 016440c..0000000 --- a/weechat/weechat.log +++ /dev/null @@ -1,108 +0,0 @@ -[2013-04-07 01:45:33] weechat 0.3.8 (compiled on Jun 21 2012 18:16:51) -[2013-04-07 01:45:33] Reading configuration file weechat.conf -[2013-04-07 01:45:34] Reading configuration file plugins.conf -[2013-04-07 01:45:34] Reading configuration file alias.conf -[2013-04-07 01:45:34] Reading configuration file aspell.conf -[2013-04-07 01:45:34] Reading configuration file irc.conf -[2013-04-07 01:45:34] Reading configuration file logger.conf -[2013-04-07 01:45:36] Reading configuration file buffers.conf -[2013-04-07 01:45:37] Reading configuration file iset.conf -[2013-04-07 01:45:39] Reading configuration file wg.conf -[2013-04-07 01:45:40] Reading configuration file relay.conf -[2013-04-07 01:45:40] Reading configuration file rmodifier.conf -[2013-04-07 01:45:40] Reading configuration file xfer.conf -[2013-04-07 01:45:48] irc: connecting to server chat.freenode.net/6667... -[2013-04-07 01:46:08] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 01:46:31] irc: connecting to server #r.trees/6667... -[2013-04-07 01:46:41] irc: connecting to server #r.trees/6667... -[2013-04-07 01:47:01] irc: connecting to server #r.trees/6667... -[2013-04-07 01:47:41] irc: connecting to server #r.trees/6667... -[2013-04-07 01:49:01] irc: connecting to server #r.trees/6667... -[2013-04-07 01:51:41] irc: connecting to server #r.trees/6667... -[2013-04-07 01:57:01] irc: connecting to server #r.trees/6667... -[2013-04-07 03:07:41] irc: connecting to server #r.trees/6667... -[2013-04-07 03:29:01] irc: connecting to server #r.trees/6667... -[2013-04-07 03:59:01] irc: connecting to server #r.trees/6667... -[2013-04-07 11:22:55] irc: connecting to server #r.trees/6667... -[2013-04-07 11:25:42] irc: connecting to server chat.freenode.net/6667... -[2013-04-07 11:26:51] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 11:28:11] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 11:29:51] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 11:32:11] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 11:35:51] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 11:42:11] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 11:52:55] irc: connecting to server #r.trees/6667... -[2013-04-07 11:53:51] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 12:16:11] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 12:22:55] irc: connecting to server #r.trees/6667... -[2013-04-07 12:47:11] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 12:52:55] irc: connecting to server #r.trees/6667... -[2013-04-07 13:22:56] irc: connecting to server #r.trees/6667... -[2013-04-07 13:52:56] irc: connecting to server #r.trees/6667... -[2013-04-07 14:22:56] irc: connecting to server #r.trees/6667... -[2013-04-07 14:52:56] irc: connecting to server #r.trees/6667... -[2013-04-07 15:22:57] irc: connecting to server #r.trees/6667... -[2013-04-07 15:52:57] irc: connecting to server #r.trees/6667... -[2013-04-07 16:22:57] irc: connecting to server #r.trees/6667... -[2013-04-07 16:52:57] irc: connecting to server #r.trees/6667... -[2013-04-07 17:06:26] irc: connecting to server chat.freenode.net/6667... -[2013-04-07 17:15:31] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 17:16:51] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 17:18:31] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 17:20:51] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 17:22:57] irc: connecting to server #r.trees/6667... -[2013-04-07 17:24:31] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 17:30:51] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 17:42:31] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 17:52:57] irc: connecting to server #r.trees/6667... -[2013-04-07 18:04:51] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 18:22:57] irc: connecting to server #r.trees/6667... -[2013-04-07 18:35:51] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 18:52:57] irc: connecting to server #r.trees/6667... -[2013-04-07 19:06:51] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 19:07:37] irc: connecting to server chat.freenode.net/6667... -[2013-04-07 19:08:27] irc: connecting to server chat.freenode.net/6667... -[2013-04-07 19:09:37] irc: connecting to server chat.freenode.net/6667... -[2013-04-07 19:11:27] irc: connecting to server chat.freenode.net/6667... -[2013-04-07 19:14:37] irc: connecting to server chat.freenode.net/6667... -[2013-04-07 19:22:57] irc: connecting to server #r.trees/6667... -[2013-04-07 19:37:51] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 19:55:44] irc: connecting to server #r.trees/6667... -[2013-04-07 21:43:54] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 21:43:54] irc: connecting to server #r.trees/6667... -[2013-04-07 22:20:25] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 22:20:25] irc: connecting to server #r.trees/6667... -[2013-04-07 22:27:13] irc: connecting to server chat.freenode.net/6667... -[2013-04-07 22:50:26] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 22:50:26] irc: connecting to server #r.trees/6667... -[2013-04-07 23:23:48] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 23:23:48] irc: connecting to server #r.trees/6667... -[2013-04-07 23:32:57] irc: connecting to server chat.freenode.net/6667... -[2013-04-07 23:53:48] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-07 23:53:48] irc: connecting to server #r.trees/6667... -[2013-04-08 00:23:49] irc: connecting to server #r.trees/6667... -[2013-04-08 07:24:00] irc: connecting to server #r.trees/6667... -[2013-04-08 20:14:02] irc: connecting to server #r.trees/6667... -[2013-04-08 20:14:13] irc: connecting to server chat.freenode.net/6667... -[2013-04-08 20:14:13] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-08 20:14:33] irc: connecting to server chat.freenode.net/6667... -[2013-04-08 20:14:33] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-08 20:16:13] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-08 20:18:33] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-08 20:22:13] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-08 20:28:33] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-08 20:40:13] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-08 20:44:07] irc: connecting to server #r.trees/6667... -[2013-04-08 21:02:33] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-08 21:14:07] irc: connecting to server #r.trees/6667... -[2013-04-08 21:33:33] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-08 21:44:07] irc: connecting to server #r.trees/6667... -[2013-04-08 22:14:07] irc: connecting to server #r.trees/6667... -[2013-04-08 22:44:07] irc: connecting to server #r.trees/6667... -[2013-04-08 23:14:07] irc: connecting to server #r.trees/6667... -[2013-04-08 23:44:07] irc: connecting to server #r.trees/6667... -[2013-04-09 21:24:01] irc: connecting to server #r.trees/6667... -[2013-04-09 21:27:28] irc: connecting to server gameservers.nj.us.quakenet.org/6667... -[2013-04-09 21:28:20] irc: connecting to server chat.freenode.net/6667... -[2013-04-09 21:54:04] irc: connecting to server #r.trees/6667... -[2013-04-09 22:24:04] irc: connecting to server #r.trees/6667... diff --git a/zshrc b/zshrc deleted file mode 100644 index 45b29fd..0000000 --- a/zshrc +++ /dev/null @@ -1,84 +0,0 @@ -# Path to your oh-my-zsh configuration. -ZSH=$HOME/.oh-my-zsh - -# Set name of the theme to load. -# Look in ~/.oh-my-zsh/themes/ -# Optionally, if you set this to "random", it'll load a random theme each -# time that oh-my-zsh is loaded. -export ZSH_THEME="ben-prose" - -# Set to this to use case-sensitive completion -# CASE_SENSITIVE="true" - -# Comment this out to disable weekly auto-update checks -# DISABLE_AUTO_UPDATE="true" - -# 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 disable red dots displayed while waiting for completion -# DISABLE_COMPLETION_WAITING_DOTS="true" - -# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) -# Example format: plugins=(rails git textmate ruby lighthouse) -plugins=(git brew bundler cap gem osx rails3 rvm dircycle command-coloring npm) - -source $ZSH/oh-my-zsh.sh - -# -# Some Custom things saved from my bash profile -# - -export TERM=screen-256color -export JAVA_HOME=$(/usr/libexec/java_home) -export PATH=/usr/local/share/npm/bin:/Users/benbeltran/Projects/nitrogen/bin:/usr/local/bin:/usr/local/sbin:$PATH -export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH -export PYTONPATH=/usr/local/lib/python2.7/site-packages:$PYTHONPATH -export PS1="$PS1"'$([ -n "$TMUX" ] && tmux setenv TMUXPWD_$(tmux display -p "#I_#P") "$PWD")' - -#Editor. -export EDITOR="vim" -export VISUAL="vim" - -#display fortune when I start -echo -e "\033[30m" -/usr/local/bin/fortune -echo -e "\033[m" - -#some aliases. -alias dwarffortress="/Applications/Dwarf\ Fortress/df" -alias ls="ls -FG" -alias rspec="rspec --color" -alias nitro="nitrogen.js" -alias agjs="ag -G \".*\\.js\"" -alias agrb="ag -G \".*\\.js\"" -alias agcss="ag -G \".*\\.css\"" -alias start-occipital="node occipital_server -c /etc/occipital/configuration.json -r -r /Users/benbeltran/Projects/nitrogen/repository_server" -alias spawn-server="python -m SimpleHTTPServer" -alias ta="tmux attach -t " - -#Tmuxinator and RVM scripts -[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm -[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator - -bindkey -v -bindkey '^R' history-incremental-pattern-search-backward - -ggb() { - git grep -n $1 | while IFS=: read i j k; do git blame -L $j,$j $i | cat; done -} - -# -# End of the custom things from my bash profile. -# There's probably a more "zsh-ish" way of doing these, but I have no time. -# - -# The python stuff. -export WORKON_HOME=$HOME/.virtualenvs -export PROJECT_HOME=$HOME/Projects -source /usr/local/bin/virtualenvwrapper.sh - -# Customize to your needs...