From 87cacc61168de992c8d991c7a36943c391f9026e Mon Sep 17 00:00:00 2001 From: Conrad Juhl Andersen Date: Tue, 12 Apr 2016 00:43:39 +0200 Subject: [PATCH 001/132] No reason to tap caskroom Following a change in caskroom from december (https://github.com/caskroom/homebrew-cask#important-december-2015-update-homebrew-cask-will-now-be-kept-up-to-date-together-with-homebrew-see-15381-for-details-if-you-havent-yet-run-brew-uninstall---force-brew-cask-brew-update-to-switch-to-the-new-system) caskroom/cask should no longer be tapped. --- Brewfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Brewfile b/Brewfile index 04577dafb8f..9b35eb8f10a 100644 --- a/Brewfile +++ b/Brewfile @@ -1,6 +1,5 @@ cask_args appdir: '/Applications' -tap 'caskroom/cask' tap 'homebrew/bundle' brew 'ack' From 6ee42a35a2e4dfca0af2ab7c8b47e3e33117f58b Mon Sep 17 00:00:00 2001 From: Jacob Graf Date: Wed, 20 Apr 2016 09:13:48 -0500 Subject: [PATCH 002/132] Add cls (Clear Screen) alias to zsh aliases --- zsh/aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index d8fb4b3cfd3..b88e3aa5a1b 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -1 +1,3 @@ alias reload!='. ~/.zshrc' + +alias cls='clear' # Good 'ol Clear Screen command From ce0e45b9ff2698f8f0b46d8281bb2cee9b9ab149 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 6 May 2016 20:06:24 -0700 Subject: [PATCH 003/132] lol this really wasn't needed --- bin/todo | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/todo b/bin/todo index 08ae557028f..8a62cbde29a 100755 --- a/bin/todo +++ b/bin/todo @@ -13,7 +13,6 @@ # at a time. Once I've finished a todo, I just delete the file. That's it. # # Millions of dollars later and `touch` wins. -set -e # Run our new web 2.0 todo list application and raise millions of VC dollars. touch ~/Desktop/"$*" From 26c0366b5f737c1111509aba61f757bda78702a2 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 21 Jun 2016 13:57:24 -0700 Subject: [PATCH 004/132] Add `cp` to IRB context Sometimes I'll want access to the result of whatever I just ran in IRB or a Rails console. The mouse is cumbersome, so now we can just do something like this: >> user.id => 6442 >> cp => "copied `6442' to your clipboard" --- ruby/irbrc.symlink | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ruby/irbrc.symlink b/ruby/irbrc.symlink index 6cda38429df..af31ae64e14 100644 --- a/ruby/irbrc.symlink +++ b/ruby/irbrc.symlink @@ -31,6 +31,14 @@ class Object end end +# Copies the result of the last operation you ran in IRB to the system +# clipboard (if you're on macOS). +def cp + last_value = IRB.CurrentContext.last_value + system "echo #{last_value} | pbcopy" + "copied \`#{last_value}' to your clipboard" +end + def me User.find_by_login(ENV['USER'].strip) end From 536f5186b04b1fb85c061d43f855cceb92174314 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 21 Jun 2016 14:08:31 -0700 Subject: [PATCH 005/132] Use `cop` instead of `cp` FileUtils in a Rails console made this a little hard. --- ruby/irbrc.symlink | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby/irbrc.symlink b/ruby/irbrc.symlink index af31ae64e14..f25dcbfb023 100644 --- a/ruby/irbrc.symlink +++ b/ruby/irbrc.symlink @@ -33,9 +33,9 @@ end # Copies the result of the last operation you ran in IRB to the system # clipboard (if you're on macOS). -def cp +def cop last_value = IRB.CurrentContext.last_value - system "echo #{last_value} | pbcopy" + %x[echo '#{last_value}' | pbcopy] "copied \`#{last_value}' to your clipboard" end From bfb4bd13e2f91cb8684a89fce1529f9217fc48b4 Mon Sep 17 00:00:00 2001 From: Derek Michael Frank Date: Wed, 13 Jul 2016 18:08:43 -0700 Subject: [PATCH 006/132] refactor(macos): Update osx to macos Apple is changing their desktop OS to match their other OS product names (e.g., iOS, tvOS). OS X will now be macOS. --- README.md | 2 +- bin/dot | 4 ++-- bin/set-defaults | 4 ++-- functions/extract | 2 +- {osx => macos}/install.sh | 0 {osx => macos}/set-defaults.sh | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) rename {osx => macos}/install.sh (100%) rename {osx => macos}/set-defaults.sh (87%) diff --git a/README.md b/README.md index 978e5159b05..458749abcb8 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Everything is configured and tweaked within `~/.dotfiles`. The main file you'll want to change right off the bat is `zsh/zshrc.symlink`, which sets up a few paths that'll be different on your particular machine. -`dot` is a simple script that installs some dependencies, sets sane OS X +`dot` is a simple script that installs some dependencies, sets sane macOS defaults, and so on. Tweak this script, and occasionally run `dot` from time to time to keep your environment fresh and up-to-date. You can find this script in `bin/`. diff --git a/bin/dot b/bin/dot index 4e0313bb995..4d3455621c0 100755 --- a/bin/dot +++ b/bin/dot @@ -6,8 +6,8 @@ # to make sure you're on the latest and greatest. export ZSH=$HOME/.dotfiles -# Set OS X defaults -$ZSH/osx/set-defaults.sh +# Set macOS defaults +$ZSH/macos/set-defaults.sh # Install homebrew $ZSH/homebrew/install.sh 2>&1 diff --git a/bin/set-defaults b/bin/set-defaults index 8a8d9a2ba27..333859619a8 100755 --- a/bin/set-defaults +++ b/bin/set-defaults @@ -1,5 +1,5 @@ #!/bin/sh # -# Sets OS X defaults by running $ZSH/osx/set-defaults.sh. +# Sets macOS defaults by running $ZSH/macos/set-defaults.sh. -exec $ZSH/osx/set-defaults.sh \ No newline at end of file +exec $ZSH/macos/set-defaults.sh diff --git a/functions/extract b/functions/extract index 39a6dd643d8..16640febbe0 100644 --- a/functions/extract +++ b/functions/extract @@ -2,7 +2,7 @@ # # Usage: extract # Description: extracts archived files / mounts disk images -# Note: .dmg/hdiutil is Mac OS X-specific. +# Note: .dmg/hdiutil is macOS-specific. # # credit: http://nparikh.org/notes/zshrc.txt extract () { diff --git a/osx/install.sh b/macos/install.sh similarity index 100% rename from osx/install.sh rename to macos/install.sh diff --git a/osx/set-defaults.sh b/macos/set-defaults.sh similarity index 87% rename from osx/set-defaults.sh rename to macos/set-defaults.sh index 786ba8110fa..3f0723b1e17 100755 --- a/osx/set-defaults.sh +++ b/macos/set-defaults.sh @@ -1,9 +1,9 @@ -# Sets reasonable OS X defaults. +# Sets reasonable macOS defaults. # -# Or, in other words, set shit how I like in OS X. +# Or, in other words, set shit how I like in macOS. # # The original idea (and a couple settings) were grabbed from: -# https://github.com/mathiasbynens/dotfiles/blob/master/.osx +# https://github.com/mathiasbynens/dotfiles/blob/master/.macos # # Run ./set-defaults.sh and you'll be good to go. @@ -38,4 +38,4 @@ defaults write com.apple.Safari IncludeInternalDebugMenu -bool true defaults write com.apple.Safari IncludeDevelopMenu -bool true defaults write com.apple.Safari WebKitDeveloperExtrasEnabledPreferenceKey -bool true defaults write com.apple.Safari "com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled" -bool true -defaults write NSGlobalDomain WebKitDeveloperExtras -bool true \ No newline at end of file +defaults write NSGlobalDomain WebKitDeveloperExtras -bool true From 9e8ebfc695271bcf2659b5d3207d56035c6acfff Mon Sep 17 00:00:00 2001 From: thewildandy Date: Thu, 25 Aug 2016 14:45:07 +0100 Subject: [PATCH 007/132] back up and install Atom packages from a list --- bin/atom-package-backup | 11 +++++++++++ bin/atom-package-install | 13 +++++++++++++ 2 files changed, 24 insertions(+) create mode 100755 bin/atom-package-backup create mode 100755 bin/atom-package-install diff --git a/bin/atom-package-backup b/bin/atom-package-backup new file mode 100755 index 00000000000..25f8a451b95 --- /dev/null +++ b/bin/atom-package-backup @@ -0,0 +1,11 @@ +#!/bin/sh +# +# Usage: atom-package-backup +# +# Saves a list of your currently installed atom packages to +# ~/.dotfiles/atom.symlink/packages.txt suitable for install +# via atom-package-install + +set -e + +apm list --installed --bare > ~/.dotfiles/atom.symlink/packages.txt diff --git a/bin/atom-package-install b/bin/atom-package-install new file mode 100755 index 00000000000..218bf414ee1 --- /dev/null +++ b/bin/atom-package-install @@ -0,0 +1,13 @@ +#!/bin/sh +# +# Usage: atom-package-install +# +# Installs the atom packages listed in your packages.txt file +# located at ~/.dotfiles/atom.symlink/packages.txt +# +# You can generate a new list based on currently installed +# packages via atom-package-backup + +set -e + +apm install --packages-file ~/.dotfiles/atom.symlink/packages.txt From cba982211a66b1fc853e0873d1e2b155796f773e Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 29 Jul 2016 15:39:33 -0700 Subject: [PATCH 008/132] add puma-dev --- Brewfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Brewfile b/Brewfile index 9b35eb8f10a..ce873f780d4 100644 --- a/Brewfile +++ b/Brewfile @@ -1,6 +1,7 @@ cask_args appdir: '/Applications' tap 'homebrew/bundle' +tap 'puma/puma' brew 'ack' brew 'coreutils' @@ -14,6 +15,7 @@ brew 'openssl' brew 'node' brew 'readline' brew 'postgresql' +brew 'puma/puma/puma-dev' brew 'ruby-build' brew 'rbenv' brew 'roundup' From b0b624183fa145f5788cb07bc11d9facd3cab34e Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 6 Sep 2016 14:36:34 -0700 Subject: [PATCH 009/132] conf update --- atom.symlink/config.cson | 3 +++ 1 file changed, 3 insertions(+) diff --git a/atom.symlink/config.cson b/atom.symlink/config.cson index 65670f49bef..a8f7556621f 100644 --- a/atom.symlink/config.cson +++ b/atom.symlink/config.cson @@ -21,11 +21,14 @@ ] editor: fontFamily: "Menlo" + fontSize: 15 invisibles: {} showIndentGuide: true softWrapAtPreferredLineLength: true "go-plus": goPath: "/Users/holman/Code/go" + "linter-eslint": + useGlobalEslint: true "release-notes": viewedVersion: "0.89.0" "spell-check": From 666cb053e9d27d279c4643dce1ca09c2f8b69f2e Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 6 Sep 2016 14:37:45 -0700 Subject: [PATCH 010/132] Don't print +/- signs in diff output I copy and paste so often from the output of `git diff` that it became really tedious to manually remove the diff output from the start of a line: - runBuggyCode() + runVerySlightlyLessBuggyCode() This is able to be done and keep my sanity because I have `diff=auto` set in my `[color]` section of my gitconfig, so I can just rely on green/red output instead of the added +/- markers. If I do want the +/- for things like gists or passing around diffs, I can just run the normal `git diff`. A poor (wo)man's way of doing this is to use `git diff --color-words`, but I opted not to do that because it does slightly change the format (changes are inline instead of per-line). --- git/aliases.zsh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git/aliases.zsh b/git/aliases.zsh index 572e7ef9676..d03fdc107bb 100644 --- a/git/aliases.zsh +++ b/git/aliases.zsh @@ -10,7 +10,10 @@ fi alias gl='git pull --prune' alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative" alias gp='git push origin HEAD' -alias gd='git diff' + +# Remove `+` and `-` from start of diff lines; just rely upon color. +alias gd='git diff --color | sed -E "s/^([^-+ ]*)[-+ ]/\\1/" | less -r' + alias gc='git commit' alias gca='git commit -a' alias gco='git checkout' From 2c077a95a610c8fd57da2bd04aa2c85e6fd37b7c Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 7 Sep 2016 09:47:26 -0700 Subject: [PATCH 011/132] Make `gd` portable Thanks @fatso83 (https://github.com/holman/dotfiles/commit/666cb053e9d27d279c4643dce1ca09c2f8b69f2e#commitcomment-18928001) --- git/aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/aliases.zsh b/git/aliases.zsh index d03fdc107bb..a442f4bbdec 100644 --- a/git/aliases.zsh +++ b/git/aliases.zsh @@ -12,7 +12,7 @@ alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C alias gp='git push origin HEAD' # Remove `+` and `-` from start of diff lines; just rely upon color. -alias gd='git diff --color | sed -E "s/^([^-+ ]*)[-+ ]/\\1/" | less -r' +alias gd='git diff --color | sed "s/^\([^-+ ]*\)[-+ ]/\\1/" | less -r' alias gc='git commit' alias gca='git commit -a' From 1aab10de42535b5044c9ad9c247ed65e7343d24a Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 13 Sep 2016 16:26:46 +0200 Subject: [PATCH 012/132] Add two quick Docker aliases --- docker/aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 docker/aliases.zsh diff --git a/docker/aliases.zsh b/docker/aliases.zsh new file mode 100644 index 00000000000..17b10f6bc90 --- /dev/null +++ b/docker/aliases.zsh @@ -0,0 +1,2 @@ +alias d='docker $*' +alias d-c='docker-compose $*' From 475542b4bf45fff453de1ceae6893b43038a6392 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Wed, 21 Sep 2016 18:40:31 -0300 Subject: [PATCH 013/132] simplified `e` code (#252) --- bin/e | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bin/e b/bin/e index f8b6c05fcb6..501ad6e372b 100755 --- a/bin/e +++ b/bin/e @@ -13,9 +13,4 @@ # $ e . # $ e /usr/local # # => opens the specified directory in your editor - -if [ "$1" = "" ] ; then - exec $EDITOR . -else - exec $EDITOR "$1" -fi +exec "$EDITOR" "${1:-.}" From 9d37ab1e4be8611c8c02697c88f88bbdd09139e1 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 30 Sep 2016 14:54:19 -0700 Subject: [PATCH 014/132] Remove dead code (fixes #253) --- zsh/config.zsh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/zsh/config.zsh b/zsh/config.zsh index bdf8f9826d0..a687229647a 100644 --- a/zsh/config.zsh +++ b/zsh/config.zsh @@ -1,9 +1,3 @@ -if [[ -n $SSH_CONNECTION ]]; then - export PS1='%m:%3~$(git_info_for_prompt)%# ' -else - export PS1='%3~$(git_info_for_prompt)%# ' -fi - export LSCOLORS="exfxcxdxbxegedabagacad" export CLICOLOR=true From ba41c7de15f9b0cd3aab9aae6fcb6bf0594941eb Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Sat, 1 Oct 2016 13:02:56 -0700 Subject: [PATCH 015/132] add `jq` --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index ce873f780d4..2398db74c37 100644 --- a/Brewfile +++ b/Brewfile @@ -9,6 +9,7 @@ brew 'go' brew 'grc' brew 'imagemagick' brew 'jp2a' +brew 'jq' brew 'libcaca', args: ['with-imlib2'] brew 'libgit2' brew 'openssl' From 3e72c81aac48067dc855f597a67ea02c9d235d22 Mon Sep 17 00:00:00 2001 From: Corbin Hesse Date: Mon, 10 Oct 2016 18:45:27 -0500 Subject: [PATCH 016/132] Revise 'search' Command to Use Multiple Arguments (#255) * This places quotations around input argument to allow for multiple arguments to be used when searching. * A string can be inserted using quotations after the search commands. * Example: `search "foo bar"` will search for the entire string * Additional arguments can be added. * Example: `search "foo bar" directory/` will search for the entire string in the specific subdirectory. --- bin/search | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/search b/bin/search index d899b4ce332..fc64731684d 100755 --- a/bin/search +++ b/bin/search @@ -1,12 +1,12 @@ #!/bin/sh # -# Quick search in a directory for a string ($1). +# Quick search in a directory for a string ($@). # set -e # use -iru to search directories ack usually ignores (like .git) if [ -x /usr/bin/ack-grep ]; then - ack-grep -i $1 + ack-grep -i "$@" else - ack -i $1 + ack -i "$@" fi From d7713e64b51c03d4679f4243ee4a9df2803d7759 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 11 Oct 2016 12:13:25 -0700 Subject: [PATCH 017/132] Add yarn --- yarn/yarn.zsh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 yarn/yarn.zsh diff --git a/yarn/yarn.zsh b/yarn/yarn.zsh new file mode 100644 index 00000000000..d7f690dfaa1 --- /dev/null +++ b/yarn/yarn.zsh @@ -0,0 +1,4 @@ +# sup yarn +# https://yarnpkg.com + +export PATH="$HOME/.yarn/bin:$PATH" From 489a036085e2c59547a78fe8b0af7998c1f9476a Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 12 Oct 2016 11:20:01 -0700 Subject: [PATCH 018/132] remove `newtab` references (closes #256) --- zsh/config.zsh | 3 --- 1 file changed, 3 deletions(-) diff --git a/zsh/config.zsh b/zsh/config.zsh index a687229647a..8ca7389e218 100644 --- a/zsh/config.zsh +++ b/zsh/config.zsh @@ -31,12 +31,9 @@ setopt HIST_REDUCE_BLANKS # like: git comm-[tab] setopt complete_aliases -zle -N newtab - bindkey '^[^[[D' backward-word bindkey '^[^[[C' forward-word bindkey '^[[5D' beginning-of-line bindkey '^[[5C' end-of-line bindkey '^[[3~' delete-char -bindkey '^[^N' newtab bindkey '^?' backward-delete-char From dd19f6c6cadbd27e47d5c04a082cd1fce77cda37 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 13 Oct 2016 00:48:10 -0700 Subject: [PATCH 019/132] brew yarn --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 2398db74c37..2bd5e909309 100644 --- a/Brewfile +++ b/Brewfile @@ -24,6 +24,7 @@ brew 'spaceman-diff' brew 'spark' brew 'unrar' brew 'wget' +brew 'yarn' brew 'youtube-dl' cask '1password' From 3fcbaa8660444d9b4882d039c766a3f2bc3058a2 Mon Sep 17 00:00:00 2001 From: Stephen Yeargin Date: Fri, 14 Oct 2016 15:46:21 -0500 Subject: [PATCH 020/132] Updating .gitignore for new Atom folders (#257) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So, I encountered this recently when updating my Dotfiles from disk. ``` [..] Untracked files: (use "git add ..." to include in what will be committed) atom.symlink/blob-store/ atom.symlink/recovery/ Stephens-Work-Mac-mini:.dotfiles (master) stephen$ ls -l atom.symlink/recovery/ total 8 -rw-r--r-- 1 stephen staff 121 Sep 12 14:55 credentials-7c3859.csv ``` That's an AWS credential file from when Atom crashed. 😳 The `blob-store` directory doesn't have anything else of terrible interest, but seems like something you wouldn't want around on the repository. ## tl;dr I think these paths should be added to the default `.gitignore` ``` atom.symlink/blob-store atom.symlink/recovery ``` --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index a57d76865c7..1214493374b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,7 @@ atom.symlink/compile-cache/ atom.symlink/packages atom.symlink/storage atom.symlink/themes +atom.symlink/blob-store +atom.symlink/recovery git/gitconfig.local.symlink From 7be165e3785ca858f25e8b5faa0d8c7c8a24b694 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 19 Oct 2016 14:31:09 -0700 Subject: [PATCH 021/132] Rename yarn PATH changes (See d7713e64b51c03d4679f4243ee4a9df2803d7759) --- yarn/{yarn.zsh => path.zsh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename yarn/{yarn.zsh => path.zsh} (100%) diff --git a/yarn/yarn.zsh b/yarn/path.zsh similarity index 100% rename from yarn/yarn.zsh rename to yarn/path.zsh From 1b430b72e4e098a9902ff8435c08655c28db1edd Mon Sep 17 00:00:00 2001 From: Yeongho Kim Date: Thu, 20 Oct 2016 06:32:42 +0900 Subject: [PATCH 022/132] Mention install.sh in README.md (#232) * Mention install.sh in README.md * Cope with the feedback. Add additional explanation for install.sh. * Apply feedback --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 458749abcb8..30586a84fe4 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,8 @@ There's a few special files in the hierarchy. expected to setup `$PATH` or similar. - **topic/completion.zsh**: Any file named `completion.zsh` is loaded last and is expected to setup autocomplete. -- **topic/\*.symlink**: Any files ending in `*.symlink` get symlinked into +- **topic/install.sh**: Any file named `install.sh` is executed when you run `script/install`. To avoid being loaded automatically, its extension is `.sh`, not `.zsh`. +- **topic/\*.symlink**: Any file ending in `*.symlink` gets symlinked into your `$HOME`. This is so you can keep all of those versioned in your dotfiles but still keep those autoloaded files in your home directory. These get symlinked in when you run `script/bootstrap`. From 6cb0f6c14522f2a7615042da0dcd68b4749ffa54 Mon Sep 17 00:00:00 2001 From: "Bob W. Hogg" Date: Tue, 6 Dec 2016 19:13:30 -0800 Subject: [PATCH 023/132] Update Linuxbrew installation URL --- homebrew/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homebrew/install.sh b/homebrew/install.sh index 1921f008fbb..f01dbdc7f75 100755 --- a/homebrew/install.sh +++ b/homebrew/install.sh @@ -16,7 +16,7 @@ then ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" elif test "$(expr substr $(uname -s) 1 5)" = "Linux" then - ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/linuxbrew/go/install)" + ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Linuxbrew/install/master/install)" fi fi From d5707bb3b514e631a92f73dda3b5e52d82498c94 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 14 Dec 2016 15:09:52 -0800 Subject: [PATCH 024/132] yay more atom cruft --- atom.symlink/config.cson | 1 + 1 file changed, 1 insertion(+) diff --git a/atom.symlink/config.cson b/atom.symlink/config.cson index a8f7556621f..6c695da3dd8 100644 --- a/atom.symlink/config.cson +++ b/atom.symlink/config.cson @@ -15,6 +15,7 @@ "tmp" "vendor" ] + telemetryConsent: "no" themes: [ "unity-ui" "glacier-syntax" From 07e8a7a2d36f53a0f453a86f4a47f98f28fec055 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 14 Dec 2016 15:10:13 -0800 Subject: [PATCH 025/132] make the keypress duration more sane --- macos/set-defaults.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/set-defaults.sh b/macos/set-defaults.sh index 3f0723b1e17..03d6f2d9dbe 100755 --- a/macos/set-defaults.sh +++ b/macos/set-defaults.sh @@ -20,7 +20,7 @@ defaults write com.apple.Finder FXPreferredViewStyle Nlsv chflags nohidden ~/Library # Set a really fast key repeat. -defaults write NSGlobalDomain KeyRepeat -int 0 +defaults write NSGlobalDomain KeyRepeat -int 1 # Set the Finder prefs for showing a few different volumes on the Desktop. defaults write com.apple.finder ShowExternalHardDrivesOnDesktop -bool true From 3724f18339193ceb4eb300f64273f9317dacb37a Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 14 Dec 2016 16:11:18 -0800 Subject: [PATCH 026/132] quick battery status script --- bin/battery-status | 28 ++++++++++++++++++++++++++++ zsh/prompt.zsh | 6 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100755 bin/battery-status diff --git a/bin/battery-status b/bin/battery-status new file mode 100755 index 00000000000..39c45d073b4 --- /dev/null +++ b/bin/battery-status @@ -0,0 +1,28 @@ +#!/bin/bash +# +# battery-status +# +# A quick little indicator for battery status on your Mac laptop, suitable for +# display in your prompt. + +battstat=$(pmset -g batt) +time_left=$(echo $battstat | + tail -1 | + cut -f2 | + awk -F"; " '{print $3}' | + cut -d' ' -f1 +) + +if [[ $(pmset -g ac) == *"No adapter attached."* ]] +then + emoji='🔋' +else + emoji='🔌' + + if [[ $time_left == *"(no"* ]] + then + time_left='⌛️ ' + fi +fi + +printf "\033[1;92m$emoji $time_left \033[0m⋯" diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh index 2e962956b4d..9794679c934 100644 --- a/zsh/prompt.zsh +++ b/zsh/prompt.zsh @@ -71,7 +71,11 @@ directory_name() { echo "%{$fg_bold[cyan]%}%1/%\/%{$reset_color%}" } -export PROMPT=$'\n$(rb_prompt)in $(directory_name) $(git_dirty)$(need_push)\n› ' +battery_status() { + $ZSH/bin/battery-status +} + +export PROMPT=$'\n$(battery_status) $(rb_prompt)in $(directory_name) $(git_dirty)$(need_push)\n› ' set_prompt () { export RPROMPT="%{$fg_bold[cyan]%}%{$reset_color%}" } From 687947fcacea626f606d11132905ece96b19f560 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 14 Dec 2016 16:12:43 -0800 Subject: [PATCH 027/132] remove ruby version from prompt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ruby versions don't really matter anymore, now that we're in a post 1.9 world. 💖 --- bin/battery-status | 2 +- zsh/prompt.zsh | 23 +---------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/bin/battery-status b/bin/battery-status index 39c45d073b4..92b245837c9 100755 --- a/bin/battery-status +++ b/bin/battery-status @@ -25,4 +25,4 @@ else fi fi -printf "\033[1;92m$emoji $time_left \033[0m⋯" +printf "\033[1;92m$emoji $time_left \033[0m" diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh index 9794679c934..3d34bf64d5c 100644 --- a/zsh/prompt.zsh +++ b/zsh/prompt.zsh @@ -46,27 +46,6 @@ need_push () { fi } -ruby_version() { - if (( $+commands[rbenv] )) - then - echo "$(rbenv version | awk '{print $1}')" - fi - - if (( $+commands[rvm-prompt] )) - then - echo "$(rvm-prompt | awk '{print $1}')" - fi -} - -rb_prompt() { - if ! [[ -z "$(ruby_version)" ]] - then - echo "%{$fg_bold[yellow]%}$(ruby_version)%{$reset_color%} " - else - echo "" - fi -} - directory_name() { echo "%{$fg_bold[cyan]%}%1/%\/%{$reset_color%}" } @@ -75,7 +54,7 @@ battery_status() { $ZSH/bin/battery-status } -export PROMPT=$'\n$(battery_status) $(rb_prompt)in $(directory_name) $(git_dirty)$(need_push)\n› ' +export PROMPT=$'\n$(battery_status)in $(directory_name) $(git_dirty)$(need_push)\n› ' set_prompt () { export RPROMPT="%{$fg_bold[cyan]%}%{$reset_color%}" } From 3c794abe2e3bc1a782e3c5cf1c1b8297e9101452 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 14 Dec 2016 16:14:33 -0800 Subject: [PATCH 028/132] fix estimate charging --- bin/battery-status | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/battery-status b/bin/battery-status index 92b245837c9..fcd917a89ea 100755 --- a/bin/battery-status +++ b/bin/battery-status @@ -18,11 +18,11 @@ then emoji='🔋' else emoji='🔌' +fi - if [[ $time_left == *"(no"* ]] - then - time_left='⌛️ ' - fi +if [[ $time_left == *"(no"* ]] +then + time_left='⌛️ ' fi printf "\033[1;92m$emoji $time_left \033[0m" From 28c59ab24db8f9523efd6a77a8a01ad104776cb1 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 14 Dec 2016 16:17:13 -0800 Subject: [PATCH 029/132] i think this is a battery state too --- bin/battery-status | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/battery-status b/bin/battery-status index fcd917a89ea..036c4449689 100755 --- a/bin/battery-status +++ b/bin/battery-status @@ -20,7 +20,7 @@ else emoji='🔌' fi -if [[ $time_left == *"(no"* ]] +if [[ $time_left == *"(no"* || $time_left == *"not"* ]] then time_left='⌛️ ' fi From 26e2543bd490f875df0db77f0e742a79669656f0 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 14 Dec 2016 16:47:07 -0800 Subject: [PATCH 030/132] i think this'll sorta work for full charge, will check in an hour lol --- bin/battery-status | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/battery-status b/bin/battery-status index 036c4449689..eef28a826d2 100755 --- a/bin/battery-status +++ b/bin/battery-status @@ -25,4 +25,9 @@ then time_left='⌛️ ' fi +if [[ $time_left == *"0:00"* ]] +then + time_left='⚡️ ' +fi + printf "\033[1;92m$emoji $time_left \033[0m" From 4796f9736192db446b52d80fda35ed4060156b80 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 29 Dec 2016 22:05:17 -0600 Subject: [PATCH 031/132] Update the git prompt to show difference from origin --- zsh/prompt.zsh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh index 3d34bf64d5c..099c723d438 100644 --- a/zsh/prompt.zsh +++ b/zsh/prompt.zsh @@ -33,16 +33,20 @@ git_prompt_info () { echo "${ref#refs/heads/}" } -unpushed () { - $git cherry -v @{upstream} 2>/dev/null -} - +# This assumes that you always have an origin named `origin`, and that you only +# care about one specific origin. If this is not the case, you might want to use +# `$git cherry -v @{upstream}` instead. need_push () { - if [[ $(unpushed) == "" ]] + if [ $($git rev-parse --is-inside-work-tree 2>/dev/null) ] then - echo " " - else - echo " with %{$fg_bold[magenta]%}unpushed%{$reset_color%} " + number=$($git cherry -v origin/$(git symbolic-ref --short HEAD) | wc -l | bc) + + if [[ $number == 0 ]] + then + echo " " + else + echo " with %{$fg_bold[magenta]%}$number unpushed%{$reset_color%}" + fi fi } From b6dfe343cdeefa7412b7f073d71747f757d0ebdb Mon Sep 17 00:00:00 2001 From: John Rees Date: Fri, 30 Dec 2016 21:16:47 +0000 Subject: [PATCH 032/132] Update Yarn PATH to match docs' recommendation https://yarnpkg.com/en/docs/install --- yarn/path.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn/path.zsh b/yarn/path.zsh index d7f690dfaa1..799d8eec6b2 100644 --- a/yarn/path.zsh +++ b/yarn/path.zsh @@ -1,4 +1,4 @@ # sup yarn # https://yarnpkg.com -export PATH="$HOME/.yarn/bin:$PATH" +export PATH="$PATH:`yarn global bin`" From 84992280a9bd84dce94b3ab452d57912f6624ef8 Mon Sep 17 00:00:00 2001 From: John Rees Date: Sun, 1 Jan 2017 13:39:16 +0000 Subject: [PATCH 033/132] Removed GOPATH from Atom's config.cson Don't think it's necessary(?) as $GOPATH is set in https://github.com/holman/dotfiles/blob/master/go/path.zsh https://github.com/joefitzgerald/go-config/wiki/GOPATH --- atom.symlink/config.cson | 2 -- 1 file changed, 2 deletions(-) diff --git a/atom.symlink/config.cson b/atom.symlink/config.cson index 6c695da3dd8..1c4022cc3a2 100644 --- a/atom.symlink/config.cson +++ b/atom.symlink/config.cson @@ -26,8 +26,6 @@ invisibles: {} showIndentGuide: true softWrapAtPreferredLineLength: true - "go-plus": - goPath: "/Users/holman/Code/go" "linter-eslint": useGlobalEslint: true "release-notes": From adf99de6e8f70a64d11fbd47d5c19a3d4d664d88 Mon Sep 17 00:00:00 2001 From: John Rees Date: Sun, 1 Jan 2017 13:51:20 +0000 Subject: [PATCH 034/132] Added watchOS simulator alias Dunno if this is any use tbh, maybe Tim Cook would appreciate it being included. --- xcode/aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/xcode/aliases.zsh b/xcode/aliases.zsh index b9b817ec106..53dc5922efe 100644 --- a/xcode/aliases.zsh +++ b/xcode/aliases.zsh @@ -1 +1,2 @@ alias ios="open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app" +alias watchos="open /Applications/Xcode.app/Contents/Developer/Applications/Simulator\ \(Watch\).app" From 7acc78cb626eac2b9cd12cc257e5837d1c1adf0b Mon Sep 17 00:00:00 2001 From: Jacob Gillespie Date: Sun, 1 Jan 2017 08:55:43 -0600 Subject: [PATCH 035/132] Conditionally detect yarn --- yarn/path.zsh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yarn/path.zsh b/yarn/path.zsh index 799d8eec6b2..48df09ba031 100644 --- a/yarn/path.zsh +++ b/yarn/path.zsh @@ -1,4 +1,6 @@ # sup yarn # https://yarnpkg.com -export PATH="$PATH:`yarn global bin`" +if (( $+commands[yarn] )) + export PATH="$PATH:`yarn global bin`" +then From a2c3bbac1fc6c9880cf1689aa482eccad8d597da Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Sun, 1 Jan 2017 12:57:30 -0800 Subject: [PATCH 036/132] Fix yarn conditional --- yarn/path.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yarn/path.zsh b/yarn/path.zsh index 48df09ba031..7d2b91e6c3c 100644 --- a/yarn/path.zsh +++ b/yarn/path.zsh @@ -2,5 +2,6 @@ # https://yarnpkg.com if (( $+commands[yarn] )) - export PATH="$PATH:`yarn global bin`" then + export PATH="$PATH:`yarn global bin`" +fi From 95861eda2919c1313a3412a093fd8bd18b7bd97d Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Sun, 1 Jan 2017 13:02:57 -0800 Subject: [PATCH 037/132] close the panel --- atom.symlink/config.cson | 2 ++ 1 file changed, 2 insertions(+) diff --git a/atom.symlink/config.cson b/atom.symlink/config.cson index 1c4022cc3a2..d6761631737 100644 --- a/atom.symlink/config.cson +++ b/atom.symlink/config.cson @@ -26,6 +26,8 @@ invisibles: {} showIndentGuide: true softWrapAtPreferredLineLength: true + "go-plus": + panelDisplayMode: "closed" "linter-eslint": useGlobalEslint: true "release-notes": From 4e2ce6d41527327124f46c0d139cad81697614f4 Mon Sep 17 00:00:00 2001 From: Tom Gamble Date: Tue, 20 Dec 2016 15:35:08 -0500 Subject: [PATCH 038/132] updated atom folder structure for cleanliness --- .gitignore | 20 +++++++++---------- .../atom.symlink}/atom.coffee | 0 .../atom.symlink}/config.cson | 0 .../atom.symlink}/init.coffee | 0 4 files changed, 10 insertions(+), 10 deletions(-) rename {atom.symlink => atom/atom.symlink}/atom.coffee (100%) rename {atom.symlink => atom/atom.symlink}/config.cson (100%) rename {atom.symlink => atom/atom.symlink}/init.coffee (100%) diff --git a/.gitignore b/.gitignore index 1214493374b..7eaef06a450 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ -atom.symlink/.apm -atom.symlink/.node-gyp -atom.symlink/.storage -atom.symlink/blob-store -atom.symlink/compile-cache/ -atom.symlink/packages -atom.symlink/storage -atom.symlink/themes -atom.symlink/blob-store -atom.symlink/recovery +atom/atom.symlink/.apm +atom/atom.symlink/.node-gyp +atom/atom.symlink/.storage +atom/atom.symlink/blob-store +atom/atom.symlink/compile-cache/ +atom/atom.symlink/packages +atom/atom.symlink/storage +atom/atom.symlink/themes +atom/atom.symlink/blob-store +atom/atom.symlink/recovery git/gitconfig.local.symlink diff --git a/atom.symlink/atom.coffee b/atom/atom.symlink/atom.coffee similarity index 100% rename from atom.symlink/atom.coffee rename to atom/atom.symlink/atom.coffee diff --git a/atom.symlink/config.cson b/atom/atom.symlink/config.cson similarity index 100% rename from atom.symlink/config.cson rename to atom/atom.symlink/config.cson diff --git a/atom.symlink/init.coffee b/atom/atom.symlink/init.coffee similarity index 100% rename from atom.symlink/init.coffee rename to atom/atom.symlink/init.coffee From a779d1cc2d0cbb2b03303457e8f189ccedfa55c4 Mon Sep 17 00:00:00 2001 From: Tom Gamble Date: Tue, 20 Dec 2016 15:37:00 -0500 Subject: [PATCH 039/132] set java_home --- zsh/zshrc.symlink | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index d398ac84809..ea5a3320e7c 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -1,6 +1,8 @@ # shortcut to this dotfiles path is $ZSH export ZSH=$HOME/.dotfiles +export JAVA_HOME=$(/usr/libexec/java_home) + # your project folder that we can `c [tab]` to export PROJECTS=~/Code From 7c8df64a2ac66f2ed84c1ecf902207e393da669e Mon Sep 17 00:00:00 2001 From: Tom Gamble Date: Tue, 20 Dec 2016 15:39:04 -0500 Subject: [PATCH 040/132] docker convenience aliases --- docker/aliases.zsh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docker/aliases.zsh b/docker/aliases.zsh index 17b10f6bc90..ed574281f6e 100644 --- a/docker/aliases.zsh +++ b/docker/aliases.zsh @@ -1,2 +1,13 @@ alias d='docker $*' alias d-c='docker-compose $*' + +alias docker-prune='docker ps -a | grep Exited | awk '"'"'{ print $1 }'"'"' | xargs docker rm' + +function dockerenv () { + local args=${@:-default} + eval $(docker-machine env $args) + } + + function docker-empty () { + docker ps -aq | xargs --no-run-if-empty docker rm -f + } From 2c729bf7ea361ba18b62ad4b9467b119fe5fccd0 Mon Sep 17 00:00:00 2001 From: Tom Gamble Date: Tue, 20 Dec 2016 15:41:13 -0500 Subject: [PATCH 041/132] automate rbenv install and ruby update --- ruby/install.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 ruby/install.sh diff --git a/ruby/install.sh b/ruby/install.sh new file mode 100644 index 00000000000..097ddda4bf3 --- /dev/null +++ b/ruby/install.sh @@ -0,0 +1,10 @@ +if [[ ! -x "$(which rbenv)" ]] +then + echo + echo "Installing Ruby tools and Ruby 2.3.3" + eval "$(rbenv init -)" + rbenv install 2.3.3 --skip-existing + rbenv global 2.3.3 + gem install bundler + rbenv rehash +fi \ No newline at end of file From 5f2a5e5a1f0c83857b63304e00e921b3bdbfc60b Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 3 Jan 2017 13:58:19 -0800 Subject: [PATCH 042/132] Revert "Minor updates" --- .gitignore | 20 +++++++++---------- .../atom.symlink => atom.symlink}/atom.coffee | 0 .../atom.symlink => atom.symlink}/config.cson | 0 .../atom.symlink => atom.symlink}/init.coffee | 0 docker/aliases.zsh | 11 ---------- ruby/install.sh | 10 ---------- zsh/zshrc.symlink | 2 -- 7 files changed, 10 insertions(+), 33 deletions(-) rename {atom/atom.symlink => atom.symlink}/atom.coffee (100%) rename {atom/atom.symlink => atom.symlink}/config.cson (100%) rename {atom/atom.symlink => atom.symlink}/init.coffee (100%) delete mode 100644 ruby/install.sh diff --git a/.gitignore b/.gitignore index 7eaef06a450..1214493374b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ -atom/atom.symlink/.apm -atom/atom.symlink/.node-gyp -atom/atom.symlink/.storage -atom/atom.symlink/blob-store -atom/atom.symlink/compile-cache/ -atom/atom.symlink/packages -atom/atom.symlink/storage -atom/atom.symlink/themes -atom/atom.symlink/blob-store -atom/atom.symlink/recovery +atom.symlink/.apm +atom.symlink/.node-gyp +atom.symlink/.storage +atom.symlink/blob-store +atom.symlink/compile-cache/ +atom.symlink/packages +atom.symlink/storage +atom.symlink/themes +atom.symlink/blob-store +atom.symlink/recovery git/gitconfig.local.symlink diff --git a/atom/atom.symlink/atom.coffee b/atom.symlink/atom.coffee similarity index 100% rename from atom/atom.symlink/atom.coffee rename to atom.symlink/atom.coffee diff --git a/atom/atom.symlink/config.cson b/atom.symlink/config.cson similarity index 100% rename from atom/atom.symlink/config.cson rename to atom.symlink/config.cson diff --git a/atom/atom.symlink/init.coffee b/atom.symlink/init.coffee similarity index 100% rename from atom/atom.symlink/init.coffee rename to atom.symlink/init.coffee diff --git a/docker/aliases.zsh b/docker/aliases.zsh index ed574281f6e..17b10f6bc90 100644 --- a/docker/aliases.zsh +++ b/docker/aliases.zsh @@ -1,13 +1,2 @@ alias d='docker $*' alias d-c='docker-compose $*' - -alias docker-prune='docker ps -a | grep Exited | awk '"'"'{ print $1 }'"'"' | xargs docker rm' - -function dockerenv () { - local args=${@:-default} - eval $(docker-machine env $args) - } - - function docker-empty () { - docker ps -aq | xargs --no-run-if-empty docker rm -f - } diff --git a/ruby/install.sh b/ruby/install.sh deleted file mode 100644 index 097ddda4bf3..00000000000 --- a/ruby/install.sh +++ /dev/null @@ -1,10 +0,0 @@ -if [[ ! -x "$(which rbenv)" ]] -then - echo - echo "Installing Ruby tools and Ruby 2.3.3" - eval "$(rbenv init -)" - rbenv install 2.3.3 --skip-existing - rbenv global 2.3.3 - gem install bundler - rbenv rehash -fi \ No newline at end of file diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index ea5a3320e7c..d398ac84809 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -1,8 +1,6 @@ # shortcut to this dotfiles path is $ZSH export ZSH=$HOME/.dotfiles -export JAVA_HOME=$(/usr/libexec/java_home) - # your project folder that we can `c [tab]` to export PROJECTS=~/Code From 26a1416a1ee00a743cf609371a4b3562ce4572c5 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Sun, 19 Mar 2017 08:35:57 -0700 Subject: [PATCH 043/132] update atom --- atom.symlink/config.cson | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/atom.symlink/config.cson b/atom.symlink/config.cson index d6761631737..2895c9b7f27 100644 --- a/atom.symlink/config.cson +++ b/atom.symlink/config.cson @@ -16,10 +16,6 @@ "vendor" ] telemetryConsent: "no" - themes: [ - "unity-ui" - "glacier-syntax" - ] editor: fontFamily: "Menlo" fontSize: 15 @@ -41,3 +37,6 @@ ] welcome: showOnStartup: false +".js.jsx.react.source": + editor: + autoIndent: true From 35dba3eae4cd9df0f041bfbd3989754e8ebef043 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 13 Apr 2017 13:20:40 -0700 Subject: [PATCH 044/132] add prettier --- atom.symlink/config.cson | 3 +++ 1 file changed, 3 insertions(+) diff --git a/atom.symlink/config.cson b/atom.symlink/config.cson index 2895c9b7f27..f3e8c70f7cf 100644 --- a/atom.symlink/config.cson +++ b/atom.symlink/config.cson @@ -26,6 +26,9 @@ panelDisplayMode: "closed" "linter-eslint": useGlobalEslint: true + "prettier-atom": + formatOnSaveOptions: + enabled: true "release-notes": viewedVersion: "0.89.0" "spell-check": From dca60507902776fb47be7fb971849c9a67422350 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 13 Apr 2017 13:20:49 -0700 Subject: [PATCH 045/132] fix the unpushed branch error --- zsh/prompt.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh index 099c723d438..912a36bb6c6 100644 --- a/zsh/prompt.zsh +++ b/zsh/prompt.zsh @@ -39,7 +39,7 @@ git_prompt_info () { need_push () { if [ $($git rev-parse --is-inside-work-tree 2>/dev/null) ] then - number=$($git cherry -v origin/$(git symbolic-ref --short HEAD) | wc -l | bc) + number=$($git cherry -v origin/$(git symbolic-ref --short HEAD) 2>/dev/null | wc -l | bc) if [[ $number == 0 ]] then From 38c1361d110ea3435f1e18d6653165dce071570a Mon Sep 17 00:00:00 2001 From: Richard Macdonald Date: Wed, 26 Apr 2017 23:37:07 -0600 Subject: [PATCH 046/132] updates the prompt to display battery information only for machines that have one --- zsh/prompt.zsh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh index 912a36bb6c6..fabc959bcb6 100644 --- a/zsh/prompt.zsh +++ b/zsh/prompt.zsh @@ -55,7 +55,10 @@ directory_name() { } battery_status() { - $ZSH/bin/battery-status + if [[ $(sysctl -n hw.model) == *"Book"* ]] + then + $ZSH/bin/battery-status + fi } export PROMPT=$'\n$(battery_status)in $(directory_name) $(git_dirty)$(need_push)\n› ' From a817bb60ceffb3c092f1a7715eaac50d3dda9823 Mon Sep 17 00:00:00 2001 From: Calvin Leung Huang Date: Fri, 5 May 2017 00:41:30 -0400 Subject: [PATCH 047/132] Output dep install progress --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index 192e165ff0d..ec33297de17 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -144,7 +144,7 @@ install_dotfiles if [ "$(uname -s)" == "Darwin" ] then info "installing dependencies" - if source bin/dot > /tmp/dotfiles-dot 2>&1 + if source bin/dot | while read -r data; do info "$data"; done then success "dependencies installed" else From a89a9dcd6a386a50857ed2b3fe7fc835c00b8076 Mon Sep 17 00:00:00 2001 From: Calvin Leung Huang Date: Sat, 6 May 2017 01:41:44 -0400 Subject: [PATCH 048/132] Improve search history --- zsh/zshrc.symlink | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index d398ac84809..9ce55833097 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -39,3 +39,12 @@ do done unset config_files + +# Better history +# Credits to https://coderwall.com/p/jpj_6q/zsh-better-history-searching-with-arrow-keys +autoload -U up-line-or-beginning-search +autoload -U down-line-or-beginning-search +zle -N up-line-or-beginning-search +zle -N down-line-or-beginning-search +bindkey "^[[A" up-line-or-beginning-search # Up +bindkey "^[[B" down-line-or-beginning-search # Down \ No newline at end of file From 45257e1c376f3469de17e93e168db1ca5081ae82 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Sat, 6 May 2017 16:01:37 +0200 Subject: [PATCH 049/132] uhhh i have added Things to atom --- atom.symlink/config.cson | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/atom.symlink/config.cson b/atom.symlink/config.cson index f3e8c70f7cf..f55bd274f9e 100644 --- a/atom.symlink/config.cson +++ b/atom.symlink/config.cson @@ -1,4 +1,21 @@ "*": + "atom-beautify": + crystal: + beautify_on_save: true + css: + beautify_on_save: true + html: + beautify_on_save: true + js: + disabled: true + jsx: + disabled: true + markdown: + beautify_on_save: true + nginx: + beautify_on_save: true + ruby: + default_beautifier: "Ruby Beautify" core: disabledPackages: [ "background-tips" @@ -38,6 +55,8 @@ "text.git-commit" "text.html.basic" ] + stylefmt: + formatOnSave: true welcome: showOnStartup: false ".js.jsx.react.source": From 8d4881a5adec944b3a8dea1e769a3cbdd7e7bbb6 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 19 May 2017 12:07:27 +0200 Subject: [PATCH 050/132] change some atom settings --- atom.symlink/config.cson | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/atom.symlink/config.cson b/atom.symlink/config.cson index f55bd274f9e..75f0db72ff4 100644 --- a/atom.symlink/config.cson +++ b/atom.symlink/config.cson @@ -16,7 +16,12 @@ beautify_on_save: true ruby: default_beautifier: "Ruby Beautify" + "autocomplete-modules": + babelPluginModuleResolver: true + webpack: true core: + closeDeletedFileTabs: true + closeEmptyWindows: false disabledPackages: [ "background-tips" "exception-reporting" @@ -62,3 +67,7 @@ ".js.jsx.react.source": editor: autoIndent: true +".js.jsx.source": + editor: + autoIndent: false + autoIndentOnPaste: false From 0b1457842b6ab367e2856dcc6a37697ede23fc0c Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 19 Jul 2017 11:17:44 -0700 Subject: [PATCH 051/132] i always forget about the damn dns flush command --- bin/dns-flush | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 bin/dns-flush diff --git a/bin/dns-flush b/bin/dns-flush new file mode 100755 index 00000000000..dc3f4c076b7 --- /dev/null +++ b/bin/dns-flush @@ -0,0 +1,6 @@ +#!/bin/sh +# +# I literally always forget how to flush my DNS settings on macOS (in large part +# because it changes every damn update). + +sudo killall -HUP mDNSResponder From 44f479a24f8f063a05cb76de3890048492c1a380 Mon Sep 17 00:00:00 2001 From: Eric Dahlseng Date: Tue, 22 Aug 2017 13:28:03 -0700 Subject: [PATCH 052/132] Added edit option to dot command --- bin/dot | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/bin/dot b/bin/dot index 4d3455621c0..605b0591ec5 100755 --- a/bin/dot +++ b/bin/dot @@ -4,6 +4,40 @@ # # `dot` handles installation, updates, things like that. Run it periodically # to make sure you're on the latest and greatest. + +set -e + +parentDirectory="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd -P)" +dotfilesDirectory="$(cd "$( dirname "$parentDirectory" )" && pwd -P)" + +displayUsageAndExit() { + echo "dot -- dotfiles management" + echo "" + echo "Usage: dot [options]" + echo "" + echo "Options:" + echo " -e, --edit Open dotfiles directory for editing" + echo " -h, --help Show this help message and exit" + exit +} + +while test $# -gt 0; do + case "$1" in + "-h"|"--help") + displayUsageAndExit + ;; + "-e"|"--edit") + exec "$EDITOR" "$dotfilesDirectory" + exit + ;; + *) + echo "Invalid option: $1" + displayUsageAndExit + ;; + esac + shift +done + export ZSH=$HOME/.dotfiles # Set macOS defaults From d0fce7448b993501a51f93db9c0cdd82ce73dfd0 Mon Sep 17 00:00:00 2001 From: "T.J. Schuck" Date: Tue, 29 Aug 2017 14:46:15 -0400 Subject: [PATCH 053/132] Fix broken Homebrew Cask link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 30586a84fe4..9e73facfd0c 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ There's a few special files in the hierarchy. - **bin/**: Anything in `bin/` will get added to your `$PATH` and be made available everywhere. -- **Brewfile**: This is a list of applications for [Homebrew Cask](http://caskroom.io) to install: things like Chrome and 1Password and Adium and stuff. Might want to edit this file before running any initial setup. +- **Brewfile**: This is a list of applications for [Homebrew Cask](https://caskroom.github.io) to install: things like Chrome and 1Password and Adium and stuff. Might want to edit this file before running any initial setup. - **topic/\*.zsh**: Any files ending in `.zsh` get loaded into your environment. - **topic/path.zsh**: Any file named `path.zsh` is loaded first and is From ef11a015305a2ea3e07b358c3d0ef56890d13e60 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 30 Aug 2017 15:43:24 -0700 Subject: [PATCH 054/132] more atom cson files --- atom.symlink/config.cson | 30 +++++++++++++++++++++++++++++- atom.symlink/github.cson | 1 + atom.symlink/keymap.cson | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 atom.symlink/github.cson create mode 100644 atom.symlink/keymap.cson diff --git a/atom.symlink/config.cson b/atom.symlink/config.cson index 75f0db72ff4..39013e119ee 100644 --- a/atom.symlink/config.cson +++ b/atom.symlink/config.cson @@ -22,10 +22,25 @@ core: closeDeletedFileTabs: true closeEmptyWindows: false + customFileTypes: + "source.ini": [ + ".buckconfig" + ".hgrc" + ".flowconfig" + ] + "source.json": [ + "BUCK.autodeps" + ] + "source.python": [ + "BUCK" + ] disabledPackages: [ "background-tips" "exception-reporting" "metrics" + "react" + "linter-rubocop" + "tree-view" ] followSymlinks: false hideGitIgnoredFiles: true @@ -38,16 +53,29 @@ "vendor" ] telemetryConsent: "no" + themes: [ + "one-light-ui" + "one-light-syntax" + ] editor: fontFamily: "Menlo" - fontSize: 15 invisibles: {} showIndentGuide: true softWrapAtPreferredLineLength: true "go-plus": + panel: + currentHeight: "24.11111111111111vh" panelDisplayMode: "closed" + test: {} "linter-eslint": useGlobalEslint: true + "linter-rubocop": {} + "linter-ui-default": + panelHeight: 301 + nuclide: + "atom-ide-code-format": + formatOnType: false + "nuclide-flow": {} "prettier-atom": formatOnSaveOptions: enabled: true diff --git a/atom.symlink/github.cson b/atom.symlink/github.cson new file mode 100644 index 00000000000..031c17cfe65 --- /dev/null +++ b/atom.symlink/github.cson @@ -0,0 +1 @@ +# Store non-visible GitHub package state. diff --git a/atom.symlink/keymap.cson b/atom.symlink/keymap.cson new file mode 100644 index 00000000000..f5545699589 --- /dev/null +++ b/atom.symlink/keymap.cson @@ -0,0 +1,2 @@ +'atom-text-editor:not([mini])': + 'alt-s': 'sort-lines:sort' From b943fe169f372c6ee0057c8ff698e1709719a6ba Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 7 Sep 2017 14:06:27 -0700 Subject: [PATCH 055/132] git-edit-new: quickly edit recently-generated files in your editor --- bin/git-edit-new | 10 ++++++++++ git/aliases.zsh | 1 + 2 files changed, 11 insertions(+) create mode 100755 bin/git-edit-new diff --git a/bin/git-edit-new b/bin/git-edit-new new file mode 100755 index 00000000000..cc1c244b1b1 --- /dev/null +++ b/bin/git-edit-new @@ -0,0 +1,10 @@ +#!/bin/sh +# +# Open new, unstaged files in your $EDITOR. +# +# This is nice to have when you run a command line generator which generates a +# file or three in your working directory, and you know you want to immediately +# edit them in your editor next. Why waste time clicking around like some sort +# of plebian when you can just run another command? + +$EDITOR $(git ls-files --others --exclude-standard) diff --git a/git/aliases.zsh b/git/aliases.zsh index a442f4bbdec..ac8f5a9be9a 100644 --- a/git/aliases.zsh +++ b/git/aliases.zsh @@ -21,3 +21,4 @@ alias gcb='git copy-branch-name' alias gb='git branch' alias gs='git status -sb' # upgrade your git if -sb breaks for you. it's fun. alias gac='git add -A && git commit -m' +alias ge='git-edit-new' From 80b2bd57e9c594dc7c783989801ee51930068d59 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Mon, 11 Jun 2018 10:32:56 -0700 Subject: [PATCH 056/132] Don't quick-jump into go projects --- functions/c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/functions/c b/functions/c index 486a3c6394b..ac49a5a7f49 100644 --- a/functions/c +++ b/functions/c @@ -12,13 +12,5 @@ # c holm/bo # # ...to quickly jump into holman/boom, for example. -# -# This also accounts for how Go structures its projects. For example, it will -# autocomplete both on $PROJECTS, and also assume you want to autocomplete on -# your Go projects in $GOPATH/src. -if [ ! -z "$1" ] && [ -s "$GOPATH/src/github.com/$1" ]; then - cd "$GOPATH/src/github.com/$1" -else - cd "$PROJECTS/$1" -fi +cd "$PROJECTS/$1" From c0ba0cc610a17f359d6d33edf6848b8afde79496 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 17 Jul 2018 12:35:47 -0700 Subject: [PATCH 057/132] yt saves to desktop --- bin/yt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 bin/yt diff --git a/bin/yt b/bin/yt new file mode 100755 index 00000000000..ff4b59508d8 --- /dev/null +++ b/bin/yt @@ -0,0 +1,9 @@ +#!/bin/sh +# +# Downloads the embedded video on any web page straight to the desktop. +# +# youtube-dl, which is awesome: +# https://rg3.github.io/youtube-dl/ +# + +cd ~/Desktop && youtube-dl "$1" From 6ed21b4253206bcae4eaa57c052f826b77b31b23 Mon Sep 17 00:00:00 2001 From: Andy Grunwald Date: Fri, 8 Feb 2019 15:43:27 +0100 Subject: [PATCH 058/132] Fix link to rtomayko/dotfiles headers script --- bin/headers | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/headers b/bin/headers index 9dd1f72c6e9..6a26f40d7c8 100755 --- a/bin/headers +++ b/bin/headers @@ -1,8 +1,8 @@ #!/bin/sh # -# https://github.com/rtomayko/dotfiles/blob/rtomayko/bin/headers +# https://github.com/rtomayko/dotfiles/blob/rtomayko/.local/bin/headers curl -sv "$@" 2>&1 >/dev/null | grep -v "^\*" | grep -v "^}" | - cut -c3- \ No newline at end of file + cut -c3- From d61441e2443cf157851d7cee8a490e8b63132a85 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 8 Feb 2019 10:22:01 -0800 Subject: [PATCH 059/132] atom => vscode --- .gitignore | 11 ----- Brewfile | 1 - atom.symlink/atom.coffee | 1 - atom.symlink/config.cson | 101 --------------------------------------- atom.symlink/github.cson | 1 - atom.symlink/init.coffee | 1 - atom.symlink/keymap.cson | 2 - bin/atom-package-backup | 11 ----- git/gitconfig.symlink | 2 + system/env.zsh | 2 +- 10 files changed, 3 insertions(+), 130 deletions(-) delete mode 100644 atom.symlink/atom.coffee delete mode 100644 atom.symlink/config.cson delete mode 100644 atom.symlink/github.cson delete mode 100644 atom.symlink/init.coffee delete mode 100644 atom.symlink/keymap.cson delete mode 100755 bin/atom-package-backup diff --git a/.gitignore b/.gitignore index 1214493374b..1b67d59d7d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1 @@ -atom.symlink/.apm -atom.symlink/.node-gyp -atom.symlink/.storage -atom.symlink/blob-store -atom.symlink/compile-cache/ -atom.symlink/packages -atom.symlink/storage -atom.symlink/themes -atom.symlink/blob-store -atom.symlink/recovery - git/gitconfig.local.symlink diff --git a/Brewfile b/Brewfile index 2bd5e909309..6b726da3654 100644 --- a/Brewfile +++ b/Brewfile @@ -29,7 +29,6 @@ brew 'youtube-dl' cask '1password' cask 'adium' -cask 'atom' cask 'firefox' cask 'garmin-express' cask 'google-chrome' diff --git a/atom.symlink/atom.coffee b/atom.symlink/atom.coffee deleted file mode 100644 index 297b7b6f0ac..00000000000 --- a/atom.symlink/atom.coffee +++ /dev/null @@ -1 +0,0 @@ -# Atom customization goes here. diff --git a/atom.symlink/config.cson b/atom.symlink/config.cson deleted file mode 100644 index 39013e119ee..00000000000 --- a/atom.symlink/config.cson +++ /dev/null @@ -1,101 +0,0 @@ -"*": - "atom-beautify": - crystal: - beautify_on_save: true - css: - beautify_on_save: true - html: - beautify_on_save: true - js: - disabled: true - jsx: - disabled: true - markdown: - beautify_on_save: true - nginx: - beautify_on_save: true - ruby: - default_beautifier: "Ruby Beautify" - "autocomplete-modules": - babelPluginModuleResolver: true - webpack: true - core: - closeDeletedFileTabs: true - closeEmptyWindows: false - customFileTypes: - "source.ini": [ - ".buckconfig" - ".hgrc" - ".flowconfig" - ] - "source.json": [ - "BUCK.autodeps" - ] - "source.python": [ - "BUCK" - ] - disabledPackages: [ - "background-tips" - "exception-reporting" - "metrics" - "react" - "linter-rubocop" - "tree-view" - ] - followSymlinks: false - hideGitIgnoredFiles: true - ignoredNames: [ - ".bundle" - ".git" - "log" - "repositories" - "tmp" - "vendor" - ] - telemetryConsent: "no" - themes: [ - "one-light-ui" - "one-light-syntax" - ] - editor: - fontFamily: "Menlo" - invisibles: {} - showIndentGuide: true - softWrapAtPreferredLineLength: true - "go-plus": - panel: - currentHeight: "24.11111111111111vh" - panelDisplayMode: "closed" - test: {} - "linter-eslint": - useGlobalEslint: true - "linter-rubocop": {} - "linter-ui-default": - panelHeight: 301 - nuclide: - "atom-ide-code-format": - formatOnType: false - "nuclide-flow": {} - "prettier-atom": - formatOnSaveOptions: - enabled: true - "release-notes": - viewedVersion: "0.89.0" - "spell-check": - grammars: [ - "text.plain" - "source.gfm" - "text.git-commit" - "text.html.basic" - ] - stylefmt: - formatOnSave: true - welcome: - showOnStartup: false -".js.jsx.react.source": - editor: - autoIndent: true -".js.jsx.source": - editor: - autoIndent: false - autoIndentOnPaste: false diff --git a/atom.symlink/github.cson b/atom.symlink/github.cson deleted file mode 100644 index 031c17cfe65..00000000000 --- a/atom.symlink/github.cson +++ /dev/null @@ -1 +0,0 @@ -# Store non-visible GitHub package state. diff --git a/atom.symlink/init.coffee b/atom.symlink/init.coffee deleted file mode 100644 index 3b5ebc569f7..00000000000 --- a/atom.symlink/init.coffee +++ /dev/null @@ -1 +0,0 @@ -# Add any auto-loaded Atom code on init here. diff --git a/atom.symlink/keymap.cson b/atom.symlink/keymap.cson deleted file mode 100644 index f5545699589..00000000000 --- a/atom.symlink/keymap.cson +++ /dev/null @@ -1,2 +0,0 @@ -'atom-text-editor:not([mini])': - 'alt-s': 'sort-lines:sort' diff --git a/bin/atom-package-backup b/bin/atom-package-backup deleted file mode 100755 index 25f8a451b95..00000000000 --- a/bin/atom-package-backup +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# -# Usage: atom-package-backup -# -# Saves a list of your currently installed atom packages to -# ~/.dotfiles/atom.symlink/packages.txt suitable for install -# via atom-package-install - -set -e - -apm list --installed --bare > ~/.dotfiles/atom.symlink/packages.txt diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink index c936c2b2cf2..905ecc220d4 100644 --- a/git/gitconfig.symlink +++ b/git/gitconfig.symlink @@ -31,3 +31,5 @@ # # Setting to git 2.0 default to suppress warning message default = simple +[credential] + helper = osxkeychain diff --git a/system/env.zsh b/system/env.zsh index 9a97245a42d..b99078ff655 100644 --- a/system/env.zsh +++ b/system/env.zsh @@ -1 +1 @@ -export EDITOR='atom' +export EDITOR='code' From bce0146e874ecac2eb26e9eecb921eca756f3bed Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 14 Feb 2019 14:13:33 -0800 Subject: [PATCH 060/132] Remove Brewfile --- Brewfile | 42 ------------------------------------------ README.md | 3 +-- 2 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 Brewfile diff --git a/Brewfile b/Brewfile deleted file mode 100644 index 6b726da3654..00000000000 --- a/Brewfile +++ /dev/null @@ -1,42 +0,0 @@ -cask_args appdir: '/Applications' - -tap 'homebrew/bundle' -tap 'puma/puma' - -brew 'ack' -brew 'coreutils' -brew 'go' -brew 'grc' -brew 'imagemagick' -brew 'jp2a' -brew 'jq' -brew 'libcaca', args: ['with-imlib2'] -brew 'libgit2' -brew 'openssl' -brew 'node' -brew 'readline' -brew 'postgresql' -brew 'puma/puma/puma-dev' -brew 'ruby-build' -brew 'rbenv' -brew 'roundup' -brew 'spaceman-diff' -brew 'spark' -brew 'unrar' -brew 'wget' -brew 'yarn' -brew 'youtube-dl' - -cask '1password' -cask 'adium' -cask 'firefox' -cask 'garmin-express' -cask 'google-chrome' -cask 'handbrake' -cask 'mapbox-studio' -cask 'seashore' -cask 'slack' -cask 'steam' -cask 'transmission' -cask 'tunnelbear' -cask 'vlc' diff --git a/README.md b/README.md index 9e73facfd0c..497d64c78ca 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ There's a few special files in the hierarchy. - **bin/**: Anything in `bin/` will get added to your `$PATH` and be made available everywhere. -- **Brewfile**: This is a list of applications for [Homebrew Cask](https://caskroom.github.io) to install: things like Chrome and 1Password and Adium and stuff. Might want to edit this file before running any initial setup. - **topic/\*.zsh**: Any files ending in `.zsh` get loaded into your environment. - **topic/path.zsh**: Any file named `path.zsh` is loaded first and is @@ -71,7 +70,7 @@ this script in `bin/`. I want this to work for everyone; that means when you clone it down it should work for you even though you may not have `rbenv` installed, for example. That -said, I do use this as *my* dotfiles, so there's a good chance I may break +said, I do use this as _my_ dotfiles, so there's a good chance I may break something if I forget to make a check for a dependency. If you're brand-new to the project and run into any blockers, please From ebd4d55a8743aef8b6627433d734e9489ee4f7ab Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 14 Feb 2019 14:14:07 -0800 Subject: [PATCH 061/132] Remove the brewfile install line --- script/install | 4 ---- 1 file changed, 4 deletions(-) diff --git a/script/install b/script/install index 8d516b2a1fe..1887fc2ca49 100755 --- a/script/install +++ b/script/install @@ -6,9 +6,5 @@ set -e cd "$(dirname $0)"/.. -# Run Homebrew through the Brewfile -echo "› brew bundle" -brew bundle - # find the installers and run them iteratively find . -name install.sh | while read installer ; do sh -c "${installer}" ; done From abe1f9b87dfd55df2307f59d4cf599a8c8b325a5 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 14 Feb 2019 14:16:46 -0800 Subject: [PATCH 062/132] Only if you have npm --- node/install.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/node/install.sh b/node/install.sh index 1dff4f43777..03c92217043 100755 --- a/node/install.sh +++ b/node/install.sh @@ -1,4 +1,7 @@ if test ! $(which spoof) then - sudo npm install spoof -g + if test $(which npm) + then + sudo npm install spoof -g + fi fi From 7c148003debb4df489addb22a524a6c293dae645 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 14 Feb 2019 14:36:53 -0800 Subject: [PATCH 063/132] don't run mac stuff on non-macs --- macos/install.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/macos/install.sh b/macos/install.sh index b8a11de1a9f..312f8eb6ca9 100755 --- a/macos/install.sh +++ b/macos/install.sh @@ -1,3 +1,8 @@ +if test ! "$(uname)" = "Darwin" + then + exit 0 +fi + # The Brewfile handles Homebrew-based app and library installs, but there may # still be updates and installables in the Mac App Store. There's a nifty # command line interface to it that we can use to just install everything, so From fcd37dfe19f86ae81c9b1dd3453eba04db30a1e8 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 14 Feb 2019 14:44:40 -0800 Subject: [PATCH 064/132] battery status only on macs --- bin/battery-status | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/battery-status b/bin/battery-status index eef28a826d2..d4391d04b9d 100755 --- a/bin/battery-status +++ b/bin/battery-status @@ -5,6 +5,11 @@ # A quick little indicator for battery status on your Mac laptop, suitable for # display in your prompt. +if test ! "$(uname)" = "Darwin" + then + printf "" +fi + battstat=$(pmset -g batt) time_left=$(echo $battstat | tail -1 | From 03b2a114e0f1e996d64b607e6a523ca1307b61e0 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 14 Feb 2019 14:46:19 -0800 Subject: [PATCH 065/132] and exit --- bin/battery-status | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/battery-status b/bin/battery-status index d4391d04b9d..a0f75f0fb94 100755 --- a/bin/battery-status +++ b/bin/battery-status @@ -8,6 +8,7 @@ if test ! "$(uname)" = "Darwin" then printf "" + exit 0 fi battstat=$(pmset -g batt) From 7b8b643640e636d499fc4eaaf4de57d5bd8c2261 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 14 Feb 2019 14:56:33 -0800 Subject: [PATCH 066/132] battery status check --- zsh/prompt.zsh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh index fabc959bcb6..d35b8c53f5c 100644 --- a/zsh/prompt.zsh +++ b/zsh/prompt.zsh @@ -55,6 +55,11 @@ directory_name() { } battery_status() { + if test ! "$(uname)" = "Darwin" + then + exit 0 + fi + if [[ $(sysctl -n hw.model) == *"Book"* ]] then $ZSH/bin/battery-status From 1acaf30387b5be4eab26fa59b9155962d84e3684 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Mon, 29 Mar 2021 22:37:11 -0700 Subject: [PATCH 067/132] move to icloud --- zsh/zshrc.symlink | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 9ce55833097..a26b120b402 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -2,7 +2,7 @@ export ZSH=$HOME/.dotfiles # your project folder that we can `c [tab]` to -export PROJECTS=~/Code +export PROJECTS=~/iCloud/Code # Stash your environment variables in ~/.localrc. This means they'll stay out # of your main dotfiles repository (which may be public, like this one), but From e0b5153e721b8cda68ce34a23b098f871cd09700 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Sun, 4 Apr 2021 12:03:07 -0700 Subject: [PATCH 068/132] re-home Code dir --- zsh/zshrc.symlink | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index a26b120b402..849ed102d7a 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -2,7 +2,7 @@ export ZSH=$HOME/.dotfiles # your project folder that we can `c [tab]` to -export PROJECTS=~/iCloud/Code +export PROJECTS=~/Documents/Code # Stash your environment variables in ~/.localrc. This means they'll stay out # of your main dotfiles repository (which may be public, like this one), but @@ -47,4 +47,4 @@ autoload -U down-line-or-beginning-search zle -N up-line-or-beginning-search zle -N down-line-or-beginning-search bindkey "^[[A" up-line-or-beginning-search # Up -bindkey "^[[B" down-line-or-beginning-search # Down \ No newline at end of file +bindkey "^[[B" down-line-or-beginning-search # Down From 90bfacc8e4e52a5dddb40f624dad109f3488f721 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 24 Aug 2021 09:26:11 -0700 Subject: [PATCH 069/132] remove old subl --- bin/subl | 1 - 1 file changed, 1 deletion(-) delete mode 120000 bin/subl diff --git a/bin/subl b/bin/subl deleted file mode 120000 index 452a98979c8..00000000000 --- a/bin/subl +++ /dev/null @@ -1 +0,0 @@ -/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl \ No newline at end of file From 184e33b8b1b8d101b291b6e4a0d7c22184f84ba5 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 24 Aug 2021 09:28:57 -0700 Subject: [PATCH 070/132] rip youtube-dl, long live youtube-dlp --- bin/yt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/yt b/bin/yt index ff4b59508d8..834f92a6cf2 100755 --- a/bin/yt +++ b/bin/yt @@ -2,8 +2,8 @@ # # Downloads the embedded video on any web page straight to the desktop. # -# youtube-dl, which is awesome: -# https://rg3.github.io/youtube-dl/ +# youtube-dlp, which is awesome: +# https://github.com/yt-dlp/yt-dlp # -cd ~/Desktop && youtube-dl "$1" +cd ~/Desktop && yt-dlp "$1" From 9ad46f15a85685014b63a46e455dc00575810395 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 4 Nov 2021 15:17:20 -0700 Subject: [PATCH 071/132] no go --- go/path.zsh | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 go/path.zsh diff --git a/go/path.zsh b/go/path.zsh deleted file mode 100644 index 71bd1c338a7..00000000000 --- a/go/path.zsh +++ /dev/null @@ -1,2 +0,0 @@ -export GOPATH=$PROJECTS/go -export PATH="$GOPATH/bin:$PATH" From d33e52712151c5768956773c4f75dded6f12382d Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 4 Nov 2021 17:37:34 -0700 Subject: [PATCH 072/132] new homebrew path --- homebrew/path.zsh | 1 + 1 file changed, 1 insertion(+) create mode 100644 homebrew/path.zsh diff --git a/homebrew/path.zsh b/homebrew/path.zsh new file mode 100644 index 00000000000..ca6b69de199 --- /dev/null +++ b/homebrew/path.zsh @@ -0,0 +1 @@ +export PATH="/opt/homebrew/bin:$PATH" \ No newline at end of file From 9e49bed9db3d7fc5e6cea1f05b1ba8d9f0be85be Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 4 Nov 2021 17:41:03 -0700 Subject: [PATCH 073/132] well this was a failed experiment --- zsh/zshrc.symlink | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 849ed102d7a..e3ade6421bc 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -2,7 +2,7 @@ export ZSH=$HOME/.dotfiles # your project folder that we can `c [tab]` to -export PROJECTS=~/Documents/Code +export PROJECTS=~/Code # Stash your environment variables in ~/.localrc. This means they'll stay out # of your main dotfiles repository (which may be public, like this one), but From 6c073a5c89361277d7e61febfa2f7da5690c700b Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 18 May 2022 09:14:16 -0700 Subject: [PATCH 074/132] new youtube-dlp config --- bin/yt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/yt b/bin/yt index 834f92a6cf2..282027c79f8 100755 --- a/bin/yt +++ b/bin/yt @@ -6,4 +6,4 @@ # https://github.com/yt-dlp/yt-dlp # -cd ~/Desktop && yt-dlp "$1" +cd ~/Desktop && yt-dlp -S "ext" "$1" From 3fdd58eebe7287d6f78c1873b6c91b53309ff74d Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 18 May 2022 09:35:42 -0700 Subject: [PATCH 075/132] script to use `code --wait` --- bin/ee | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 bin/ee diff --git a/bin/ee b/bin/ee new file mode 100755 index 00000000000..d095f389c8c --- /dev/null +++ b/bin/ee @@ -0,0 +1,5 @@ +#!/bin/sh +# +# vscode requires `--wait` if you're editing interactively in a prompt. +# +EDITOR="$EDITOR --wait" $@ From d36efdcfbe302f3bf36eef7e48f9c5c454296ac3 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 4 Aug 2022 14:39:07 -0700 Subject: [PATCH 076/132] add fig hooks --- zsh/zshrc.symlink | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index e3ade6421bc..36fa863cc97 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -1,3 +1,5 @@ +# Fig pre block. Keep at the top of this file. +[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && . "$HOME/.fig/shell/zshrc.pre.zsh" # shortcut to this dotfiles path is $ZSH export ZSH=$HOME/.dotfiles @@ -48,3 +50,6 @@ zle -N up-line-or-beginning-search zle -N down-line-or-beginning-search bindkey "^[[A" up-line-or-beginning-search # Up bindkey "^[[B" down-line-or-beginning-search # Down + +# Fig post block. Keep at the bottom of this file. +[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && . "$HOME/.fig/shell/zshrc.post.zsh" From b50e3d866100a723a610ffb181ebb9e908fc1df4 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 4 Aug 2022 14:39:18 -0700 Subject: [PATCH 077/132] re-add spaceman-diff --- git/gitconfig.symlink | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink index 905ecc220d4..7f0647ba36f 100644 --- a/git/gitconfig.symlink +++ b/git/gitconfig.symlink @@ -33,3 +33,8 @@ default = simple [credential] helper = osxkeychain +[diff "spaceman-diff"] + command = /opt/homebrew/bin/spaceman-diff + +[init] + defaultBranch = main From 2721ac507a6e9f11d560039f115f5fc6b190e735 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 4 Aug 2022 14:41:21 -0700 Subject: [PATCH 078/132] find my `me` record in IRB via email instead of login --- ruby/irbrc.symlink | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby/irbrc.symlink b/ruby/irbrc.symlink index f25dcbfb023..061e9e16c94 100644 --- a/ruby/irbrc.symlink +++ b/ruby/irbrc.symlink @@ -40,7 +40,7 @@ def cop end def me - User.find_by_login(ENV['USER'].strip) + User.find_by_email(`git config --get user.email`.chomp) end def r From 21342e9f4e7d55ebfdc6e4e9071f94cbbc9eb0ef Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Mon, 5 Sep 2022 15:35:10 -0700 Subject: [PATCH 079/132] generate a time report with watson --- bin/time-report | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 bin/time-report diff --git a/bin/time-report b/bin/time-report new file mode 100755 index 00000000000..f9d31e06ffd --- /dev/null +++ b/bin/time-report @@ -0,0 +1,21 @@ +#!/bin/zsh +# +# time-report [from] [to] +# +# A quick script to pull a report from `watson` +# (https://github.com/TailorDev/Watson) and dump it out to my desktop. +# +# Example: +# +# time-report 2022-08-15 2022-08-31 + +set -e + +start=$1 +end=$2 + +file=$HOME/Desktop/"$1 to $2.txt" +log=$(watson log --from $1 --to $2) +total=$(watson report --from $1 --to $2 | tail -1) + +(echo $total; echo ""; echo $log) > "${file}" \ No newline at end of file From 3e7a2a643e367d9e8c7c184558827c66b916b00b Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 21 Apr 2023 09:09:23 -0700 Subject: [PATCH 080/132] bump fig line --- zsh/zshrc.symlink | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 36fa863cc97..8b034a3020b 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -1,5 +1,5 @@ # Fig pre block. Keep at the top of this file. -[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && . "$HOME/.fig/shell/zshrc.pre.zsh" +[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh" # shortcut to this dotfiles path is $ZSH export ZSH=$HOME/.dotfiles @@ -52,4 +52,4 @@ bindkey "^[[A" up-line-or-beginning-search # Up bindkey "^[[B" down-line-or-beginning-search # Down # Fig post block. Keep at the bottom of this file. -[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && . "$HOME/.fig/shell/zshrc.post.zsh" +[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh" From fbe175f38cb0fc795853aa34429d76f4ab884b41 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 11 Jan 2024 20:51:30 -0800 Subject: [PATCH 081/132] rm fig --- zsh/zshrc.symlink | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 8b034a3020b..baa385f2b2c 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -1,5 +1,3 @@ -# Fig pre block. Keep at the top of this file. -[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh" # shortcut to this dotfiles path is $ZSH export ZSH=$HOME/.dotfiles @@ -51,5 +49,4 @@ zle -N down-line-or-beginning-search bindkey "^[[A" up-line-or-beginning-search # Up bindkey "^[[B" down-line-or-beginning-search # Down -# Fig post block. Keep at the bottom of this file. -[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh" +eval "$(github-copilot-cli alias -- "$0")" From 0c6ab2f4c4c21a48e0a22f02dc733f1a7fd69e99 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 11 Jan 2024 20:53:18 -0800 Subject: [PATCH 082/132] no need for node (that's right i said it) --- node/install.sh | 7 ------- 1 file changed, 7 deletions(-) delete mode 100755 node/install.sh diff --git a/node/install.sh b/node/install.sh deleted file mode 100755 index 03c92217043..00000000000 --- a/node/install.sh +++ /dev/null @@ -1,7 +0,0 @@ -if test ! $(which spoof) -then - if test $(which npm) - then - sudo npm install spoof -g - fi -fi From 8926eca023f48514cd4b9dd2805cccb8bb6ee4d2 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 11 Jan 2024 21:02:02 -0800 Subject: [PATCH 083/132] update plist format --- macos/set-defaults.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/macos/set-defaults.sh b/macos/set-defaults.sh index 03d6f2d9dbe..017c6e56070 100755 --- a/macos/set-defaults.sh +++ b/macos/set-defaults.sh @@ -31,11 +31,11 @@ defaults write com.apple.dock wvous-bl-corner -int 5 defaults write com.apple.dock wvous-bl-modifier -int 0 # Hide Safari's bookmark bar. -defaults write com.apple.Safari ShowFavoritesBar -bool false +defaults write com.apple.Safari.plist ShowFavoritesBar -bool false # Set up Safari for development. -defaults write com.apple.Safari IncludeInternalDebugMenu -bool true -defaults write com.apple.Safari IncludeDevelopMenu -bool true -defaults write com.apple.Safari WebKitDeveloperExtrasEnabledPreferenceKey -bool true -defaults write com.apple.Safari "com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled" -bool true +defaults write com.apple.Safari.SandboxBroker ShowDevelopMenu -bool true +defaults write com.apple.Safari.plist IncludeDevelopMenu -bool true +defaults write com.apple.Safari.plist WebKitDeveloperExtrasEnabledPreferenceKey -bool true +defaults write com.apple.Safari.plist "com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled" -bool true defaults write NSGlobalDomain WebKitDeveloperExtras -bool true From 064b365df1a299ed3943cbbacb27a17e1e337d52 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 11 Jan 2024 21:03:05 -0800 Subject: [PATCH 084/132] opt for faster dot --- macos/install.sh | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100755 macos/install.sh diff --git a/macos/install.sh b/macos/install.sh deleted file mode 100755 index 312f8eb6ca9..00000000000 --- a/macos/install.sh +++ /dev/null @@ -1,12 +0,0 @@ -if test ! "$(uname)" = "Darwin" - then - exit 0 -fi - -# The Brewfile handles Homebrew-based app and library installs, but there may -# still be updates and installables in the Mac App Store. There's a nifty -# command line interface to it that we can use to just install everything, so -# yeah, let's do that. - -echo "› sudo softwareupdate -i -a" -sudo softwareupdate -i -a From 763d54e588dd6f7319aa7f907168ff3606ceff8f Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 11 Jan 2024 21:09:41 -0800 Subject: [PATCH 085/132] hey let's use the brewfile again --- Brewfile | 13 +++++++++++++ script/install | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 Brewfile diff --git a/Brewfile b/Brewfile new file mode 100644 index 00000000000..93ec75a830b --- /dev/null +++ b/Brewfile @@ -0,0 +1,13 @@ +cask_args appdir: '/Applications' + +tap 'homebrew/bundle' + +brew 'imagemagick' +brew 'spaceman-diff' +brew 'spark' +brew 'wget' +brew 'yt-dlp' + +cask '1password' +cask 'handbrake' +cask 'vlc' diff --git a/script/install b/script/install index 1887fc2ca49..826f87e8dd0 100755 --- a/script/install +++ b/script/install @@ -6,5 +6,8 @@ set -e cd "$(dirname $0)"/.. +echo "› brew bundle" +brew bundle + # find the installers and run them iteratively find . -name install.sh | while read installer ; do sh -c "${installer}" ; done From b2c58fe58aa32fdf86a1c10abd23a44100e2bb26 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 11 Jan 2024 21:14:39 -0800 Subject: [PATCH 086/132] ignore brewfile lock --- .gitignore | 1 + Brewfile | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1b67d59d7d7..bbb3a495c22 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ git/gitconfig.local.symlink +Brewfile.lock.json diff --git a/Brewfile b/Brewfile index 93ec75a830b..95bc6e8bb00 100644 --- a/Brewfile +++ b/Brewfile @@ -8,6 +8,5 @@ brew 'spark' brew 'wget' brew 'yt-dlp' -cask '1password' cask 'handbrake' cask 'vlc' From 241576a4f677cde57cd43e625725997dd2aa7212 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 11 Jan 2024 21:16:08 -0800 Subject: [PATCH 087/132] everyone loves raycast --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 95bc6e8bb00..a55c07885be 100644 --- a/Brewfile +++ b/Brewfile @@ -9,4 +9,5 @@ brew 'wget' brew 'yt-dlp' cask 'handbrake' +cask 'raycast' cask 'vlc' From af11dbf56f74eef64d418d54e99442bba94b083d Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 11 Jan 2024 21:16:49 -0800 Subject: [PATCH 088/132] lil less verbose --- bin/dot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/dot b/bin/dot index 605b0591ec5..54c8a3494b1 100755 --- a/bin/dot +++ b/bin/dot @@ -51,5 +51,5 @@ echo "› brew update" brew update # Install software -echo "› $ZSH/script/install" +echo "› script/install" $ZSH/script/install From 11c95ae39fc7cdae3f04c97eb46a0274dc96840c Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 11 Jan 2024 21:18:12 -0800 Subject: [PATCH 089/132] remove some older commands rip old github --- bin/atom-package-install | 13 --------- bin/movieme | 30 -------------------- bin/mustacheme | 56 ------------------------------------- bin/res | 60 ---------------------------------------- bin/time-report | 21 -------------- 5 files changed, 180 deletions(-) delete mode 100755 bin/atom-package-install delete mode 100755 bin/movieme delete mode 100755 bin/mustacheme delete mode 100755 bin/res delete mode 100755 bin/time-report diff --git a/bin/atom-package-install b/bin/atom-package-install deleted file mode 100755 index 218bf414ee1..00000000000 --- a/bin/atom-package-install +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# Usage: atom-package-install -# -# Installs the atom packages listed in your packages.txt file -# located at ~/.dotfiles/atom.symlink/packages.txt -# -# You can generate a new list based on currently installed -# packages via atom-package-backup - -set -e - -apm install --packages-file ~/.dotfiles/atom.symlink/packages.txt diff --git a/bin/movieme b/bin/movieme deleted file mode 100755 index 115a364f0fa..00000000000 --- a/bin/movieme +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# MOVIE ME as in: "MOVIE ME AN ANIMATED GIF FROM THIS MOVIE, DAMMIT" -# -# Creates an animated gif from a movie file. Uploads to CloudApp. You must also -# have `gifme` and `cloudapp` in your $PATH. -# -# $1 - the path to the movie we're converting. -# $2 - the start time of the finished product. -# This can be in seconds, or it also accepts the "hh:mm:ss[.xxx]" format. -# $3 - the duration of the video sequence. -# This can be in seconds, or it also accepts the "hh:mm:ss[.xxx]" format. -# -# Examples: -# -# movieme -# ~/Desktop/dr-strangelove.mp4 23:12 3 -# ~/Desktop/holman-backflip-on-fire.mov 3.9 1.75 - -# cleanup -rm -rf /tmp/movieme - -# create tmp dir -mkdir -p /tmp/movieme - -# split the movie into constituent frames -ffmpeg -i "$1" -f image2 -vf "scale=iw*sar:ih" -ss $2 -t $3 -r 7 /tmp/movieme/d-%05d.png - -# ANIMATE -gifme /tmp/movieme/* -d 0 diff --git a/bin/mustacheme b/bin/mustacheme deleted file mode 100755 index ad28a39f6e2..00000000000 --- a/bin/mustacheme +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# mustacheme -# expanded from an idea from Rick Olson (@technoweenie) -# -# Takes a .gif, splits it into constituent frames, mustaches each, restitches -# the gif, and uploads to cloudapp. -# -# This leverages the nifty service mustachify.me, which will analyze your photo, -# identify faces, and add a mustache to your image. -# -# If the .gif is a remote file, we'll download it and blow it up locally. -# -# $1 - the path of the gif -# -# Examples: -# -# mustacheme holman-jumping-off-cliff-into-butter.gif -# mustacheme http://github.com/holman/butter/blob/master/holman-butter.gif -# -# Dependencies: -# -# - ImageMagick. If you're on a Mac, run: -# brew install imagemagick -# - wget -# - cloudapp: https://github.com/holman/dotfiles/blob/master/bin/cloudapp -# - gifme: https://github.com/holman/gifme - -set -e - -# Set up mustacheme temporary working directory -output=/tmp/mustacheme -rm -rf $output -mkdir $output - -if [[ $1 == http* ]] -then - wget $1 -O /tmp/mustache-download.gif - file=/tmp/mustache-download.gif -else - file="$1" -fi - -# Blow apart the GIF -convert $1 -coalesce $output/frame_%03d.gif - -# Mustache each frame -for frame in $output/*.gif -do - url=$(cloudapp $frame | grep Uploaded | awk '{print substr($0, index($0, "http://"))}') - url="$url/$(basename $frame)" - wget "http://mustachify.me/?src=$url" -O "$frame-stache" -done - -# Ding! Fries are done. -gifme $output/*-stache -d 0 diff --git a/bin/res b/bin/res deleted file mode 100755 index 40afcfdf55e..00000000000 --- a/bin/res +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/osascript -# -# A small command line script to change screen resolutions on Mountain Lion. -# -# Primarily I switch between two resolutions on my Retina MacBook Pro: Retina, -# and the full resolution setting. This means for particular apps I use, I can -# quickly jump between seeing more pixels and less. -# -# There doesn't appear to be an easy way to do this without just using -# AppleScript to automate clicking buttons, so that's what this does. -# -# Most of this script is adapted from this helpful answer: -# -# http://apple.stackexchange.com/a/91590 -# -# Make sure "Enable access for assistive devices" is checked in the -# Accessibility section of System Properties. - -local index1, index2 - -set index1 to 3 -- 1440 x 900 (Best for Retina) -set index2 to 5 -- 1920 x 1200 (More Space) - -tell application "System Preferences" - reveal anchor "displaysDisplayTab" of pane "com.apple.preference.displays" -end tell - -local indexToUse - -tell application "System Events" to tell process "System Preferences" to tell window "Built-in Retina Display" - - click radio button "Display" of tab group 1 - click radio button "Scaled" of radio group 1 of tab group 1 - - -- Click the "Scaled" radio button - click radio button "Scaled" of radio group 1 of tab group 1 - - tell tab group 1 - tell radio group 1 of group 1 - -- Depending on what scale option/index is current selected, set the appropriate new option/index to use - if (value of radio button index1) is true then - set indexToUse to index2 - else if (value of radio button index2) is true then - set indexToUse to index1 - end if - - -- Click the radio button for the new scale option/index - click radio button indexToUse - end tell - end tell - - -- If option/index 1 is selected a warning prompt is displayed, click the OK button to dismiss the prompt - if indexToUse = 1 then - click button "OK" of sheet 1 - end if -end tell - -tell application "System Preferences" - quit -end tell diff --git a/bin/time-report b/bin/time-report deleted file mode 100755 index f9d31e06ffd..00000000000 --- a/bin/time-report +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/zsh -# -# time-report [from] [to] -# -# A quick script to pull a report from `watson` -# (https://github.com/TailorDev/Watson) and dump it out to my desktop. -# -# Example: -# -# time-report 2022-08-15 2022-08-31 - -set -e - -start=$1 -end=$2 - -file=$HOME/Desktop/"$1 to $2.txt" -log=$(watson log --from $1 --to $2) -total=$(watson report --from $1 --to $2 | tail -1) - -(echo $total; echo ""; echo $log) > "${file}" \ No newline at end of file From 05d45821dea1e9aa79d1839f22ee877d9eda33bc Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 11 Jan 2024 21:34:32 -0800 Subject: [PATCH 090/132] install some neat other friends --- Brewfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Brewfile b/Brewfile index a55c07885be..26c7b766d1e 100644 --- a/Brewfile +++ b/Brewfile @@ -8,6 +8,13 @@ brew 'spark' brew 'wget' brew 'yt-dlp' +cask 'airtable' +cask 'arq' +cask 'cron' cask 'handbrake' +cask 'plex' cask 'raycast' +cask 'warp' +cask 'visual-studio-code' cask 'vlc' +cask 'zed' From 0b34e5dd0b40581eaa4e96648642ee3d07e793e1 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 12 Jan 2024 17:03:07 -0800 Subject: [PATCH 091/132] stripe cli --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 26c7b766d1e..82832eea5f7 100644 --- a/Brewfile +++ b/Brewfile @@ -5,6 +5,7 @@ tap 'homebrew/bundle' brew 'imagemagick' brew 'spaceman-diff' brew 'spark' +brew 'stripe/stripe-cli/stripe' brew 'wget' brew 'yt-dlp' From 734402e1864b48a5fb1b0c71463a195720d1c961 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 19 Jan 2024 22:11:59 -0800 Subject: [PATCH 092/132] rip cron --- Brewfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Brewfile b/Brewfile index 82832eea5f7..a058c722916 100644 --- a/Brewfile +++ b/Brewfile @@ -11,8 +11,8 @@ brew 'yt-dlp' cask 'airtable' cask 'arq' -cask 'cron' cask 'handbrake' +cask 'notion-calendar' cask 'plex' cask 'raycast' cask 'warp' From 93b20c1394206594ffb44e9ea3dfbc1be7c5a4ce Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 19 Jan 2024 22:15:04 -0800 Subject: [PATCH 093/132] sonos --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index a058c722916..e7dd8ae110c 100644 --- a/Brewfile +++ b/Brewfile @@ -14,6 +14,7 @@ cask 'arq' cask 'handbrake' cask 'notion-calendar' cask 'plex' +cask 'sonos' cask 'raycast' cask 'warp' cask 'visual-studio-code' From c355291a4c5c8e156137168eba0783ef58dbc501 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 26 Jan 2024 21:09:59 -0800 Subject: [PATCH 094/132] cloudapp is long-dead --- bin/cloudapp | 62 ---------------------------------------------------- 1 file changed, 62 deletions(-) delete mode 100755 bin/cloudapp diff --git a/bin/cloudapp b/bin/cloudapp deleted file mode 100755 index 1ec555ab660..00000000000 --- a/bin/cloudapp +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env ruby -# -# cloudapp -# Zach Holman / @holman -# -# Uploads a file from the command line to CloudApp, drops it into your -# clipboard (on a Mac, at least). -# -# Example: -# -# cloudapp drunk-blake.png -# -# This requires Aaron Russell's cloudapp_api gem: -# -# gem install cloudapp_api -# -# Requires you set your CloudApp credentials in ~/.cloudapp as a simple file of: -# -# email -# password - -require 'rubygems' - -['json', 'cloudapp_api'].each do |gem| - begin - require gem - rescue LoadError - puts "You need to install #{gem}: gem install #{gem}" - exit!(1) - end -end - -config_file = "#{ENV['HOME']}/.cloudapp" -unless File.exist?(config_file) - puts "You need to type your email and password (one per line) into "+ - "`~/.cloudapp`" - exit!(1) -end - -email,password = File.read(config_file).split("\n") - -if ARGV[0].nil? - puts "You need to specify a file to upload." - exit!(1) -end - -urls = [] -ARGV.each do |x| - CloudApp.authenticate(email,password) - puts "Attempting to upload #{x}" - url = CloudApp::Item.create(:upload, {:file => x}).url - - # Say it for good measure. - puts "Uploaded #{x} to #{url}" - - # Get the embed link. - url = "#{url}/#{ARGV[0].split('/').last}" - urls << url -end - -# Copy it to your (Mac's) clipboard. -`echo '#{urls.join(',')}' | tr -d "\n" | pbcopy` From fa75aa8eeab920b341cfc3ab08fe182f430b775d Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 26 Jan 2024 21:25:50 -0800 Subject: [PATCH 095/132] reset my hostname in macos --- bin/dot | 3 +++ macos/set-hostname.sh | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100755 macos/set-hostname.sh diff --git a/bin/dot b/bin/dot index 54c8a3494b1..a88ad83394d 100755 --- a/bin/dot +++ b/bin/dot @@ -43,6 +43,9 @@ export ZSH=$HOME/.dotfiles # Set macOS defaults $ZSH/macos/set-defaults.sh +# Set macOS hostname +$ZSH/macos/set-hostname.sh + # Install homebrew $ZSH/homebrew/install.sh 2>&1 diff --git a/macos/set-hostname.sh b/macos/set-hostname.sh new file mode 100755 index 00000000000..c5ce7a0a1da --- /dev/null +++ b/macos/set-hostname.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# +# This corrects a shitty point of confusion with macOS where if you bounce +# between wireless and wired connections, macOS will suddenly throw up its hands +# and add a random-ass number to your hostname. Do it a couple times and you're +# in like, the thousands appended to your hostname, which makes you look like a +# chump when your machine is called "incredible-programmer-9390028", like +# you're behind 9,390,027 other better programmers before you. Sheesh. +# +# Anyway, this runs in `dot` and only asks for your permission (usually TouchID) +# if it actually needs to change your hostname for you, otherwise it's fast to +# toss into `dot` anyway. +# +# None of this really matters in the big scheme of things, but it bothered me. + +hostname=$(scutil --get LocalHostName) + +# if hostname contains a hyphen and then a number, remove the hyphen and number +normal_hostname=$(echo "$hostname" | sed 's/-[0-9]*$//') + +# if our hostname was changed by macOS, change it back +if [ "$normal_hostname" != "$hostname" ]; then + echo "Changing hostname from $hostname to $normal_hostname" + scutil --set LocalHostName "$normal_hostname" +fi From f44aaa9e6e5ec106de79368727c6b848a8a8031f Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Sat, 3 Feb 2024 20:31:52 -0800 Subject: [PATCH 096/132] unused --- zsh/zshrc.symlink | 2 -- 1 file changed, 2 deletions(-) diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index baa385f2b2c..e3ade6421bc 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -48,5 +48,3 @@ zle -N up-line-or-beginning-search zle -N down-line-or-beginning-search bindkey "^[[A" up-line-or-beginning-search # Up bindkey "^[[B" down-line-or-beginning-search # Down - -eval "$(github-copilot-cli alias -- "$0")" From f591e6c3c3fea25e96fae920864b2fe5201e7c2d Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 8 Feb 2024 17:45:59 -0800 Subject: [PATCH 097/132] add cloudflared --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index e7dd8ae110c..a0bc4f2fdf2 100644 --- a/Brewfile +++ b/Brewfile @@ -2,6 +2,7 @@ cask_args appdir: '/Applications' tap 'homebrew/bundle' +brew 'cloudflared' brew 'imagemagick' brew 'spaceman-diff' brew 'spark' From f5f10c21cf6327b887ffa32e3fa1573003f242e1 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 13 Feb 2024 08:30:17 -0800 Subject: [PATCH 098/132] whatsapp, doc? --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index a0bc4f2fdf2..a3bf16fefc0 100644 --- a/Brewfile +++ b/Brewfile @@ -18,6 +18,7 @@ cask 'plex' cask 'sonos' cask 'raycast' cask 'warp' +cask 'whatsapp' cask 'visual-studio-code' cask 'vlc' cask 'zed' From 6dd7d85e181569728197cb705fba6c958ce1a023 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 13 Feb 2024 10:39:40 -0800 Subject: [PATCH 099/132] add messenger --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index a3bf16fefc0..103dcf14e58 100644 --- a/Brewfile +++ b/Brewfile @@ -13,6 +13,7 @@ brew 'yt-dlp' cask 'airtable' cask 'arq' cask 'handbrake' +cask 'messenger' cask 'notion-calendar' cask 'plex' cask 'sonos' From 162e3f1be19560d03f9ecbf10ce9fde6dfbe00e1 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 27 Feb 2024 23:06:36 -0800 Subject: [PATCH 100/132] bring in dev brews --- Brewfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Brewfile b/Brewfile index e7dd8ae110c..c815091b6db 100644 --- a/Brewfile +++ b/Brewfile @@ -3,6 +3,9 @@ cask_args appdir: '/Applications' tap 'homebrew/bundle' brew 'imagemagick' +brew 'postgresql@14' +brew 'redis' +brew 'ruby-build' brew 'spaceman-diff' brew 'spark' brew 'stripe/stripe-cli/stripe' From fd1b30834e5b922be35fee6af3e5cf65c4c7c32a Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 27 Feb 2024 23:09:23 -0800 Subject: [PATCH 101/132] transmission --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index c815091b6db..c53defd9c3c 100644 --- a/Brewfile +++ b/Brewfile @@ -18,6 +18,7 @@ cask 'handbrake' cask 'notion-calendar' cask 'plex' cask 'sonos' +cask 'transmission' cask 'raycast' cask 'warp' cask 'visual-studio-code' From 7ec1659580f79fec0bfc6e6da8211ccbbcd91b54 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 1 Mar 2024 10:37:47 -0800 Subject: [PATCH 102/132] aiiiiii --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 315681f30b9..5998bc961ec 100644 --- a/Brewfile +++ b/Brewfile @@ -15,6 +15,7 @@ brew 'yt-dlp' cask 'airtable' cask 'arq' +cask 'diffusionbee' cask 'handbrake' cask 'messenger' cask 'notion-calendar' From 92f84b1a0c30561f5a41175709428ae068f8550c Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 5 Apr 2024 17:50:59 -0700 Subject: [PATCH 103/132] irb/ext/save-history is gone weird one to track down, but: https://github.com/ruby/irb/pull/613 --- ruby/irbrc.symlink | 1 - 1 file changed, 1 deletion(-) diff --git a/ruby/irbrc.symlink b/ruby/irbrc.symlink index 061e9e16c94..2334f4248ea 100644 --- a/ruby/irbrc.symlink +++ b/ruby/irbrc.symlink @@ -1,6 +1,5 @@ #!/usr/bin/ruby require 'irb/completion' -require 'irb/ext/save-history' require 'rubygems' IRB.conf[:SAVE_HISTORY] = 1000 From e178c8297d96dbc3e3b5033c5f0c03f6b73df63a Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 5 Apr 2024 17:51:31 -0700 Subject: [PATCH 104/132] neverending battle against macos --- macos/set-hostname.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/macos/set-hostname.sh b/macos/set-hostname.sh index c5ce7a0a1da..a8e773c9b53 100755 --- a/macos/set-hostname.sh +++ b/macos/set-hostname.sh @@ -22,4 +22,5 @@ normal_hostname=$(echo "$hostname" | sed 's/-[0-9]*$//') if [ "$normal_hostname" != "$hostname" ]; then echo "Changing hostname from $hostname to $normal_hostname" scutil --set LocalHostName "$normal_hostname" + scutil --set ComputerName "$normal_hostname" fi From 24e72b869b101ecde636aee1b25a73891962c786 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 5 Apr 2024 17:51:37 -0700 Subject: [PATCH 105/132] add 1p --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 5998bc961ec..06d8ec587f4 100644 --- a/Brewfile +++ b/Brewfile @@ -13,6 +13,7 @@ brew 'stripe/stripe-cli/stripe' brew 'wget' brew 'yt-dlp' +cask '1password' cask 'airtable' cask 'arq' cask 'diffusionbee' From 9a713e6a4fd777b1fa115f602f4045859c0f7206 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 5 Apr 2024 17:53:20 -0700 Subject: [PATCH 106/132] apparently the default now --- ruby/irbrc.symlink | 1 - 1 file changed, 1 deletion(-) diff --git a/ruby/irbrc.symlink b/ruby/irbrc.symlink index 2334f4248ea..d8cf3001043 100644 --- a/ruby/irbrc.symlink +++ b/ruby/irbrc.symlink @@ -2,7 +2,6 @@ require 'irb/completion' require 'rubygems' -IRB.conf[:SAVE_HISTORY] = 1000 IRB.conf[:HISTORY_FILE] = "#{ENV['HOME']}/.irb_history" IRB.conf[:PROMPT_MODE] = :SIMPLE From 0e4a15fb1fd789495b74266c4735a6e5eea07415 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 17 Apr 2024 11:03:46 -0700 Subject: [PATCH 107/132] zoomZOOMzoom --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 06d8ec587f4..efddfe7dce0 100644 --- a/Brewfile +++ b/Brewfile @@ -29,3 +29,4 @@ cask 'whatsapp' cask 'visual-studio-code' cask 'vlc' cask 'zed' +cask 'zoom' From dba4eb4a9f2f9f045ceee6ccf709ef3ead835c67 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 1 May 2024 10:05:29 -0700 Subject: [PATCH 108/132] adb --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index efddfe7dce0..311d1c03616 100644 --- a/Brewfile +++ b/Brewfile @@ -15,6 +15,7 @@ brew 'yt-dlp' cask '1password' cask 'airtable' +cask 'android-platform-tools' cask 'arq' cask 'diffusionbee' cask 'handbrake' From 9be3b4dd396f2306f3ec726174b54429bc029207 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Mon, 6 May 2024 15:52:37 -0700 Subject: [PATCH 109/132] let's do brew upgrade in dot too --- bin/dot | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/dot b/bin/dot index a88ad83394d..63f9f9bf388 100755 --- a/bin/dot +++ b/bin/dot @@ -53,6 +53,9 @@ $ZSH/homebrew/install.sh 2>&1 echo "› brew update" brew update +echo "› brew upgrade" +brew upgrade + # Install software echo "› script/install" $ZSH/script/install From 2b3e99ebe6b4acea944e520968a07a1a0e584d81 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Sun, 16 Jun 2024 20:05:26 -0700 Subject: [PATCH 110/132] mock --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 311d1c03616..42400fb855d 100644 --- a/Brewfile +++ b/Brewfile @@ -10,6 +10,7 @@ brew 'ruby-build' brew 'spaceman-diff' brew 'spark' brew 'stripe/stripe-cli/stripe' +brew 'stripe/stripe-mock/stripe-mock' brew 'wget' brew 'yt-dlp' From 5b3873be4fb21efcfdf5c6d3abc63ef9a4a501bc Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Sun, 16 Jun 2024 20:11:31 -0700 Subject: [PATCH 111/132] update dotfiles with dot --- bin/dot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/dot b/bin/dot index 63f9f9bf388..d84a178a29b 100755 --- a/bin/dot +++ b/bin/dot @@ -40,6 +40,10 @@ done export ZSH=$HOME/.dotfiles +# Update dotfiles themselves +echo "› git pull" +git -C $ZSH pull + # Set macOS defaults $ZSH/macos/set-defaults.sh From 644d8748d1ecabe59d607b5463c48ef220b67b74 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 5 Sep 2024 10:41:53 -0700 Subject: [PATCH 112/132] Find Simulator.app better --- xcode/aliases.zsh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xcode/aliases.zsh b/xcode/aliases.zsh index 53dc5922efe..1c7c6c1c3a6 100644 --- a/xcode/aliases.zsh +++ b/xcode/aliases.zsh @@ -1,2 +1 @@ -alias ios="open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app" -alias watchos="open /Applications/Xcode.app/Contents/Developer/Applications/Simulator\ \(Watch\).app" +alias ios="open -a Simulator" From ae59cc3cfc14181ff7feba6990b0f5a31bad4f37 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 4 Feb 2025 09:50:11 -0800 Subject: [PATCH 113/132] rebase --- git/gitconfig.symlink | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink index 7f0647ba36f..29e0e804c06 100644 --- a/git/gitconfig.symlink +++ b/git/gitconfig.symlink @@ -38,3 +38,5 @@ [init] defaultBranch = main +[pull] + rebase = true From b473497d086f209f15c4d7c1a93df471d3a4e477 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 4 Mar 2025 08:54:24 -0800 Subject: [PATCH 114/132] let's assume i switch editors frequently --- editors/env.zsh | 1 + editors/windsurf.zsh | 1 + system/env.zsh | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 editors/env.zsh create mode 100644 editors/windsurf.zsh diff --git a/editors/env.zsh b/editors/env.zsh new file mode 100644 index 00000000000..c0acfb8d1e0 --- /dev/null +++ b/editors/env.zsh @@ -0,0 +1 @@ +export EDITOR='windsurf' \ No newline at end of file diff --git a/editors/windsurf.zsh b/editors/windsurf.zsh new file mode 100644 index 00000000000..4ec661acb02 --- /dev/null +++ b/editors/windsurf.zsh @@ -0,0 +1 @@ +export PATH="/Users/holman/.codeium/windsurf/bin:$PATH" \ No newline at end of file diff --git a/system/env.zsh b/system/env.zsh index b99078ff655..e69de29bb2d 100644 --- a/system/env.zsh +++ b/system/env.zsh @@ -1 +0,0 @@ -export EDITOR='code' From 800b655b21329cda4f51b692df93d2818aaed814 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Tue, 4 Mar 2025 08:55:04 -0800 Subject: [PATCH 115/132] fun ruby bug on macos --- ruby/rbenv.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ruby/rbenv.zsh b/ruby/rbenv.zsh index cb93d589d6a..8b8542f8073 100644 --- a/ruby/rbenv.zsh +++ b/ruby/rbenv.zsh @@ -1,3 +1,6 @@ +# fun: https://bugs.ruby-lang.org/issues/14009 +export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES + # init according to man page if (( $+commands[rbenv] )) then From 14f6a99d07bdbba8e9036e74c9680fd88358395b Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Sun, 9 Mar 2025 23:44:15 -0700 Subject: [PATCH 116/132] add qlvideo to brewfile --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 42400fb855d..479178a24d0 100644 --- a/Brewfile +++ b/Brewfile @@ -23,6 +23,7 @@ cask 'handbrake' cask 'messenger' cask 'notion-calendar' cask 'plex' +cask 'qlvideo' cask 'sonos' cask 'transmission' cask 'raycast' From 3827bb3072fa73ff24136d9eb5d5b67ad7ef221c Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Mon, 24 Mar 2025 20:02:37 -0700 Subject: [PATCH 117/132] add windsurf --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 479178a24d0..044dd6a6b3c 100644 --- a/Brewfile +++ b/Brewfile @@ -29,6 +29,7 @@ cask 'transmission' cask 'raycast' cask 'warp' cask 'whatsapp' +cask 'windsurf' cask 'visual-studio-code' cask 'vlc' cask 'zed' From b66f5640c59ce2b9503de15daf493fb9ce66738c Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Mon, 24 Mar 2025 20:03:38 -0700 Subject: [PATCH 118/132] add steam because i need my civ7 --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 044dd6a6b3c..778d0da7262 100644 --- a/Brewfile +++ b/Brewfile @@ -25,6 +25,7 @@ cask 'notion-calendar' cask 'plex' cask 'qlvideo' cask 'sonos' +cask 'steam' cask 'transmission' cask 'raycast' cask 'warp' From ac19d837981442d2c1b7f4462bedc750b1b6655a Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 7 Aug 2025 16:53:22 -0700 Subject: [PATCH 119/132] use handbrake-app instead --- Brewfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Brewfile b/Brewfile index 778d0da7262..2e9a0d26196 100644 --- a/Brewfile +++ b/Brewfile @@ -19,7 +19,7 @@ cask 'airtable' cask 'android-platform-tools' cask 'arq' cask 'diffusionbee' -cask 'handbrake' +cask 'handbrake-app' cask 'messenger' cask 'notion-calendar' cask 'plex' From 12f3a869532e5bd712c16a7458abe1202682fd62 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 28 Aug 2025 18:39:37 -0700 Subject: [PATCH 120/132] Always keep Safari's URL preview open --- macos/set-defaults.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/macos/set-defaults.sh b/macos/set-defaults.sh index 017c6e56070..f2d73256450 100755 --- a/macos/set-defaults.sh +++ b/macos/set-defaults.sh @@ -33,6 +33,11 @@ defaults write com.apple.dock wvous-bl-modifier -int 0 # Hide Safari's bookmark bar. defaults write com.apple.Safari.plist ShowFavoritesBar -bool false +# Always show Safari's "URL display" tab in the lower left on mouseover. Strangely +# like, everyone and their LLMs on the internet thinks this is ShowStatusBar, but +# it's not. +defaults write com.apple.Safari ShowOverlayStatusBar -bool true + # Set up Safari for development. defaults write com.apple.Safari.SandboxBroker ShowDevelopMenu -bool true defaults write com.apple.Safari.plist IncludeDevelopMenu -bool true From 2b7bf788b5a11ff5e8e0f3d455814d9b11357dce Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Wed, 10 Sep 2025 22:05:35 -0700 Subject: [PATCH 121/132] i also like to live... dangerously --- bin/a | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 bin/a diff --git a/bin/a b/bin/a new file mode 100755 index 00000000000..c3ddc41bf08 --- /dev/null +++ b/bin/a @@ -0,0 +1,12 @@ +#!/bin/sh +# +# Quick shortcut to ~*-~*AI*~-*~ +# +# Load up a current $HotThing AI client with preferable settings (which is +# usually yolo-lfg style anyway; computers wouldn't do anything to us). +# +# USAGE: +# +# $ a +# # => opens the AI client. yeah, easy peasy. +claude --dangerously-skip-permissions From e6c8b2e15a770dd51abda153f6ec5c030c5e77f8 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 18 Sep 2025 14:36:27 -0700 Subject: [PATCH 122/132] add atuin --- Brewfile | 2 +- atuin/env.zsh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 atuin/env.zsh diff --git a/Brewfile b/Brewfile index 2e9a0d26196..8e759a447c3 100644 --- a/Brewfile +++ b/Brewfile @@ -2,6 +2,7 @@ cask_args appdir: '/Applications' tap 'homebrew/bundle' +brew 'atuin' brew 'cloudflared' brew 'imagemagick' brew 'postgresql@14' @@ -16,7 +17,6 @@ brew 'yt-dlp' cask '1password' cask 'airtable' -cask 'android-platform-tools' cask 'arq' cask 'diffusionbee' cask 'handbrake-app' diff --git a/atuin/env.zsh b/atuin/env.zsh new file mode 100644 index 00000000000..4bfbc3daeb5 --- /dev/null +++ b/atuin/env.zsh @@ -0,0 +1 @@ +eval "$(atuin init zsh)" \ No newline at end of file From 99f4757639d1e81ca7ee3164327b930d68ececd6 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 18 Sep 2025 14:56:58 -0700 Subject: [PATCH 123/132] ghostty in --- Brewfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Brewfile b/Brewfile index 8e759a447c3..b96f0e86750 100644 --- a/Brewfile +++ b/Brewfile @@ -19,6 +19,7 @@ cask '1password' cask 'airtable' cask 'arq' cask 'diffusionbee' +cask 'ghostty' cask 'handbrake-app' cask 'messenger' cask 'notion-calendar' @@ -28,7 +29,6 @@ cask 'sonos' cask 'steam' cask 'transmission' cask 'raycast' -cask 'warp' cask 'whatsapp' cask 'windsurf' cask 'visual-studio-code' From 7afe7dd159aa56511aff0dcb420d2bf9e2a0e813 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Mon, 29 Sep 2025 09:19:23 -0700 Subject: [PATCH 124/132] back to zed --- editors/env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editors/env.zsh b/editors/env.zsh index c0acfb8d1e0..0fca5519166 100644 --- a/editors/env.zsh +++ b/editors/env.zsh @@ -1 +1 @@ -export EDITOR='windsurf' \ No newline at end of file +export EDITOR='zed' From a657a2d40283ea5a0442db1fbc3f1f15b6fccf85 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Sat, 25 Oct 2025 09:27:06 -0700 Subject: [PATCH 125/132] no need for this --- zsh/zshrc.symlink | 9 --------- 1 file changed, 9 deletions(-) diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index e3ade6421bc..d398ac84809 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -39,12 +39,3 @@ do done unset config_files - -# Better history -# Credits to https://coderwall.com/p/jpj_6q/zsh-better-history-searching-with-arrow-keys -autoload -U up-line-or-beginning-search -autoload -U down-line-or-beginning-search -zle -N up-line-or-beginning-search -zle -N down-line-or-beginning-search -bindkey "^[[A" up-line-or-beginning-search # Up -bindkey "^[[B" down-line-or-beginning-search # Down From 29716dc4f602debe7dd79b3b7091cbc141fb55ef Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 31 Oct 2025 22:13:44 -0700 Subject: [PATCH 126/132] add local/bin to path --- system/_path.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/_path.zsh b/system/_path.zsh index 255c2cfca66..a1071068550 100644 --- a/system/_path.zsh +++ b/system/_path.zsh @@ -1,2 +1,2 @@ -export PATH="./bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH" +export PATH="./bin:~/.local/bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH" export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH" From 5be4d53a8e114806aedd4fcaf259e5e6c6979f16 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 6 Nov 2025 17:51:27 -0800 Subject: [PATCH 127/132] pg 17 --- Brewfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Brewfile b/Brewfile index b96f0e86750..0bd87ca56e2 100644 --- a/Brewfile +++ b/Brewfile @@ -5,7 +5,7 @@ tap 'homebrew/bundle' brew 'atuin' brew 'cloudflared' brew 'imagemagick' -brew 'postgresql@14' +brew 'postgresql@17' brew 'redis' brew 'ruby-build' brew 'spaceman-diff' From 9aae4aaea74fe70592afa1138a37c1df8d9db0e0 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Mon, 8 Dec 2025 11:40:49 -0800 Subject: [PATCH 128/132] re-link pg --- homebrew/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/homebrew/install.sh b/homebrew/install.sh index f01dbdc7f75..be72ff076eb 100755 --- a/homebrew/install.sh +++ b/homebrew/install.sh @@ -21,4 +21,7 @@ then fi +# Link keg-only formulas that we want in PATH +brew list | grep 'postgresql@' | xargs -I {} brew link {} --force 2>/dev/null + exit 0 From 5b6e0b1af9ac62a621d01b93a2afadb78d80362e Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Fri, 12 Dec 2025 14:00:23 -0800 Subject: [PATCH 129/132] expand home path --- system/_path.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/_path.zsh b/system/_path.zsh index a1071068550..ed7da9058f1 100644 --- a/system/_path.zsh +++ b/system/_path.zsh @@ -1,2 +1,2 @@ -export PATH="./bin:~/.local/bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH" +export PATH="./bin:$HOME/.local/bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH" export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH" From 71caf26a299dd385ca00ac2d4a347d950de01be6 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Mon, 29 Dec 2025 20:42:27 -0800 Subject: [PATCH 130/132] codex is now a cask --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 0bd87ca56e2..e639085078f 100644 --- a/Brewfile +++ b/Brewfile @@ -18,6 +18,7 @@ brew 'yt-dlp' cask '1password' cask 'airtable' cask 'arq' +cask 'codex' cask 'diffusionbee' cask 'ghostty' cask 'handbrake-app' From a04bda55cde9b374b5c3cad7fecc51765fcde557 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Mon, 5 Jan 2026 17:11:49 -0800 Subject: [PATCH 131/132] install iina --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index e639085078f..d444027fc1e 100644 --- a/Brewfile +++ b/Brewfile @@ -22,6 +22,7 @@ cask 'codex' cask 'diffusionbee' cask 'ghostty' cask 'handbrake-app' +cask 'iina' cask 'messenger' cask 'notion-calendar' cask 'plex' From c6afa692d72e3baa25157cab40a446bee67a1781 Mon Sep 17 00:00:00 2001 From: Zach Holman Date: Thu, 12 Feb 2026 18:27:08 -0800 Subject: [PATCH 132/132] conductor --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index d444027fc1e..93aed700585 100644 --- a/Brewfile +++ b/Brewfile @@ -19,6 +19,7 @@ cask '1password' cask 'airtable' cask 'arq' cask 'codex' +cask 'conductor' cask 'diffusionbee' cask 'ghostty' cask 'handbrake-app'