Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: searls/icloud-dotfiles
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: fbartho/icloud-dotfiles
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Dec 23, 2016

  1. I don't vim

    fbartho committed Dec 23, 2016
    Copy the full SHA
    05116a2 View commit details
  2. fbartho-import

    fbartho committed Dec 23, 2016
    Copy the full SHA
    8a43d74 View commit details
  3. links are hard

    fbartho committed Dec 23, 2016
    Copy the full SHA
    e7205cc View commit details
  4. cleanup

    fbartho committed Dec 23, 2016
    Copy the full SHA
    26677cc View commit details

Commits on Nov 29, 2017

  1. Sync some alias updates

    fbartho committed Nov 29, 2017
    Copy the full SHA
    bfc4287 View commit details
  2. Fix some pathing issues

    fbartho committed Nov 29, 2017
    Copy the full SHA
    7478209 View commit details
  3. rbenv

    fbartho committed Nov 29, 2017
    Copy the full SHA
    2089062 View commit details
  4. misc bash alias updates

    fbartho committed Nov 29, 2017
    Copy the full SHA
    1d68491 View commit details
  5. Oh bash.

    fbartho committed Nov 29, 2017
    Copy the full SHA
    5a5a310 View commit details
  6. Unneeded, lol

    fbartho committed Nov 29, 2017
    Copy the full SHA
    7235b0a View commit details

Commits on Oct 30, 2018

  1. Copy the full SHA
    20917c7 View commit details
  2. Copy the full SHA
    682903a View commit details
  3. Misc aliases

    fbartho committed Oct 30, 2018
    Copy the full SHA
    dabb594 View commit details
  4. Copy the full SHA
    b85d3a7 View commit details
  5. yarn tab-completion

    fbartho committed Oct 30, 2018
    Copy the full SHA
    64bfbb2 View commit details
  6. misc docs

    fbartho committed Oct 30, 2018
    Copy the full SHA
    ae93f32 View commit details
  7. Switch from nodeenv to nvm

    fbartho committed Oct 30, 2018
    Copy the full SHA
    5ada550 View commit details
  8. Android-HOME stuff

    fbartho committed Oct 30, 2018
    Copy the full SHA
    e0b15ed View commit details
  9. Copy the full SHA
    986a916 View commit details

Commits on Aug 20, 2019

  1. NVM Tweak

    fbartho committed Aug 20, 2019
    Copy the full SHA
    0019346 View commit details
  2. path fixes

    fbartho committed Aug 20, 2019
    Copy the full SHA
    d0c6f3b View commit details
  3. Copy the full SHA
    b94a90f View commit details
  4. Copy the full SHA
    ea59d4e View commit details
  5. ios simulator commands

    fbartho committed Aug 20, 2019
    Copy the full SHA
    bda5aae View commit details

Commits on Dec 26, 2020

  1. xcode-toggle alt-name

    fbartho committed Dec 26, 2020
    Copy the full SHA
    950d8da View commit details
  2. Git delta config

    fbartho committed Dec 26, 2020
    Copy the full SHA
    b7e6484 View commit details
  3. Allow Bash for Now

    fbartho committed Dec 26, 2020
    Copy the full SHA
    155104f View commit details
  4. Copy the full SHA
    7917dd9 View commit details
  5. Misc

    fbartho committed Dec 26, 2020
    Copy the full SHA
    7c2e52a View commit details

Commits on May 6, 2021

  1. master->main

    fbartho committed May 6, 2021
    Copy the full SHA
    b86c9d5 View commit details
  2. Misc Aliases

    fbartho committed May 6, 2021
    Copy the full SHA
    7b9917b View commit details
  3. Sync-code tool

    fbartho committed May 6, 2021
    Copy the full SHA
    00b8ff4 View commit details

Commits on Aug 6, 2021

  1. Xcode13-beta.4

    fbartho committed Aug 6, 2021
    Copy the full SHA
    5004ea8 View commit details
  2. node 15

    fbartho committed Aug 6, 2021
    Copy the full SHA
    e814e3e View commit details

Commits on Nov 15, 2021

  1. nvm use node16

    fbartho committed Nov 15, 2021
    Copy the full SHA
    93a83d0 View commit details
  2. Copy the full SHA
    c79910b View commit details
  3. Copy the full SHA
    2679457 View commit details
  4. Copy the full SHA
    ec86f33 View commit details

