From f2b02d28e60b543c83ed7840b484c728263deb09 Mon Sep 17 00:00:00 2001 From: Matt McManus Date: Wed, 15 Aug 2012 08:29:55 -0400 Subject: [PATCH 01/11] Tweaking the prompt --- system/bash_prompt.symlink | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/bash_prompt.symlink b/system/bash_prompt.symlink index f11a63a..e51bda7 100644 --- a/system/bash_prompt.symlink +++ b/system/bash_prompt.symlink @@ -76,4 +76,4 @@ function parse_git_branch() { git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/\1$(parse_git_dirty)/" } -PS1="\n\[${BLUE}\]\u \[$WHITE\]at \[$ORANGE\]\h \[$WHITE\]in \[$CYAN\]\w\[$WHITE\]\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on \")\[$GREEN\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]" \ No newline at end of file +PS1="\n\[${BLUE}\]\u\[$WHITE\] @ \[$ORANGE\]\h\[$WHITE\] : \[$CYAN\]\w\[$WHITE\]\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on \")\[$GREEN\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]" From e03f2907ae8c62156eb2101cc32853b4fcdad885 Mon Sep 17 00:00:00 2001 From: Matt McManus Date: Wed, 15 Aug 2012 13:41:18 -0400 Subject: [PATCH 02/11] Path and osx tweaks --- osx/set-defaults.sh | 10 +++++----- system/exports.symlink | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/osx/set-defaults.sh b/osx/set-defaults.sh index 133f131..40535ca 100755 --- a/osx/set-defaults.sh +++ b/osx/set-defaults.sh @@ -87,10 +87,10 @@ defaults -currentHost write NSGlobalDomain com.apple.mouse.tapBehavior -int 1 defaults write NSGlobalDomain com.apple.mouse.tapBehavior -int 1 # Map bottom right Trackpad corner to right-click -defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadCornerSecondaryClick -int 2 -defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadRightClick -bool true -defaults -currentHost write NSGlobalDomain com.apple.trackpad.trackpadCornerClickBehavior -int 1 -defaults -currentHost write NSGlobalDomain com.apple.trackpad.enableSecondaryClick -bool true +#defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadCornerSecondaryClick -int 2 +#defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadRightClick -bool true +#defaults -currentHost write NSGlobalDomain com.apple.trackpad.trackpadCornerClickBehavior -int 1 +#defaults -currentHost write NSGlobalDomain com.apple.trackpad.enableSecondaryClick -bool true # Require password immediately after sleep or screen saver begins defaults write com.apple.screensaver askForPassword -int 1 @@ -246,4 +246,4 @@ hash tmutil &> /dev/null && sudo tmutil disablelocal # Kill affected applications for app in Finder Dock Mail Safari iTunes iCal Address\ Book SystemUIServer; do killall "$app" > /dev/null 2>&1; done -echo "Done. Note that some of these changes require a logout/restart to take effect." \ No newline at end of file +echo "Done. Note that some of these changes require a logout/restart to take effect." diff --git a/system/exports.symlink b/system/exports.symlink index 238fd91..c061b91 100644 --- a/system/exports.symlink +++ b/system/exports.symlink @@ -14,10 +14,11 @@ export HISTIGNORE="ls:ls *:cd:cd -:pwd;exit:date:* --help" # Node Config PATH=$PATH:~/local/bin +PATH=$PATH:~/.dotfiles/bin export PATH PREFIX=~/local export PREFIX N_PREFIX=~/local -export N_PREFIX \ No newline at end of file +export N_PREFIX From e1128ae410a1352837c45cb74747d88983048fba Mon Sep 17 00:00:00 2001 From: Matt McManus Date: Wed, 5 Sep 2012 14:05:39 -0400 Subject: [PATCH 03/11] Disabling animations in finder --- osx/set-defaults.sh | 3 +++ vim/vim.symlink/.netrwhist | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 vim/vim.symlink/.netrwhist diff --git a/osx/set-defaults.sh b/osx/set-defaults.sh index 40535ca..a460347 100755 --- a/osx/set-defaults.sh +++ b/osx/set-defaults.sh @@ -53,6 +53,9 @@ defaults write NSGlobalDomain NSTextShowsControlCharacters -bool true # Disable opening and closing window animations defaults write NSGlobalDomain NSAutomaticWindowAnimationsEnabled -bool false +#Disable window animations and Get Info animations in Finder: +defaults write com.apple.finder DisableAllAnimations -bool true + # Increase window resize speed for Cocoa applications defaults write NSGlobalDomain NSWindowResizeTime -float 0.001 diff --git a/vim/vim.symlink/.netrwhist b/vim/vim.symlink/.netrwhist new file mode 100644 index 0000000..fa80428 --- /dev/null +++ b/vim/vim.symlink/.netrwhist @@ -0,0 +1,3 @@ +let g:netrw_dirhistmax =10 +let g:netrw_dirhist_cnt =1 +let g:netrw_dirhist_1='/opt/local/etc/php5' From 196a6fc65d74fb1b907b7465c74703cc224bee84 Mon Sep 17 00:00:00 2001 From: Matt McManus Date: Wed, 5 Sep 2012 14:06:42 -0400 Subject: [PATCH 04/11] SVN aliases --- system/aliases.symlink | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/aliases.symlink b/system/aliases.symlink index 1fbf65a..e0da921 100644 --- a/system/aliases.symlink +++ b/system/aliases.symlink @@ -112,4 +112,6 @@ alias mysqlstop='/opt/local/bin/mysqladmin5 -u root -proot shutdown' # SVN alias svn-upi='svn up --ignore-externals' -alias svn-sadd="svn stat | grep ? | awk '{ print \$2 }' | xargs svn add" \ No newline at end of file +alias svn-sadd="svn stat | grep ? | awk '{ print \$2 }' | xargs svn add" +alias svn-sti='svn st --ignore-externals' +alias svn-ee='svn pe svn:externals .' From 0d108ba5dca6c3e52d3737b83c7c2dd287a2c55f Mon Sep 17 00:00:00 2001 From: Matt McManus Date: Wed, 5 Sep 2012 14:07:09 -0400 Subject: [PATCH 05/11] Moved macports export to exports file --- system/bash_profile.symlink | 3 --- system/exports.symlink | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/system/bash_profile.symlink b/system/bash_profile.symlink index a5843af..9636979 100644 --- a/system/bash_profile.symlink +++ b/system/bash_profile.symlink @@ -29,6 +29,3 @@ complete -W "NSGlobalDomain" defaults complete -o "nospace" -W "Finder Dock Mail Safari iTunes iCal Address\ Book SystemUIServer" killall [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function - -# Macports -export PATH=/opt/local/bin:/opt/local/sbin:/opt/local/apache2/bin:$PATH diff --git a/system/exports.symlink b/system/exports.symlink index c061b91..16d5a6a 100644 --- a/system/exports.symlink +++ b/system/exports.symlink @@ -12,11 +12,15 @@ export HISTCONTROL=ignoredups # Make some commands not show up in history export HISTIGNORE="ls:ls *:cd:cd -:pwd;exit:date:* --help" + # Node Config -PATH=$PATH:~/local/bin +PATH=~/local/bin:$PATH PATH=$PATH:~/.dotfiles/bin export PATH +#macports +export PATH=/opt/local/bin:/opt/local/sbin:/opt/local/apache2/bin:/opt/local/lib/php/pear/bin:$PATH + PREFIX=~/local export PREFIX From cce0f4f6dea1946dd84b3e13d341a755b27831c4 Mon Sep 17 00:00:00 2001 From: Matt McManus Date: Wed, 5 Sep 2012 14:07:19 -0400 Subject: [PATCH 06/11] Added RVM to path --- system/bashrc.symlink | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/bashrc.symlink b/system/bashrc.symlink index c77cd04..c2e0640 100644 --- a/system/bashrc.symlink +++ b/system/bashrc.symlink @@ -1 +1,2 @@ -[ -n "$PS1" ] && source ~/.bash_profile \ No newline at end of file +[ -n "$PS1" ] && source ~/.bash_profile +PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting From 207fc66d948281add0d89197f8a400606e86675e Mon Sep 17 00:00:00 2001 From: Matt McManus Date: Mon, 10 Sep 2012 11:59:20 -0400 Subject: [PATCH 07/11] Added two new helper scripts --- bin/start-dev | 4 ++++ bin/w2h-fresh | 6 ++++++ system/bash_profile.symlink | 9 +++++++++ 3 files changed, 19 insertions(+) create mode 100755 bin/start-dev create mode 100755 bin/w2h-fresh diff --git a/bin/start-dev b/bin/start-dev new file mode 100755 index 0000000..8a9dc4d --- /dev/null +++ b/bin/start-dev @@ -0,0 +1,4 @@ +#!/bin/sh + +sudo apachectl start +sudo /opt/local/bin/mysqld_safe5 \ No newline at end of file diff --git a/bin/w2h-fresh b/bin/w2h-fresh new file mode 100755 index 0000000..7320029 --- /dev/null +++ b/bin/w2h-fresh @@ -0,0 +1,6 @@ +#!/bin/sh + +svn up +./symfony w2h:sync-prod +./symfony project:permissions +./symfony cc \ No newline at end of file diff --git a/system/bash_profile.symlink b/system/bash_profile.symlink index 9636979..635ca36 100644 --- a/system/bash_profile.symlink +++ b/system/bash_profile.symlink @@ -29,3 +29,12 @@ complete -W "NSGlobalDomain" defaults complete -o "nospace" -W "Finder Dock Mail Safari iTunes iCal Address\ Book SystemUIServer" killall [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function + +# {{{ +# Node Completion - Auto-generated, do not touch. +shopt -s progcomp +for f in $(command ls ~/.node-completion); do + f="$HOME/.node-completion/$f" + test -f "$f" && . "$f" +done +# }}} From ceb663a39e454e661204238699f002d68b3dad33 Mon Sep 17 00:00:00 2001 From: Matt McManus Date: Thu, 13 Sep 2012 11:06:29 -0400 Subject: [PATCH 08/11] Updated w2h helper script and added new node_env variable --- bin/w2h-fresh | 25 +++++++++++++++++++++---- system/exports.symlink | 2 ++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/bin/w2h-fresh b/bin/w2h-fresh index 7320029..ea7e1c4 100755 --- a/bin/w2h-fresh +++ b/bin/w2h-fresh @@ -1,6 +1,23 @@ #!/bin/sh -svn up -./symfony w2h:sync-prod -./symfony project:permissions -./symfony cc \ No newline at end of file +echo ' --> SVN Update' +svn up -q + +echo ' --> W2H: Syncing Prod' +./symfony w2h:sync-prod -q + +echo ' --> Doctrine: Migrate' +./symfony doctrine:migrate -q + +echo ' --> Doctrine: Build all classes' +./symfony doctrine:build --all-classes -q + +echo ' --> W2H: Project Permissions' +./symfony project:permissions -q + +echo ' --> W2H: Cleaing Cache' +./symfony cc -q + +echo '- - - - - - - - - - - - - - - - - - - - - - - -' +echo ' COMPLETE. So clean, so fresh. GO TO WORK!' +echo '- - - - - - - - - - - - - - - - - - - - - - - -' diff --git a/system/exports.symlink b/system/exports.symlink index 16d5a6a..9c37eb2 100644 --- a/system/exports.symlink +++ b/system/exports.symlink @@ -18,6 +18,8 @@ PATH=~/local/bin:$PATH PATH=$PATH:~/.dotfiles/bin export PATH +export NODE_ENV="development" + #macports export PATH=/opt/local/bin:/opt/local/sbin:/opt/local/apache2/bin:/opt/local/lib/php/pear/bin:$PATH From 10fa6ed60ad77f2c76a624998a8d8bd2789a95dc Mon Sep 17 00:00:00 2001 From: Matt McManus Date: Thu, 13 Sep 2012 12:43:00 -0300 Subject: [PATCH 09/11] Fixing type --- bin/w2h-fresh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/w2h-fresh b/bin/w2h-fresh index ea7e1c4..af5ab8c 100755 --- a/bin/w2h-fresh +++ b/bin/w2h-fresh @@ -15,7 +15,7 @@ echo ' --> Doctrine: Build all classes' echo ' --> W2H: Project Permissions' ./symfony project:permissions -q -echo ' --> W2H: Cleaing Cache' +echo ' --> W2H: Cleaning Cache' ./symfony cc -q echo '- - - - - - - - - - - - - - - - - - - - - - - -' From 62d4325024a15928eefba419b1696a59cb954502 Mon Sep 17 00:00:00 2001 From: Matt McManus Date: Mon, 17 Sep 2012 12:33:41 -0400 Subject: [PATCH 10/11] Added symfony bash completion --- bash_completion/symfony_complete.symlink | 21 +++++++++++++++++++++ bin/stop-dev | 4 ++++ system/bash_profile.symlink | 4 ++++ 3 files changed, 29 insertions(+) create mode 100644 bash_completion/symfony_complete.symlink create mode 100644 bin/stop-dev diff --git a/bash_completion/symfony_complete.symlink b/bash_completion/symfony_complete.symlink new file mode 100644 index 0000000..e57d517 --- /dev/null +++ b/bash_completion/symfony_complete.symlink @@ -0,0 +1,21 @@ +# Bash symfony completion +# +_symfony() +{ + local cmds cur colonprefixes + + cmds="$( ${COMP_WORDS[0]} | perl -ne 'if( /^([a-zA-Z0-9\-]+)/ ) { $first = $1; } elsif ( /^\s*(:[a-zA-Z0-9\-]+)/ ) { print $first . $1 . "\n"; }' )" + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + # Work-around bash_completion issue where bash interprets a colon as a separator. + # Work-around borrowed from the darcs work-around for the same issue. + colonprefixes=${cur%"${cur##*:}"} + COMPREPLY=( $(compgen -W '$cmds' -- $cur)) + local i=${#COMPREPLY[*]} + while [ $((--i)) -ge 0 ]; do + COMPREPLY[$i]=${COMPREPLY[$i]#"$colonprefixes"} + done + + return 0 +} && +complete -F _symfony symfony diff --git a/bin/stop-dev b/bin/stop-dev new file mode 100644 index 0000000..54791a4 --- /dev/null +++ b/bin/stop-dev @@ -0,0 +1,4 @@ +#!/bin/sh + +sudo apachectl stop +sudo /opt/local/bin/mysqld_safe5 \ No newline at end of file diff --git a/system/bash_profile.symlink b/system/bash_profile.symlink index 635ca36..801d7b1 100644 --- a/system/bash_profile.symlink +++ b/system/bash_profile.symlink @@ -38,3 +38,7 @@ for f in $(command ls ~/.node-completion); do test -f "$f" && . "$f" done # }}} + +if [ -e ~/i.symfony_complete ]; then + . ~/.symfony_complete +fi From 1e9ce17a6847b4afa87fc41767c0935ce41ce4d7 Mon Sep 17 00:00:00 2001 From: Matt McManus Date: Mon, 17 Sep 2012 14:29:57 -0400 Subject: [PATCH 11/11] Fixing an error for bash completion --- system/bash_profile.symlink | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/bash_profile.symlink b/system/bash_profile.symlink index 801d7b1..a2fa6cf 100644 --- a/system/bash_profile.symlink +++ b/system/bash_profile.symlink @@ -39,6 +39,6 @@ for f in $(command ls ~/.node-completion); do done # }}} -if [ -e ~/i.symfony_complete ]; then +if [ -e ~/.symfony_complete ]; then . ~/.symfony_complete fi