fbartho-import

.aliases.bash

@@ -0,0 +1,47 @@
+source "/Volumes/secure-dotfiles/work_aliases.sh"
+source "/Volumes/secure-dotfiles/other_aliases.sh"
+
+alias open="open2"
+alias up="svn up"
+alias st="svn st"
+alias octave="exec '/Applications/Octave.app/Contents/Resources/bin/octave'"
+alias restartsound="sudo kill -9 `ps ax|grep 'coreaudio[a-z]' |awk '{print $1}'`"
+alias lock="/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend"
+
+alias sshgo="ssh -p 4444 [email protected] "
+alias sshg="ssh -p 4444 [email protected] "
+alias sshf="ssh [email protected] "
+alias rmsvn="find ./ -name .svn -exec rm -rf {} \;"
+alias rmnonsvn="svn status | grep ? | awk '{print $2}' | xargs rm -rf"
+
+#alias xcp="open *.xc*"
+alias xcp="if [ \"$(ls *.xcworkspace 2> /dev/null | wc -l)\" != \"       0\" ]; then    open *.xcworkspace; else    open *.xcodeproj; fi"
+
+alias esp="open -a Espresso "
+alias na="rm -rf build/Debug/*.app"
+
+alias gb="git branch"
+alias gba="git branch -a"
+alias gc="git commit -v"
+alias gca="git commit -v -a"
+alias gd="git diff"
+alias gl="git pull"
+alias gp="git push"
+alias gst="git status"
+alias glog="git log --abbrev-commit --pretty=oneline "
+alias grh="git reset --HARD"
+alias gco="git co"
+alias gpb="push_branch"
+alias glhc="git lh | pbcopy"
+alias gg="git grep -n"
+
+alias gitup="open -a GitUp `git rev-parse --show-toplevel`"
+
+alias broforce="sudo /Users/fbarthelemy/Library/Application\ Support/Steam/SteamApps/common/Broforce/Broforce.app/Contents/MacOS/Broforce"
+alias pa="sudo ~/Library/Application\ Support/Steam/SteamApps/common/Planetary\ Annihilation/PA.app/Contents/MacOS/PA"
+
+alias fix_audio="sudo kill -9 `ps ax|grep 'coreaudio[a-z]' | awk '{print $1}'`"
+
+# Removes duplicated lines keeping the first instance of a line.
+alias uniq_inplace="awk '!x[\$0]++'"
+alias uniq_inplace_latest="tail -r | uniq_inplace | tail -r"

.gitconfig

@@ -1,20 +1,78 @@
-[push]
-	default = current
+[user]
+	name = Frederic Barthelemy
+	email = [email protected]
 [branch]
-	autosetuprebase = always
 	autosetupmerge = true
-[user]
-	name = Justin Searls
-	email = [email protected]
-[core]
-	editor = mvim -f
-	excludesfile = /Users/justin/.gitignore_global
-	mergetool = opendiff
-[heroku]
-	account = personal
+[alias]
+	st = status
+	co = checkout
+	cp = cherry-pick
+	ci = commit
+	br = branch
+	df = diff
+	lg = log -p
+	lh = log -n1 --pretty=format:%H
+	x = !open -a /Applications/GitX.app  .
+	# x = !open -a /Users/fbarthelemy/Code/gitx/build/Debug/GitX.app  .
+	vn = !"cat submodules/narwhal/build/Current/NGCore/Client/Core/Capabilities.js | grep \"this._fields = \" | awk '{gsub(/'\"'\"'g*};|'\"'\"'g/,\"\")}{print $8}'"
+	conar = !"git co `git vn`"
+	cleanup = !"git reflog expire --expire=1.minute refs/heads/master; git fsck --unreachable && git prune && git gc"
+	pa = pushall
+	pushall = !pushall
+	amend-reuse = commit --amend -C HEAD --reset-author
+	git = !git
+	gst = status
+	gofmt = !git status --porcelain | sed -E "'s( [A-Z] (./('" | grep ".go$" | xargs -n1 go fmt
+	bclean = "!f() { git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs -n 1 git branch -d; }; f"
+	apply-gitignore = !git ls-files -ci --exclude-standard -z | xargs -0 git rm --cached
+	split = !git-split
+	showlocal = !git-showlocal
+	prunelocal = !git-prunelocal
+	reauthor = !sh -c 'eval `git log --reverse --topo-order --pretty=format:\"git cherry-pick %H &&  git commit --amend -C %H --author=\\\"%aN <%aE>\\\" && \" $0 ` "echo success" '
+	stash-rename = "!_() { rev=$(git rev-parse $1) && git stash drop $1 || exit 1 ; git stash store -m \"$2\" $rev; }; _"
+[color]
+	ui = auto
+[color "branch"]
+	current = yellow reverse
+	local = yellow
+	remote = green
+[color "diff"]
+	meta = yellow bold
+	frag = magenta bold
+	old = red bold
+	new = green bold
+[color "status"]
+	added = yellow
+	changed = green
+	untracked = cyan
+#[merge]
+#	tool = "FileMerge"
+#[mergetool "FileMerge"]
+#	cmd = "/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge -left \"$REMOTE\" -right \"$LOCAL\" -ancestor \"$BASE\" -merge \"$MERGED\""
 [merge]