Commits on Nov 17, 2021

  1. Copy the full SHA
    8ccc538 View commit details
Showing with 3,963 additions and 564 deletions.
  1. +103 −0 .aliases.bash
  2. +1 −0 .bash_profile
  3. +1 −1 .gemrc
  4. +97 −16 .gitconfig
  5. +1 −1 .gitignore
  6. +21 −3 .gitignore_global
  7. +0 −1 .homebridge/accessories/cachedAccessories
  8. +0 −1 .homebridge/config.json
  9. +77 −0 .lldb-gdb
  10. +8 −0 .lldbinit
  11. +93 −17 .profile
  12. +4 −2 .ssh/config
  13. +0 −347 .vim/autoload/pathogen.vim
  14. +0 −1 .vim/bundle/elm.vim
  15. +0 −1 .vim/bundle/mustache
  16. +0 −1 .vim/bundle/vim-abolish
  17. +0 −1 .vim/bundle/vim-airline
  18. +0 −1 .vim/bundle/vim-airline-themes
  19. +0 −1 .vim/bundle/vim-bundler
  20. +0 −1 .vim/bundle/vim-coffee-script
  21. +0 −1 .vim/bundle/vim-commentary
  22. +0 −1 .vim/bundle/vim-emoji
  23. +0 −1 .vim/bundle/vim-fugitive
  24. +0 −1 .vim/bundle/vim-projectionist
  25. +0 −1 .vim/bundle/vim-pug
  26. +0 −1 .vim/bundle/vim-rails
  27. +0 −1 .vim/bundle/vim-ruby
  28. +0 −1 .vim/bundle/vim-unimpaired
  29. +0 −41 .vim/plugin/typer.vim
  30. +0 −87 .vimrc
  31. +1,450 −0 bin/Markdown.pl
  32. BIN bin/ReflektiveUninstall.pkg
  33. +27 −0 bin/backupWithHardlinks.bash
  34. +47 −0 bin/decorporate
  35. +24 −0 bin/ff
  36. +16 −0 bin/ffkill
  37. +162 −0 bin/fix_itunes_apps.js
  38. +4 −0 bin/git-forceprunelocalecho
  39. +172 −0 bin/git-loc
  40. +4 −0 bin/git-prunelocal
  41. +54 −0 bin/git-recentco
  42. +4 −0 bin/git-showlocal
  43. +10 −0 bin/go_install_local
  44. +9 −0 bin/kill-sophos
  45. +35 −0 bin/light
  46. +15 −0 bin/load_sim_with_contacts
  47. +9 −0 bin/load_simulator_contacts_from_in_backup
  48. +44 −0 bin/open2
  49. +2 −0 bin/p4diff
  50. +2 −0 bin/p4merge
  51. +6 −0 bin/pod_forceupdate
  52. +6 −2 bin/ps1
  53. +35 −0 bin/psjoin
  54. +3 −0 bin/push_branch
  55. +114 −30 bin/setup-new-mac
  56. +24 −0 bin/simulator_populator
  57. +7 −0 bin/starttether
  58. +21 −0 bin/strip_move
  59. +7 −0 bin/supdate_noreboot
  60. +1,070 −0 bin/symbolicatecrash.pl
  61. +32 −0 bin/sync-code
  62. +74 −0 bin/unwebarchive.rb
  63. +22 −0 bin/xcode-toggle
  64. +46 −0 bin/xcode_snippets.py
103 changes: 103 additions & 0 deletions .aliases.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
source "/Volumes/secure-dotfiles/work_aliases.sh"
source "/Volumes/secure-dotfiles/other_aliases.sh"
alias resource="source ~/.profile"

alias open="open2"
alias up="svn up"
alias st="svn st"
alias octave="exec '/Applications/Octave.app/Contents/Resources/bin/octave'"

alias lock="/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend"
alias saferestart="osascript -e 'tell app \"System Events\" to restart'"
alias safeshutdown="osascript -e 'tell app \"System Events\" to shut down'"
alias sleepnow="pmset sleepnow"
alias displaysleepnow="pmset displaysleepnow"

alias nvm_upgrade_stable="nvm install stable --reinstall-packages-from=$(nvm current)"

