Permalink
Browse files

upgrade to yadr 1.0

  • Loading branch information...
forest committed Oct 23, 2012
1 parent fd82380 commit 5113a2d214f8c80ac9336d300688b644fdc360af
View
@@ -40,9 +40,9 @@ task :install do
# yadr configs and aliases
# link yadr/custom/* into ~/.yadr/custom/*
Dir['yadr/custom/*'].each do |folder|
link_folder(folder)
end
# Dir['yadr/custom/*'].each do |folder|
# link_folder(folder)
# end
# run custom setup scripts
Dir['*.sh'].each do |file|
View
@@ -139,7 +139,7 @@
enabled = true
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
View
@@ -55,7 +55,7 @@ zstyle ':prezto:module:editor' keymap 'vi'
#
# Ignore submodules when they are 'dirty', 'untracked', 'all', or 'none'.
# zstyle ':prezto:module:git:ignore' submodule 'all'
# zstyle ':prezto:module:git:status:ignore' submodules 'all'
#
# GNU Utility
@@ -87,6 +87,13 @@ zstyle ':prezto:module:prompt' theme 'steeef'
# Auto start a session when Zsh is launched.
# zstyle ':prezto:module:screen' auto-start 'yes'
#
# GPG-Agent
#
# Enable SSH-Agent protocol emulation.
# zstyle ':prezto:module:gpg-agent' ssh-support 'yes'
#
# SSH-Agent
#
@@ -95,6 +102,7 @@ zstyle ':prezto:module:prompt' theme 'steeef'
# zstyle ':prezto:module:ssh-agent' forwarding 'yes'
# Set ssh-agent identities to load.
# zstyle ':prezto:module:ssh-agent' identities 'id_rsa' 'id_rsa2' 'id_github'
zstyle ':prezto:module:ssh-agent' identities 'id_rsa'
#
@@ -1,8 +1,8 @@
# overrides
alias ash='cat $yadr/zsh/aliases.zsh' #alias show
alias ashc='cat $yadr/custom/zsh/after/aliases.zsh' #alias sho custom
alias ae='vim $yadr/custom/zsh/after/aliases.zsh' #alias edit
alias ar='source $yadr/custom/zsh/after/aliases.zsh' #alias reload
alias ashc='cat $HOME/zsh.after/aliases.zsh' #alias sho custom
alias ae='vim $HOME/zsh.after/aliases.zsh' #alias edit
alias ar='source $HOME/zsh.after/aliases.zsh' #alias reload
# ls
# alias ls='ls -lAhFG'
@@ -11,7 +11,7 @@ alias ar='source $yadr/custom/zsh/after/aliases.zsh' #alias reload
alias reload='exec $SHELL'
# other
alias ipexternal='curl whatismyip.org'
alias myip='curl whatismyip.org'
alias hosts='sudo vim /private/etc/hosts'
# git (not in oh-my-zsh or yard)
@@ -120,3 +120,16 @@ alias pwl='powify logs'
# fasd
alias j='z'
# office machines
alias ldbmaster='ssh dbmaster1.lessonplanet.com'
alias ldbslave='ssh dbslave1.lessonplanet.com'
alias llb1='ssh lb1.lessonplanet.com'
alias lredis='ssh redis1.lessonplanet.com'
alias ljenkins='ssh -p 2222 ci-builder1.lessonplanet.com'
alias lstage2='ssh -p 2223 ci-builder1.lessonplanet.com'
alias lworker='ssh -p 2225 ci-builder1.lessonplanet.com'
# chef
alias knife='nocorrect knife'
File renamed without changes.
View
@@ -0,0 +1 @@
prompt steeef
File renamed without changes.
View
24 zshrc
@@ -12,26 +12,4 @@ fi
# Customize to your needs...
# Cobble togther yadr and prezto until yard does it.
yadr=$HOME/.yadr
# source every zsh file in user's custom/zsh/before. This is useful for setting theme and plugins.
if [[ -d $yadr/custom/zsh/before ]]; then
for config_file ($yadr/custom/zsh/before/*) source $config_file
fi
# Configuration
for config_file ($yadr/zsh/*.zsh) source $config_file
# ------------------
# zsh/after
# ==================
# source every zsh file in user's custom/zsh/after.
if [[ -d $yadr/custom/zsh/after ]]; then
for config_file ($yadr/custom/zsh/after/*) source $config_file
fi
# Put secret configuration settings in ~/.secrets
if [[ -a ~/.secrets ]] then
source ~/.secrets
fi
for config_file ($HOME/.yadr/zsh/*.zsh) source $config_file

0 comments on commit 5113a2d

Please sign in to comment.