diff --git a/.gitignore b/.gitignore index 2ae0c1b..548b873 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ local/share/fish/fish_read_history local/share/heroku local/share/keybase local/share/nvim/shada +local/share/pry/ # Ignore fisherman config/fish/completions/fisher.fish diff --git a/Brewfile b/Brewfile index e6f0cec..66c17d0 100644 --- a/Brewfile +++ b/Brewfile @@ -15,9 +15,7 @@ brew 'fish' # Ruby -brew 'rbenv' -brew 'ruby-build' -brew 'ruby-install' +brew 'asdf' # Databases brew 'postgresql', restart_service: :changed @@ -26,36 +24,9 @@ brew 'redis', restart_service: :changed # Utilities brew 'cmake' brew 'git' -brew 'macvim', args: ['with-lua', 'with-override-system-vim'] brew 'ninja' brew 'openssl' brew 'ripgrep' +brew 'trash' brew 'tree' brew 'wget' - -# Homebrew Cask -cask_args appdir: "#{ENV['HOME']}/Applications" -tap 'caskroom/cask' -cask 'anybar' -cask 'java' unless system '/usr/libexec/java_home --failfast' - -# Mac OS X -brew 'trash' - -mas 'GarageBand', id: 682658836 -mas 'Keynote', id: 409183694 -mas 'Pages', id: 409201541 -mas 'Numbers', id: 409203825 -mas 'XCode', id: 497799835 - -mas '1Password', id: 443987910 -mas 'Capo', id: 696977615 -mas 'ColorSnapper2', id: 969418666 -mas 'Day One', id: 1055511498 -mas 'GIPHY CAPTURE', id: 668208984 -mas 'Moom', id: 419330170 -mas 'Paw', id: 584653203 -mas 'Pixelmator', id: 407963104 -mas 'Reeder', id: 880001334 -mas 'Slack', id: 803453959 -mas 'The Unarchiver', id: 425424353 diff --git a/Makefile b/Makefile index 590dcee..84639d5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ symlinks = \ + asdfrc \ atom \ bundle \ config \ @@ -21,7 +22,6 @@ update: | install gem update apm upgrade --no-confirm vim +PlugUpgrade +PlugInstall +PlugUpdate +qall - mas upgrade clean: | install brew cleanup @@ -50,11 +50,10 @@ $(prefixed_symlinks): ruby_version := $(shell cat $(PWD)/ruby-version) -ruby_versions = $(HOME)/.rbenv/versions +ruby_versions = $(HOME)/.asdf/installs/ruby ruby = $(ruby_versions)/$(ruby_version) bundler = $(ruby)/bin/bundle -cocoapods = $(ruby)/bin/pod ruby: | $(ruby) $(bundler) diff --git a/asdfrc b/asdfrc new file mode 100644 index 0000000..e600bd0 --- /dev/null +++ b/asdfrc @@ -0,0 +1 @@ +legacy_version_file = yes diff --git a/atom/config.cson b/atom/config.cson index c145d2e..c739df6 100644 --- a/atom/config.cson +++ b/atom/config.cson @@ -40,6 +40,8 @@ "fuzzy-finder": scoringSystem: "fast" useRipGrep: true + "git-blame": + columnWidth: 353 "git-plus": general: _analyticsUserId: "7166f9aa-c565-4854-ae51-7f6e672459f0" diff --git a/bundle/config b/bundle/config index d2b22b4..09c7580 100644 --- a/bundle/config +++ b/bundle/config @@ -5,3 +5,6 @@ BUNDLE_GEM__COC: "1" BUNDLE_GEM__MIT: "1" BUNDLE_GEM__TEST: "rspec" BUNDLE_IGNORE_MESSAGES: "true" +BUNDLE_GEM__CI: "github" +BUNDLE_GEM__CHANGELOG: "false" +BUNDLE_GEM__RUBOCOP: "false" diff --git a/config/fish/config.fish b/config/fish/config.fish index d12cfd1..8810707 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -12,6 +12,11 @@ set -x DEVELOPER $HOME/Developer # Homebrew and brew-cask options set -x HOMEBREW_CASK_OPTS "--appdir=~/Applications" +# Source functions for asdf, a multi-purpose version manager +if test -f /usr/local/opt/asdf/asdf.fish + source /usr/local/opt/asdf/asdf.fish +end + # Source sensitive configuration if test -f $HOME/.config/fish/local.fish source $HOME/.config/fish/local.fish diff --git a/config/fish/functions/fish_right_prompt.fish b/config/fish/functions/fish_right_prompt.fish index 40867d3..ae29d58 100644 --- a/config/fish/functions/fish_right_prompt.fish +++ b/config/fish/functions/fish_right_prompt.fish @@ -1,8 +1,10 @@ function fish_right_prompt - if contains rbenv (functions) - set -l red (set_color red) - set -l normal (set_color normal) + set -l red (set_color red) + set -l normal (set_color normal) + if contains rbenv (functions) echo $red(rbenv version-name)$normal + else if contains asdf (functions) + echo $red(asdf current ruby | awk '{print $2}')$normal end end diff --git a/local/bin/intensify b/local/bin/intensify index 49a9c3a..0d0e762 100755 --- a/local/bin/intensify +++ b/local/bin/intensify @@ -55,7 +55,7 @@ while [ "$n" -lt "$count" ]; do done # Combine the frames into an infinitely looping GIF -gif=${2:-"${filename%.*}_intensifies.gif"} +gif=${2:-"${filename%.*}-intensifies.gif"} convert -loop 0 -background none -dispose Background -delay 1x30 "${frame}"-*.gif "$gif" # Clean up