From 34bbafdf8709795b0886373bbef5fd26746be340 Mon Sep 17 00:00:00 2001 From: GITHUBFULLNAME Date: Tue, 21 Dec 2021 11:12:50 -0700 Subject: [PATCH 1/6] Installs brew packages from Brewfile instead --- config.js | 114 +++++----------------------------------------- homedir/.Brewfile | 91 ++++++++++++++++++++++++++++++++++++ install.sh | 8 ++++ 3 files changed, 111 insertions(+), 102 deletions(-) create mode 100644 homedir/.Brewfile diff --git a/config.js b/config.js index 1c42b3aae..c4d102bfd 100644 --- a/config.js +++ b/config.js @@ -1,109 +1,19 @@ module.exports = { - brew: [ - // http://conqueringthecommandline.com/book/ack_ag - 'ack', - 'ag', - // https://github.com/wting/autojump - 'autojump', - // alternative to `cat`: https://github.com/sharkdp/bat - 'bat', - // Install GNU core utilities (those that come with macOS are outdated) - // Don’t forget to add `$(brew --prefix coreutils)/libexec/gnubin` to `$PATH`. - 'coreutils', - 'dos2unix', - // Install GNU `find`, `locate`, `updatedb`, and `xargs`, `g`-prefixed - 'findutils', - // 'fortune', - 'fzf', - 'readline', // ensure gawk gets good readline - 'gawk', - // http://www.lcdf.org/gifsicle/ (because I'm a gif junky) - 'gifsicle', - 'gnupg', - // Install GNU `sed`, overwriting the built-in `sed` - // so we can do "sed -i 's/foo/bar/' file" instead of "sed -i '' 's/foo/bar/' file" - 'gnu-sed --with-default-names', - // upgrade grep so we can get things like inverted match (-v) - 'grep --with-default-names', - // better, more recent grep - 'homebrew/dupes/grep', - // https://github.com/jkbrzt/httpie - 'httpie', - // jq is a sort of JSON grep - 'jq', - // Mac App Store CLI: https://github.com/mas-cli/mas - 'mas', - // Install some other useful utilities like `sponge` - 'moreutils', - 'nmap', - // 'openconnect', - 'reattach-to-user-namespace', - // better/more recent version of screen - 'homebrew/dupes/screen', - 'tmux', - 'todo-txt', - 'tree', - 'ttyrec', - // better, more recent vim - 'vim --with-client-server --with-override-system-vi', - 'watch', - // Install wget with IRI support - 'wget --enable-iri' - ], - cask: [ - //'adium', - //'amazon-cloud-drive', - //'atom', - // 'box-sync', - //'comicbooklover', - //'diffmerge', - 'docker', // docker for mac - //'dropbox', - //'evernote', - 'flux', - 'gpg-suite', - //'ireadfast', - 'iterm2', - 'little-snitch', - // 'macbreakz', - 'micro-snitch', - // 'signal', - //'macvim', - 'sizeup', - //'sketchup', - 'slack', - // 'the-unarchiver', - //'torbrowser', - //'transmission', - 'visual-studio-code', - //'vlc', - 'xquartz' - ], - gem: [ - ], + brew: [], // Moved to ./homedir/.Brewfile + cask: [], // Moved to ./homedir/.Brewfile + gem: [], npm: [ - 'antic', - 'buzzphrase', - 'eslint', - 'instant-markdown-d', + "antic", + "buzzphrase", + "eslint", + "instant-markdown-d", // 'generator-dockerize', // 'gulp', - 'npm-check-updates', - 'prettyjson', - 'trash', - 'vtop' + "npm-check-updates", + "prettyjson", + "trash", + "vtop", // ,'yo' ], - mas: [ - //com.apple.dt.Xcode (10.2.1) - '497799835', - //com.if.Amphetamine (4.1.6) - //'937984704', - //net.shinyfrog.bear (1.6.15) - //'1091189122', - //com.monosnap.monosnap (3.5.8) - //'540348655', - //com.app77.pwsafemac (4.17) - //'520993579', - ], + mas: [], // Moved to ./homedir/.Brewfile }; diff --git a/homedir/.Brewfile b/homedir/.Brewfile new file mode 100644 index 000000000..77792de48 --- /dev/null +++ b/homedir/.Brewfile @@ -0,0 +1,91 @@ +tap "homebrew/bundle" +tap "homebrew/cask" +tap "homebrew/cask-drivers" +tap "homebrew/cask-fonts" +tap "homebrew/cask-versions" +tap "homebrew/core" +tap "homebrew/services" +tap "homebrew/dupes" +# http://conqueringthecommandline.com/book/ack_ag +brew "ack" +brew "ag" +# https://github.com/wting/autojump +brew "autojump" +# alternative to `cat`: https://github.com/sharkdp/bat +brew "bat" +# Install GNU core utilities (those that come with macOS are outdated) +# Don’t forget to add `$(brew --prefix coreutils)/libexec/gnubin` to `$PATH`. +brew "coreutils" +brew "dos2unix" +# Install GNU `find`, `locate`, `updatedb`, and `xargs`, `g`-prefixed +brew "findutils" +# brew "fortune" +brew "fzf" +brew "readline" # ensure gawk gets good readline +brew "gawk" +# http://www.lcdf.org/gifsicle/ (because I'm a gif junky) +brew "gifsicle" +brew "gnupg" +# Install GNU `sed`, overwriting the built-in `sed` +# so we can do "sed -i 's/foo/bar/' file" instead of "sed -i '' 's/foo/bar/' file" +brew "gnu-sedbrew --with-default-names" +# upgrade grep so we can get things like inverted match (-v) +brwe "grepbrew --with-default-names" +# better, more recent grep +brew "homebrew/dupes/grep" +# https://github.com/jkbrzt/httpie +brew "httpie" +# jq is a sort of JSON grep +brew "jq" +# Mac App Store CLI: https://github.com/mas-cli/mas +brew "mas" +# Install some other useful utilities like `sponge` +brew "moreutils" +brew "nmap" +# brew "openconnect" +brew "reattach-to-user-namespace" +# better/more recent version of screen +brew "homebrew/dupes/screen" +brew "tmux" +brew "todo-txt" +brew "tree" +brew "ttyrec" +# better, more recent vim +brew "vim --with-client-serverbrew --with-override-system-vi" +brew "watch" +# Install wget with IRI support +brew "wget --enable-iri" +# Homebrew Casks +# cask "adium" +# cask "amazon-cloud-drive" +# cask "atom" +# cask "box-sync" +# cask "comicbooklover" +# cask "diffmerge" +cask "docker" # docker for mac +# cask "dropbox" +# cask "evernote" +cask "flux" +cask "gpg-suite" +# cask "ireadfast" +cask "iterm2" +cask "little-snitch" +# cask "macbreakz" +cask "micro-snitch" +# cask "signal" +# cask "macvim" +cask "sizeup" +# cask "sketchup" +cask "slack" +# cask "the-unarchiver" +# cask "torbrowser" +# cask "transmission" +cask "visual-studio-code" +# cask "vlc" +cask "xquartz" +# Mac AppStore Apps +mas "Xcode", id: 497799835 +# mas "Amphetamine", id: 937984704 +# mas "bear", id: 1091189122 +# mas "monosnap", id: 540348655 +# mas "pwsafemac", id: 520993579 diff --git a/install.sh b/install.sh index 148596f5b..ab0a3705d 100755 --- a/install.sh +++ b/install.sh @@ -297,6 +297,14 @@ if [[ $response =~ (y|yes|Y) ]];then fi +read -r -p "Install packages from Brewfile? [y|N] " response +if [[ $response =~ (y|yes|Y) ]]; then + bot "installing packages from Brewfile" + brew bundle --file ~/.Brewfile + ok +fi + + # if [[ -d "/Library/Ruby/Gems/2.0.0" ]]; then # running "Fixing Ruby Gems Directory Permissions" # sudo chown -R $(whoami) /Library/Ruby/Gems/2.0.0 From 7280f8a4e82a75a43435a647414f5deab8494e6a Mon Sep 17 00:00:00 2001 From: GITHUBFULLNAME Date: Tue, 21 Dec 2021 11:14:07 -0700 Subject: [PATCH 2/6] Restore single quotes --- config.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config.js b/config.js index c4d102bfd..d25855015 100644 --- a/config.js +++ b/config.js @@ -3,16 +3,16 @@ module.exports = { cask: [], // Moved to ./homedir/.Brewfile gem: [], npm: [ - "antic", - "buzzphrase", - "eslint", - "instant-markdown-d", + 'antic', + 'buzzphrase', + 'eslint', + 'instant-markdown-d', // 'generator-dockerize', // 'gulp', - "npm-check-updates", - "prettyjson", - "trash", - "vtop", + 'npm-check-updates', + 'prettyjson', + 'trash', + 'vtop', // ,'yo' ], mas: [], // Moved to ./homedir/.Brewfile From a266059c871d81a0f839732e48b640ce5807ab05 Mon Sep 17 00:00:00 2001 From: GITHUBFULLNAME Date: Tue, 21 Dec 2021 11:18:26 -0700 Subject: [PATCH 3/6] Reduces git diffs --- config.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/config.js b/config.js index d25855015..b28309086 100644 --- a/config.js +++ b/config.js @@ -1,7 +1,12 @@ module.exports = { - brew: [], // Moved to ./homedir/.Brewfile - cask: [], // Moved to ./homedir/.Brewfile - gem: [], + brew: [ + // Moved to ./homedir/.Brewfile + ], + cask: [ + // Moved to ./homedir/.Brewfile + ], + gem: [ + ], npm: [ 'antic', 'buzzphrase', @@ -12,7 +17,7 @@ module.exports = { 'npm-check-updates', 'prettyjson', 'trash', - 'vtop', + 'vtop' // ,'yo' ], mas: [], // Moved to ./homedir/.Brewfile From a1edb2a48bf8b3da43fe867eb82bc3ce6c5f5ce4 Mon Sep 17 00:00:00 2001 From: GITHUBFULLNAME Date: Tue, 21 Dec 2021 11:19:15 -0700 Subject: [PATCH 4/6] Reduces git diffs --- config.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config.js b/config.js index b28309086..a110555be 100644 --- a/config.js +++ b/config.js @@ -20,5 +20,7 @@ module.exports = { 'vtop' // ,'yo' ], - mas: [], // Moved to ./homedir/.Brewfile + mas: [ + // Moved to ./homedir/.Brewfile + ], }; From 13e42412cd6ab617129dbe98c086b9bf4b52a0c4 Mon Sep 17 00:00:00 2001 From: GITHUBFULLNAME Date: Tue, 21 Dec 2021 11:22:04 -0700 Subject: [PATCH 5/6] Fixed args --- homedir/.Brewfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homedir/.Brewfile b/homedir/.Brewfile index 77792de48..fa8d88221 100644 --- a/homedir/.Brewfile +++ b/homedir/.Brewfile @@ -28,9 +28,9 @@ brew "gifsicle" brew "gnupg" # Install GNU `sed`, overwriting the built-in `sed` # so we can do "sed -i 's/foo/bar/' file" instead of "sed -i '' 's/foo/bar/' file" -brew "gnu-sedbrew --with-default-names" +brew "gnu-sedbrew", args: ["--with-default-names"] # upgrade grep so we can get things like inverted match (-v) -brwe "grepbrew --with-default-names" +brwe "grepbrew", args: ["--with-default-names"] # better, more recent grep brew "homebrew/dupes/grep" # https://github.com/jkbrzt/httpie From d02f0ddf268c96e42dc008d49a994bd8e5080b37 Mon Sep 17 00:00:00 2001 From: GITHUBFULLNAME Date: Tue, 21 Dec 2021 11:23:10 -0700 Subject: [PATCH 6/6] More args fixes --- homedir/.Brewfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homedir/.Brewfile b/homedir/.Brewfile index fa8d88221..05ac3a3df 100644 --- a/homedir/.Brewfile +++ b/homedir/.Brewfile @@ -51,10 +51,10 @@ brew "todo-txt" brew "tree" brew "ttyrec" # better, more recent vim -brew "vim --with-client-serverbrew --with-override-system-vi" +brew "vim", args: ["--with-client-serverbrew", "--with-override-system-vi"] brew "watch" # Install wget with IRI support -brew "wget --enable-iri" +brew "wget", args: ["--enable-iri"] # Homebrew Casks # cask "adium" # cask "amazon-cloud-drive"