-	tool = opendiff
+	keepBackup = false;
+	tool = p4merge
+[mergetool "p4merge"]
+	cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+	keepTemporaries = false
+	trustExitCode = false
+	keepBackup = false
+#[diff]
+#	external = p4diff
+[mergetool]
+	keepBackup = false
+[diff "localizablestrings"]
+	textconv = "iconv -f utf-16 -t utf-8"
+[push]
+	default = matching
+[advice]
+	pushNonFastForward = false
+	statusHints = false
+[filter "lfs"]
+	clean = git-lfs clean %f
+	smudge = git-lfs smudge %f
+	required = true
+[core]
+	excludesfile = /Users/fbarthelemy/.gitignore_global
 [diff]
-	renames = true
-[help]
-	autocorrect = 1
+	compactionHeuristic = true

.gitignore

@@ -1,4 +1,4 @@
-/.homebridge/persist
+/bin/node_modules
 /.vim/swapfiles
 /.vim/.netrwhist
 /secure.dmg

.gitignore_global

@@ -1,4 +1,22 @@
+
+stashes/
+snippets/
+Documentation/WIP/
+vendor/FBMemCache/
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
 .DS_Store
-/*.xcodeproj/xcuserdata/justin.xcuserdatad
-/.vscode
-npm-debug.log
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+

.lldb-gdb

@@ -0,0 +1,77 @@
+# gdb-compatible commands for lldb
+# usage: `command source ~/.lldb-gdb` in .lldbinit
+# Greg Parker     [email protected]
+# http://sealiesoftware.com/.lldb-gdb
+
+# backtrace formatting
+settings set frame-format #${frame.index}  ${frame.pc}{ ${function.name-with-args}{${function.pc-offset}}}{ at ${line.file.basename}:${line.number}}\n
+
+settings set thread-format Thread ${thread.index} (tid ${thread.id}{ "${thread.name}"}{, queue "${thread.queue}"}){: ${frame.pc}{ ${function.name-with-args}{${function.pc-offset}}}{ at ${line.file.basename}:${line.number}}}\n{    Stopped by ${thread.stop-reason}\n}{    Return value ${thread.return-value}}
+
+# t ...
+# t a a bt
+# t apply all backtrace
+command regex t -h 't a a bt' 's/^(a|ap|app|appl|apply)[[:space:]]+(a|al|all)[[:space:]]+(bt|ba|bac|back|backt|backtr|backtra|backtrac|backtrace)[[:space:]]*$/thread backtrace all/'  's/(.*)/thread %1/'
+
+# attach <pid>
+# attach <name>
+# attach -waitfor <name>
+command unalias attach
+command regex attach -h 'Attach to a process.' -s 'attach [-waitfor] <pid|name>'   's/^$/process attach/'  's/^([0-9]+)[[:space:]]*$/process attach --pid %1/'  's/^([^[:space:]]+)[[:space:]]*$/process attach --name %1/'   's/^(-w|--waitfor|-waitfor)[[:space:]]+([^[:space:]]+)[[:space:]]*$/process attach --waitfor --name %2/'
+
+# detach
+command alias detach process detach
+
+# d
+# delete
+command alias d breakpoint delete
+command alias delete breakpoint delete
+
+# dis
+# disable
+command alias dis breakpoint disable
+command alias disable breakpoint disable
+
+# en
+# enable
+command alias en breakpoint enable
+command alias enable breakpoint enable
+
+# u
+# until
+command alias u thread until
+command alias until thread until
+
+# setenv VAR=value
+command regex setenv -h 'Set or list process environment variables.' -s 'setenv VAR=value' 's/^(.+)$/settings set target.env-vars %1/' 's/^$/settings show target.env-vars/' 
+
+# shell
+command alias shell platform shell
+
+# info args
+# info args <regex>
+# info breakpoints
+# info breakpoints <numbers>
+# info display
+# info display
+# info float
+# info handle
+# info handle <signals>
+# info locals
+# info locals <regex>
+# info pid
+# info registers
+# info registers <names>
+# info sharedlibrary
+# info sharedlibrary <addr>
+# info signals
+# info signals <signals>
+# info stack
+# info stack <count>
+# info threads
+# info variables
+# info variables <regex>
+# info vector
+# info watchpoints
+# info watchpoints <numbers>
+command regex -h 'gdb-style \`info\` command.' -s 'info breakpoints; info display; info float; info handle; info locals; info pid; info registers; info sharedlibrary; info signals; info stack; info threads; info variables; info vector; info watchpoints'  info    's/^(s|st|sta|stac|stack)[[:space:]]*$/thread backtrace/'    's/^(s|st|sta|stac|stack)[[:space:]]+([0-9]+)[[:space:]]*$/thread backtrace -c %2/'     's/^(sh|sha|shar|share|shared|sharedl|sharedli|sharedlib|sharedlibr|sharedlibra|sharedlibrar|sharedlibrary)[[:space:]]*$/image list/'     's/^(sh|sha|shar|share|shared|sharedl|sharedli|sharedlib|sharedlibr|sharedlibra|sharedlibrar|sharedlibrary)[[:space:]]+([^[:space:]]+)[[:space:]]*$/image list --address \`%2\`/'     's/^(r|re|reg|regi|regis|regist|registe|register|registers)[[:space:]]*$/register read/'     's/^(r|re|reg|regi|regis|regist|registe|register|registers)[[:space:]]+(.*)$/register read %2/'     's/^pid[[:space:]]*$/process status/'     's/^(b|br|bre|brea|break|breakp|breakpo|breakpoi|breakpoin|breakpoint|breakpoints|wat|watc|watch|watchp|watchpo|watchpoi|watchpoin|watchpoint|watchpoints)[[:space:]]*$/breakpoint list/'     's/^(b|br|bre|brea|break|breakp|breakpo|breakpoi|breakpoin|breakpoint|breakpoints|wat|watc|watch|watchp|watchpo|watchpoi|watchpoin|watchpoint|watchpoints)[[:space:]]+(.*)$/breakpoint list %2/'     's/^(fl|flo|floa|float|ve|vec|vect|vecto|vector)[[:space:]]*$/register read -s 1/'     's/^(si|sig|sign|signa|signal|signals|h|ha|han|hand|handl|handle)[[:space:]]*$/process handle/'     's/^(si|sig|sign|signa|signal|signals|h|ha|han|hand|handl|handle)[[:space:]]+(.*)$/process handle %2/'     's/^(lo|loc|loca|local|locals)[[:space:]]*$/frame variable --no-args/'     's/^(lo|loc|loca|local|locals)[[:space:]]+(.*)$/frame variable --no-args --regex %2/'     's/^(ar|arg|args)[[:space:]]*$/frame variable --no-locals/'     's/^(ar|arg|args)[[:space:]]+(.*)$/frame variable --no-locals --regex %2/'     's/^(va|var|vari|varia|variab|variabl|variable|variables)[[:space:]]*$/frame variable --show-globals --no-args --no-locals/'     's/^(va|var|vari|varia|variab|variabl|variable|variables)[[:space:]]+(.*)$/frame variable --show-globals --no-args --no-locals --regex %2/'     's/^threads[[:space:]]*$/thread list/'    's/^(di|dis|disp|displ|displa|display)[[:space:]]*$/target stop-hook list expr/'

.lldbinit

@@ -0,0 +1,8 @@
+command source ~/.lldb-gdb
+command regex rd 's/^[[:space:]]*$/po [[[UIApplication sharedApplication] keyWindow] recursiveDescription]/' 's/^(.+)$/po [%1 recursiveDescription]/'
+
+command alias opo expr -l objc -O --
+command alias spo expr -l swift -O --
+
+command alias uikit expr @import UIKit
+command alias foundation expr @import Foundation

.profile

@@ -12,11 +12,8 @@ fi
 # Additional PATH configuration
 
 ## My own scripts
-PATH="$HOME/bin:$PATH"
-
-## Ruby binstubs (note: this can be exploited at untrusted working directories!)
-PATH="./bin:$PATH"
-
+PATH="$HOME/.bin:$PATH"
+PATH="/usr/local/share/npm/bin:$PATH"
 
 # Bash settings
 
@@ -32,23 +29,29 @@ fi
 # Other Customization
 
 ## Editor registration for git, etc
-export VISUAL="mvim -f"
-export EDITOR="$VISUAL"
+export EDITOR=emacs
+
+export CODE_DIR="$HOME/Code"
 
 ## Reference the location of iCloud Drive
-export ICLOUD_DRIVE="$HOME/icloud-drive"
+export ICLOUD_DRIVE="$HOME/.icloud-drive"
+
+PATH="$CODE_DIR/go_use/bin:$PATH"
 
 ## Source private (encrypted) ENV variables via automounted disk image
 source "/Volumes/secure-dotfiles/.env"
 
 ## Increase limit of open file descriptors because watch processes
 ulimit -n 10000
 
-## Set a few aliases
-alias be="bundle exec"
-alias gpp="git pull --rebase && git push"
-alias gc="git commit"
+## Load aliases
+source .aliases.bash
+source `which go_use_aliases`
+source `which go_use_fixup_env`
+
+# Alias Hub as Git
+eval "$(hub alias -s)"
 
 ## load custom PS1 prompt
-source $HOME/bin/ps1
+source $HOME/.bin/ps1
 

.ssh/config

@@ -1,3 +1,5 @@
 Host *
-   AddKeysToAgent yes
-   UseKeychain yes
+  ServerAliveInterval 60
+  SendEnv LANG LC_*
+  AddKeysToAgent yes
+  UseKeychain yes