Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Modify to work with YADR

  • Loading branch information...
commit d8ed9b708232f260291baa26b6d8e00a129f662e 1 parent c070e33
@cantoraz authored
View
4 _bash_aliases
@@ -1,3 +1,5 @@
+# vim:ft=conf
+
case "$SHELL" in
'/bin/bash')
alias ls='ls -G'
@@ -11,4 +13,4 @@ alias ll='ls -l'
alias lh='ls -lh'
alias vi='vim'
alias crontab='EDITOR=/usr/bin/vim crontab'
-alias tailf='tail -f'
+alias tailf='tail -f'
View
4 _bash_path
@@ -17,3 +17,7 @@ fi
if [[ -d "$HOME/Applications/Argyll_V1.3.3/bin" ]]; then
PATH="$HOME/Applications/Argyll_V1.3.3/bin":$PATH
fi
+
+# Tools from YADR. Append them as last to avoid mix up preferred tools
+[[ -d "$YADR/bin" ]] && PATH=$PATH:"$YADR/bin"
+[[ -d "$YADR/bin/yadr" ]] && PATH=$PATH:"$YADR/bin/yadr"
View
10 _bash_yadr
@@ -0,0 +1,10 @@
+# vim:ft=conf
+
+# YADR HOME
+export YADR="$HOME/.yadr"
+
+# Load selected bash-compatible zsh conf from YADR
+# Alias
+source "$YADR/zsh/aliases.zsh"
+source "$YADR/zsh/color-man-pages.zsh"
+source "$YADR/zsh/fasd.zsh"
View
10 _bashrc
@@ -52,6 +52,7 @@ if [ -f `brew --prefix`/etc/bash_completion ]; then
source `brew --prefix`/etc/bash_completion
fi
+# Use VIM as default editor for console utilities
export EDITOR=vim
# Virtualenvwrapper
@@ -68,6 +69,9 @@ esac
# Load RVM into a shell session *as a function*
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-if [[ -d "$HOME/Applications/rsense-0.3" ]]; then
- export RSENSE_HOME=$HOME/Applications/rsense-0.3
-fi
+# Load selected bash-compatible zsh conf from YADR
+[[ -f "$HOME/.bash_yadr" ]] && source "$HOME/.bash_yadr"
+
+# if [[ -d "$HOME/Applications/rsense-0.3" ]]; then
+# export RSENSE_HOME=$HOME/Applications/rsense-0.3
+# fi
View
120 _gitconfig
@@ -1,9 +1,117 @@
+# Most taken from YADR: https://github.com/skwp/dotfiles/blob/master/git/gitconfig
+
[user]
- name = Cantoraz Chou
- email = cantoraz@gmail.com
+ name = Cantoraz Chou
+ email = cantoraz@gmail.com
[color]
- ui = auto
+ ui = true
+[color "branch"]
+ current = yellow reverse
+ local = yellow
+ remote = green
+[color "diff"]
+ meta = yellow bold
+ frag = magenta bold
+ old = red bold
+ new = green bold
+[alias]
+ # add
+ a = add # add
+ chunkyadd = add --patch # stage commits chunk by chunk
+
+ # branch
+ b = branch -v # branch (verbose)
+
+ # commit
+ c = commit -m # commit with message
+ ca = commit -am # commit all with message
+ ci = commit # commit
+ amend = commit --amend # ammend your last commit
+ ammend = commit --amend # ammend your last commit
+
+ # checkout
+ co = checkout # checkout
+ nb = checkout -b # create and switch to a new branch (mnemonic: "git new branch branchname...")
+
+ # cherry-pick
+ cp = cherry-pick -x # grab a change from a branch
+
+ # diff
+ d = diff # diff unstaged changes
+ dc = diff --cached # diff staged changes
+ last = diff HEAD^ # diff last committed change
+
+ # log
+ l = log --graph --date=short
+ changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
+ short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
+ changelog = log --pretty=format:\" * %s\"
+ shortnocolor = log --pretty=format:\"%h %cr %cn %s\"
+
+ # pull
+ pl = pull # pull
+
+ # push
+ ps = push # push
+
+ # rebase
+ rc = rebase --continue # continue rebase
+ rs = rebase --skip # skip rebase
+
+ # remote
+ r = remote -v # show remotes (verbose)
+
+ # reset
+ unstage = reset HEAD # remove files from index (tracking)
+ uncommit = reset --soft HEAD^ # go back before last commit, with files in uncommitted state
+ filelog = log -u # show changes to a file
+ mt = mergetool # fire up the merge tool
+
+ # stash
+ ss = stash # stash changes
+ sl = stash list # list stashes
+ sa = stash apply # apply stash (restore changes)
+ sd = stash drop # drop stashes (destory changes)
+
+ # status
+ s = status # status
+ st = status # status
+ stat = status # status
+
+ # tag
+ t = tag -n # show tags with <n> lines of each tag message
+
+ # svn helpers
+ svnr = svn rebase
+ svnd = svn dcommit
+ svnl = svn log --oneline --show-commit
+[format]
+ pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset
[merge]
- tool = mvimdiff
-[mergetool "mvimdiff"]
- cmd = mvim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
+# tool = mvimdiff
+ summary = true
+ verbosity = 1
+#[mergetool "mvimdiff"]
+# cmd = mvim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
+[apply]
+ whitespace = nowarn
+[branch]
+ autosetupmerge = true
+[push]
+ # 'git push' will push the current branch to its tracking branch
+ # the usual default is to push all branches
+ default = tracking
+[core]
+ autocrlf = false
+ editor = vim
+# excludesfile = ~/.yadr/git/gitignore
+[advice]
+ statusHints = false
+[diff]
+ # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
+ # instead of a/b/c/d as prefixes for patches
+ mnemonicprefix = true
+[rerere]
+ # Remember my merges
+ # http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/
+ enabled = true
View
34 _gitignore
@@ -0,0 +1,34 @@
+# Taken from YADR: https://github.com/skwp/dotfiles/blob/master/git/gitignore
+
+# OSX taken from: https://github.com/github/gitignore/blob/master/Global/OSX.gitignore
+# ----------------------------------------------------------------------------------------------
+.DS_Store
+# Thumbnails
+._*
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Windows taken from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
+# ----------------------------------------------------------------------------------------------
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Tags taken from: https://github.com/github/gitignore/blob/master/Global/Tags.gitignore
+# ----------------------------------------------------------------------------------------------
+# Ignore tags created by etags and ctags
+TAGS
+tags
+
+# Vim taken from: https://github.com/github/gitignore/blob/master/Global/vim.gitignore
+# ----------------------------------------------------------------------------------------------
+.*.sw[a-z]
+*.un~
+Session.vim
+
+# SASS
+# ----------------------------------------------------------------------------------------------
+.sass-cache
View
4 _vimrc.after
@@ -0,0 +1,4 @@
+" This configuration file cooperates with YADR!
+" Extracted settings from .vimrc in my own dotfiles
+
+
Please sign in to comment.
Something went wrong with that request. Please try again.