From 9e8ebfc695271bcf2659b5d3207d56035c6acfff Mon Sep 17 00:00:00 2001 From: thewildandy Date: Thu, 25 Aug 2016 14:45:07 +0100 Subject: [PATCH 01/17] 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 02/17] 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 03/17] 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 04/17] 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 05/17] 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 06/17] 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 07/17] 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 08/17] 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 09/17] 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 10/17] 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 11/17] 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 12/17] 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 13/17] 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 14/17] 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 15/17] 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 16/17] 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 17/17] 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