From 8c55134cdd84996b529b3c24ac50a0e413d4f6f3 Mon Sep 17 00:00:00 2001 From: Jeff Byrnes Date: Wed, 25 Jul 2012 01:26:20 -0400 Subject: [PATCH] Merge in current dotfiles settings Manual copy & paste of current settings. Gotta start somewhere --- .aliases | 5 +-- .bash_profile | 10 ++++++ .exports | 12 +++++-- .git.scmbrc | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ .gitconfig | 23 +++++++++++--- .scmbrc | 12 +++++++ 6 files changed, 141 insertions(+), 9 deletions(-) create mode 100644 .git.scmbrc create mode 100644 .scmbrc diff --git a/.aliases b/.aliases index 626fcac1330..275511944bb 100644 --- a/.aliases +++ b/.aliases @@ -7,8 +7,8 @@ alias ~="cd ~" # `cd` is probably faster to type though alias -- -="cd -" # Shortcuts -alias d="cd ~/Documents/Dropbox" -alias p="cd ~/Projects" +alias d="cd ~/Dropbox" +alias p="cd ~/Sites" alias g="git" alias h="history" alias j="jobs" @@ -35,6 +35,7 @@ alias la="ls -la ${colorflag}" alias lsd='ls -l ${colorflag} | grep "^d"' # Always use color output for `ls` +# [ "$TERM" = "xterm" ] && TERM="xterm-256color" alias ls="command ls ${colorflag}" export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:' diff --git a/.bash_profile b/.bash_profile index 7ed0a405144..1894937cacf 100644 --- a/.bash_profile +++ b/.bash_profile @@ -25,6 +25,9 @@ done export LC_ALL="en_US.UTF-8" export LANG="en_US" +# Enable SCM Breeze +[ -s "$HOME/.scm_breeze/scm_breeze.sh" ] && source "$HOME/.scm_breeze/scm_breeze.sh" + # Add tab completion for SSH hostnames based on ~/.ssh/config, ignoring wildcards [ -e "$HOME/.ssh/config" ] && complete -o "default" -o "nospace" -W "$(grep "^Host" ~/.ssh/config | grep -v "[?*]" | cut -d " " -f2)" scp sftp ssh @@ -37,3 +40,10 @@ complete -o "nospace" -W "Finder Dock Mail Safari iTunes iCal Address\ Book Syst # If possible, add tab completion for many more commands [ -f /etc/bash_completion ] && source /etc/bash_completion + +# Source the git bash completion file +# if [ -f /usr/local/etc/bash_completion.d/git-completion.bash ]; then +# source /usr/local/etc/bash_completion.d/git-completion.bash +# GIT_PS1_SHOWDIRTYSTATE=true +# PS1='\[\e[0;31m\]\h:\[\e[m\]\[\e[0;34m\]\W$(__git_ps1 " (%s)")\[\e[m\]\n\[\e[0;30m\]\u\[\e[m\]\[\e[1;30m\]\$\[\e[m\] ' +# fi diff --git a/.exports b/.exports index e7d59b79b5a..fb8e69aefcf 100644 --- a/.exports +++ b/.exports @@ -1,5 +1,7 @@ -# Make vim the default editor -export EDITOR="vim" +# Make Sublime Text 2 the default editor +# the -w bit ensures we wait until returning to the prompt +# to proceed with any commands (good for commits, etc.) +export EDITOR="subl -w" # Don’t clear the screen after quitting a manual page export MANPAGER="less -X" # Highlight section titles in manual pages @@ -10,4 +12,8 @@ export HISTSIZE=32768 export HISTFILESIZE=$HISTSIZE export HISTCONTROL=ignoredups # Make some commands not show up in history -export HISTIGNORE="ls:ls *:cd:cd -:pwd;exit:date:* --help" \ No newline at end of file +export HISTIGNORE="ls:ls *:cd:cd -:pwd;exit:date:* --help" + +# Set the directory defaults for Sass +export SASS_DIRECTORY="_scss" +export CSS_DIRECTORY="css" \ No newline at end of file diff --git a/.git.scmbrc b/.git.scmbrc new file mode 100644 index 00000000000..5efbd31bf29 --- /dev/null +++ b/.git.scmbrc @@ -0,0 +1,88 @@ +# +# Git File Shortcuts Config +# ---------------------------------------------- +# - Set your preferred prefix for env variable file shortcuts. +# (I chose 'e' because it is easy to slide your finger to it from '$'.) +export git_env_char="e" +# - Max changes before reverting to 'git status'. git_status_shortcuts() may slow down for lots of changes. +export gs_max_changes="99" +# - When using the git_add_shorcuts() command, automatically invoke 'git rm' to remove deleted files? +export ga_auto_remove="yes" + + +# Git Index Config +# ---------------------------------------------- +# Repos will be automatically added from this directory. +export GIT_REPO_DIR="$HOME/Sites" +# Add the full paths of any extra repos to GIT_REPOS, separated with ':' +# e.g. "/opt/rails/project:/opt/rails/another project:$HOME/other/repo" +export GIT_REPOS="" +export git_status_command="git_status_shortcuts" +# Alias +git_index_alias="c" # Switch to a repo in the (c)ode directory + + +# Git Aliases +# ---------------------------------------------- +git_alias="g" + +# 1. 'SCM Breeze' functions +git_status_shortcuts_alias="gs" +git_add_shortcuts_alias="ga" +git_add_patch_shortcuts_alias="gap" +git_show_files_alias="gsf" +exec_git_expand_args_alias="ge" +# 2. Commands that handle paths (with shortcut args expanded) +git_checkout_alias="gco" +git_checkout_branch_alias="gcob" +git_commit_alias="gc" +git_reset_alias="grs" +git_reset_del_alias="grs-" +git_reset_hard_alias="grsh" +git_rm_alias="grm" +git_blame_alias="gbl" +git_diff_alias="gd" +git_diff_cached_alias="gdc" +# 3. Standard commands +git_clone_alias="gcl" +git_fetch_alias="gf" +git_fetch_all_alias="gfa" +git_fetch_and_rebase_alias="gfr" +git_pull_alias="gpl" +git_push_alias="gps" +git_pull_then_push_alias="gpls" +git_status_original_alias="gst" +git_status_short_alias="gss" +git_clean_alias="gce" +git_clean_force_alias="gcef" +git_add_all_alias="gaa" +git_commit_all_alias="gca" +git_commit_amend_alias="gcm" +git_commit_amend_no_msg_alias="gcmh" +git_commit_no_msg_alias="gch" +git_remote_alias="gr" +git_branch_alias="gb" +git_branch_all_alias="gba" +git_rebase_alias="grb" +git_rebase_alias_continue="grbc" +git_rebase_alias_abort="grba" +git_merge_alias="gm" +git_cherry_pick_alias="gcp" +git_log_alias="gl" +git_log_stat_alias="gls" +git_log_graph_alias="glg" +git_show_alias="gsh" + + +# Git Keyboard Shortcuts +# ---------------------------------------------- +# Keyboard shortcuts are on by default. Set this to 'false' to disable them. +git_keyboard_shortcuts_enabled="true" +git_commit_all_keys="\C-x " # CTRL+x, SPACE +git_add_and_commit_keys="\C-xc" # CTRL+x, c + + +# Bash Command Wrapping +# ---------------------------------------------- +# Expand numbered args for common bash commands +bash_command_wrapping_enabled="true" diff --git a/.gitconfig b/.gitconfig index dfad4d740ca..724f25ee7c3 100644 --- a/.gitconfig +++ b/.gitconfig @@ -21,6 +21,19 @@ credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f" # Undo a `git push` undopush = push -f origin HEAD^:master + # Various other shorthands + st = status + ci = commit + br = branch + co = checkout + mr = merge + df = diff + dc = diff --cached + lg = log -p + lol = log --graph --decorate --pretty=oneline --abbrev-commit + lola = log --graph --decorate --pretty=oneline --abbrev-commit --all + ls = ls-files + sta = stash [apply] # Detect whitespace errors when applying a patch @@ -31,7 +44,7 @@ excludesfile = ~/.gitignore attributesfile = ~/.gitattributes # Treat spaces before tabs, lines that are indented with 8 or more spaces, and all kinds of trailing whitespace as an error - whitespace = space-before-tab,indent-with-non-tab,trailing-space + whitespace = -indent-with-non-tab,trailing-space [color] # Use colors in Git commands that are capable of colored output when outputting to the terminal @@ -45,18 +58,20 @@ frag = magenta bold old = red bold new = green bold + whitespace = white reverse [color "status"] added = yellow changed = green untracked = cyan + branch = magenta [merge] # Include summaries of merged commits in newly created merge commit messages log = true # Use `origin` as the default remote on the `master` branch in all cases -[branch "master"] - remote = origin - merge = refs/heads/master +# [branch "master"] +# remote = origin +# merge = refs/heads/master # URL shorthands [url "git@github.com:"] diff --git a/.scmbrc b/.scmbrc new file mode 100644 index 00000000000..190372fa4cb --- /dev/null +++ b/.scmbrc @@ -0,0 +1,12 @@ +# +# Design Assets Management Config +# ---------------------------------------------------------------- +# Directory where design assets are stored +export root_design_dir="$HOME/Dropbox/Design" +# Directory where symlinks are created within each project +export project_design_dir="design_assets" +# Directories for per-project design assets +export design_base_dirs="Images Backgrounds Mockups Screenshots" +export design_av_dirs="Animations Videos Flash Music Samples" +# Directories for global design assets (not symlinked into projects) +export design_ext_dirs="Fonts IconSets"