alias timemachine_info="sudo tmutil listbackups"
alias timemachine_start="sudo tmutil startbackup"
alias timemachine_stop="sudo tmutil stopbackup"
# One time boost time machine priority
alias timemachine_boost="sudo sysctl debug.lowpri\_throttle_enabled=0"
alias timemachine_regular="sudo sysctl debug.lowpri\_throttle_enabled=1"

# Get the system & xcode versions!
alias versions="{ sw_vers; echo "---"; xcodebuild -version; }"

alias rmsvn="find ./ -name .svn -exec rm -rf {} \;"
alias rmnonsvn="svn status | grep ? | awk '{print $2}' | xargs rm -rf"

alias simshot="xcrun simctl io booted screenshot" # output-path
alias simaddmedia="xcrun simctl addmedia booted" # path-to-media
alias simopenurl="xcrun simctl openurl booted" # url
alias simappcontainer="xcrun simctl get_app_container booted" # com.bundle.identifier
alias lsregister=/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister

# Open Xcodeworkspace but fallback to xcodeproj
# alias xcp="open *.xc*"
# alias xcp="if [ \"$(ls *.xcworkspace 2> /dev/null | wc -l)\" != \" 0\" ]; then open *.xcworkspace; else open *.xcodeproj; fi"
openx() {
fileToOpen='';
find . -maxdepth 1 -name *.xcworkspace -print0 | while IFS= read -r -d '' file; do
fileToOpen=$file
done

if [ -n "$fileToOpen" ]
then
echo $fileToOpen
xed $fileToOpen
else
find . -maxdepth 1 -name *.xcodeproj -print0 | while IFS= read -r -d '' file; do
fileToOpen=$file
done

if [ -n "$fileToOpen" ]
then
echo $fileToOpen
xed $fileToOpen
else
echo "No xcode files to open."
fi
fi
}

# Shorthand version of "openx", use "xcp" instead.
alias xcp="openx"

alias chrome="open -a \"Google Chrome\""

alias podxcp="pod install && xcp"

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}'`"
alias restartsound="fix_audio"
alias fix_dns="sudo killall -HUP mDNSResponder"
alias restartdns="fix_dns"

# 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"

1 change: 1 addition & 0 deletions .bash_profile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
source "~/.profile"
2 changes: 1 addition & 1 deletion .gemrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
gem: --no-document
gem: --no-document --no-rdoc --no-ri
113 changes: 97 additions & 16 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -1,20 +1,101 @@
[push]
default = current
[user]
name = Frederic Barthelemy
email = git@fbartho.com
signingkey = 9D2B3E7C1526516EE90FAF126FF43C49A5D473EF
[branch]
autosetuprebase = always
autosetupmerge = true
[user]
name = Justin Searls
email = searls@gmail.com
[core]
editor = mvim -f
excludesfile = /Users/justin/.gitignore_global
mergetool = opendiff
[heroku]
account = personal
[pull]
rebase = false
[alias]
st = status
co = checkout
sw = switch
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/main; git fsck --unreachable && git prune && git gc"
current = !"git rev-parse --abbrev-ref HEAD"
currentpb = !"git current | tr -d '\n' | pbcopy"
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-main} | grep -v " ${1-main}$" | 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
recent = !git-recentco
recentco = !git-recentco
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"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[core]
excludesfile = /Users/fbarthelemy/.gitignore_global
[diff]
renames = true
[help]
autocorrect = 1
compactionHeuristic = true
[commit]
gpgsign = true
[gpg]
program = gpg
[grep]
lineNumber = false
[init]
defaultBranch = main

# Git Delta https://github.com/dandavison/delta
[core]
pager = delta
[delta]
syntax-theme = GitHub
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/.homebridge/persist
/bin/node_modules
/.vim/swapfiles
/.vim/.netrwhist
/secure.dmg
24 changes: 21 additions & 3 deletions .gitignore_global
Original file line number Diff line number Diff line change
@@ -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

1 change: 0 additions & 1 deletion .homebridge/accessories/cachedAccessories

This file was deleted.

1 change: 0 additions & 1 deletion .homebridge/config.json

This file was deleted.

77 changes: 77 additions & 0 deletions .lldb-gdb
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# gdb-compatible commands for lldb
# usage: `command source ~/.lldb-gdb` in .lldbinit
# Greg Parker gparker@sealiesoftware.com
# 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/'
8 changes: 8 additions & 0 deletions .lldbinit
Original file line number Diff line number Diff line change
@@ -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
Loading