From de889fec04ef06f77a696a5febdf51ae5da80ac7 Mon Sep 17 00:00:00 2001 From: Chris Friedman Date: Sun, 29 Aug 2021 19:05:23 -0400 Subject: [PATCH 1/4] :sparkles: add brewfile --- dotfiles/Brewfile | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 dotfiles/Brewfile diff --git a/dotfiles/Brewfile b/dotfiles/Brewfile new file mode 100644 index 0000000..b81d2cb --- /dev/null +++ b/dotfiles/Brewfile @@ -0,0 +1,45 @@ +tap "homebrew/bundle" +tap "homebrew/cask" +tap "homebrew/cask-fonts" +tap "homebrew/core" +brew "bat" +brew "bfg" +brew "mono" +brew "ckan" +brew "cmake" +brew "docker", link: false +brew "fzf" +brew "node" +brew "gatsby-cli", link: false +brew "gh" +brew "git" +brew "gitmoji" +brew "go" +brew "htop" +brew "macvim" +brew "mas" +brew "ninvaders" +brew "nmap" +brew "prettyping" +brew "python@3.8" +brew "tldr" +brew "zork" +cask "atom" +cask "beersmith" +cask "docker" +cask "font-hack-nerd-font" +cask "google-chrome" +cask "raspberry-pi-imager" +cask "skype" +cask "slack" +cask "steam" +cask "visual-studio-code" +cask "vlc" +cask "zoom" +mas "1Password 7", id: 1333542190 +mas "GarageBand", id: 682658836 +mas "iMovie", id: 408981434 +mas "Keynote", id: 409183694 +mas "Numbers", id: 409203825 +mas "Pages", id: 409201541 +mas "Spark", id: 1176895641 From 586ceabfee2f8edcbc022b017817ce0abca3c903 Mon Sep 17 00:00:00 2001 From: Chris Friedman Date: Sun, 29 Aug 2021 19:07:37 -0400 Subject: [PATCH 2/4] :fire: don't brew install in stepu.sh b/c of brewfile --- system/setup.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/system/setup.sh b/system/setup.sh index a6aadc2..f4f1583 100644 --- a/system/setup.sh +++ b/system/setup.sh @@ -26,10 +26,6 @@ then # Do something under Mac OS X platform # Install Brew /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - # install utilities - brew install gitmoji - brew install fzf - brew install bat echo 'alias cat="bat"' > ~/env.sh elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ] then From 616f1a89b18cb6fe160a969c1c2728b1d2f6b3e7 Mon Sep 17 00:00:00 2001 From: Chris Friedman Date: Sun, 29 Aug 2021 19:24:39 -0400 Subject: [PATCH 3/4] :truck: prettyping is installed differently in mac and linux brew installs in mac, manual instal in linux. --- dotfiles/env.sh | 2 +- system/setup.sh | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dotfiles/env.sh b/dotfiles/env.sh index e35ec0e..660be30 100755 --- a/dotfiles/env.sh +++ b/dotfiles/env.sh @@ -11,7 +11,7 @@ alias envconfig="vim ~/env.sh" alias vimconfig="vim $HOME/.vimrc" alias add-key="ssh-add ~/.ssh/id_rsa" alias zshrc="source ~/.zshrc" -alias ping="~/bin/prettyping --nolegend" # https://github.com/denilsonsa/prettyping +alias ping="prettyping --nolegend" # https://github.com/denilsonsa/prettyping alias vstart="source ./venv/bin/activate && python -V" alias cpwd="echo $(pwd) | pbcopy" alias fe='fzf' # https://github.com/junegunn/fzf diff --git a/system/setup.sh b/system/setup.sh index f4f1583..b26988e 100644 --- a/system/setup.sh +++ b/system/setup.sh @@ -15,10 +15,7 @@ if [ ! -d ~/bin/ ]; then mkdir ~/bin/ fi -# Install utilities -# Install Prettyping -curl https://raw.githubusercontent.com/denilsonsa/prettyping/master/prettyping > $HOME/bin/prettyping -sudo chmod +x $HOME/bin/prettyping + # Install things in os specific manner: if [ "$(uname)" == "Darwin" ] @@ -26,6 +23,8 @@ then # Do something under Mac OS X platform # Install Brew /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + cp ~/dotfiles/dotfiles/Brewfile ~/Brewfile + brew bundle echo 'alias cat="bat"' > ~/env.sh elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ] then @@ -37,4 +36,8 @@ then sudo apt-get install fzf sudo apt install bat echo 'alias cat="batcat"' > ~/env.sh + # Install Prettyping + curl https://raw.githubusercontent.com/denilsonsa/prettyping/master/prettyping > $HOME/bin/prettyping + sudo chmod +x $HOME/bin/prettyping + echo 'alias ping="$HOME/bin/prettyping --noloegend"' > ~/env.sh fi From 8cd6da7366d1783ced282025de8173e0bbe360af Mon Sep 17 00:00:00 2001 From: Chris Friedman Date: Sun, 29 Aug 2021 19:30:59 -0400 Subject: [PATCH 4/4] :goal_net: set at the begining of setup\ --- system/setup.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/system/setup.sh b/system/setup.sh index b26988e..49e8f65 100644 --- a/system/setup.sh +++ b/system/setup.sh @@ -1,4 +1,7 @@ -#!/usr/local/bin/zsh +#!/usr/bin/env + +set -euo pipefail + cp ~/dotfiles/dotfiles/.zshrc ~/.zshrc cp ~/dotfiles/dotfiles/.p10k.zsh ~/.p10k.zsh cp ~/dotfiles/dotfiles/env.sh ~/env.sh