callummr · April 3, 2021 11:00 · Apr 3, 2021 · Apr 3, 2021 · Apr 3, 2021 · Apr 3, 2021
diff --git a/Brewfile b/Brewfile
@@ -51,4 +51,5 @@ cask 'font-source-code-pro'
 cask 'font-source-sans-pro'
 
 # App
-mas 'XCode', id: 497799835
+mas 'XCode', id: 497799835
+mas 'Todoist', id: 585829637
diff --git a/init.sh b/init.sh
@@ -19,6 +19,10 @@ echo "Install Homebrew Packages"
 brew tap homebrew/bundle
 brew bundle
 
+echo "Installing node, yarn"
+nvm install node
+npm i -g yarn
+
 echo "Install XCode CLI Tool"
 xcode-select --install
 

diff --git a/init.sh b/init.sh
@@ -10,6 +10,8 @@ defaults write com.apple.finder ShowPathbar -bool true
 
 echo "Installing Homebrew"
 if test ! $(which brew); then
+  echo "export PATH=/opt/homebrew/bin:$PATH" >> ~/.zshrc
+  source ~/.zshrc
   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 fi
 brew update

diff --git a/init.sh b/init.sh
@@ -28,7 +28,7 @@ echo "source ~/.oh-my-zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlightin
 sed -io 's/^plugins=.*/plugins=(git brew zsh-autosuggestions osx)/' ~/.zshrc
 sed -io 's/^ZSH_THEME.*/ZSH_THEME="agnoster"/' ~/.zshrc
 
-echo "Configrating Git"
+echo "Configuring Git"
 git config --global core.editor $(which vim)
 ## diff-so-fancy config
 git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Basic Setup
 ```
-git clone https://gist.github.com/059e210f8fe15e7eadc4a28e8b3e6b27.git setup
+git clone https://gist.github.com/callummr/753b7cebb026e30919ec9a16c09585cd.git setup
 cd setup && sh ./init.sh
 ```
 # Shell Configuration

diff --git a/Brewfile b/Brewfile
@@ -17,6 +17,7 @@ brew 'diff-so-fancy'
 brew 'git'
 brew 'awscli'
 brew 'nvm'
+brew 'pyenv'
 
 # Mac Apps
 ## Communication
@@ -29,6 +30,7 @@ cask 'google-chrome'
 cask 'firefox'
 cask 'rectangle'
 cask 'cheatsheet'
+cask 'todoist'
 
 ## System
 cask 'the-unarchiver'

diff --git a/init.sh b/init.sh
@@ -1,5 +1,13 @@
 #!/bin/sh
 
+echo "Finder tweaks"
+# Show Library Folder in Finder
+chflags nohidden ~/Library
+# Show Hidden Files in Finder
+defaults write com.apple.finder AppleShowAllFiles YES
+# Show Path Bar in Finder
+defaults write com.apple.finder ShowPathbar -bool true
+
 echo "Installing Homebrew"
 if test ! $(which brew); then
   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
@@ -17,8 +25,8 @@ sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install
 git clone git://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/plugins/zsh-autosuggestions
 git clone git://github.com/zsh-users/zsh-syntax-highlighting ~/.oh-my-zsh/plugins/zsh-syntax-highlighting
 echo "source ~/.oh-my-zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" >> ~/.zshrc
-sed -io 's/^plugins=.*/plugins=(autojump git brew common-aliases zsh-autosuggestions copydir copyfile encode64 node osx sublime tmux xcode pod docker git-extras git-prompt)/' ~/.zshrc
-sed -io 's/^ZSH_THEME.*/ZSH_THEME="dpoggi"/' ~/.zshrc
+sed -io 's/^plugins=.*/plugins=(git brew zsh-autosuggestions osx)/' ~/.zshrc
+sed -io 's/^ZSH_THEME.*/ZSH_THEME="agnoster"/' ~/.zshrc
 
 echo "Configrating Git"
 git config --global core.editor $(which vim)

diff --git a/Brewfile b/Brewfile
@@ -1,89 +1,47 @@
 # Taps
 tap 'homebrew/cask-fonts'
 tap 'homebrew/cask-versions'
-tap 'heroku/brew' 
 
-# Install CLI Tools
-## Shell Utilities
+# Utils
 brew 'coreutils'
 brew 'findutils'
-brew 'autojump'
+brew 'bat'
 brew 'zsh'
 brew 'zsh-completions'
-brew 'tmux'
-brew 'jq'
-brew 'q'
-brew 'docker-compose'
-brew 'ack'
-
-## Network Utilities
 brew 'htop'
-brew 'nmap'
-brew 'mtr'
 brew 'wget'
-
-## System Utilities
-brew 'terminal-notifier'
 brew 'tree'
-brew 'mackup'
 brew 'mas'
 brew 'trash'
-
-## Dev Utilities
 brew 'diff-so-fancy'
-brew 'heroku'
-brew 'reattach-to-user-namespace'
 brew 'git'
 brew 'awscli'
-brew 'w3m'
 brew 'nvm'
-brew 'node'
 
 # Mac Apps
 ## Communication
 cask 'slack'
-cask 'skype'
 
 ## Productivity
 cask 'alfred'
-cask 'go2shell'
 cask 'docker'
 cask 'google-chrome'
+cask 'firefox'
 cask 'rectangle'
-cask 'keycastr'
-cask 'clipy'
 cask 'cheatsheet'
 
 ## System
-cask 'skitch'
 cask 'the-unarchiver'
-cask 'coconutbattery'
 cask 'appcleaner'
-cask 'namechanger'
 
 ## Editor
 cask 'visual-studio-code'
-cask 'macdown'
 brew 'vim'
 
 ## Development
-cask 'atext'
-cask 'diffmerge'
-cask 'fastlane'
-cask 'firefox'
-cask 'gas-mask'
-cask 'gpg-suite'
-cask 'imageoptim'
 cask 'iterm2'
-cask 'java8'
-cask 'microsoft-remote-desktop-beta'
-cask 'ngrok'
-cask 'opera'
 cask 'postman'
-cask 'robo-3t'
-cask 'sequel-pro'
-cask 'psequel'
-cask 'sourcetree'
+cask 'tower'
 
 # Fonts
 cask 'font-source-code-pro-for-powerline'

diff --git a/README.md b/README.md
@@ -19,5 +19,4 @@ cd setup && sh ./init.sh
     ```
     ssh-keygen -t rsa -b 2048
     ```
-
-1. Copy your public key (***~/.ssh/id_rsa.pub***) to your Bitbucket Account's "SSH Keys"
+    
diff --git a/init.sh b/init.sh
@@ -2,7 +2,7 @@
 
 echo "Installing Homebrew"
 if test ! $(which brew); then
-  /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 fi
 brew update
 echo "Install Homebrew Packages"
@@ -20,29 +20,24 @@ echo "source ~/.oh-my-zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlightin
 sed -io 's/^plugins=.*/plugins=(autojump git brew common-aliases zsh-autosuggestions copydir copyfile encode64 node osx sublime tmux xcode pod docker git-extras git-prompt)/' ~/.zshrc
 sed -io 's/^ZSH_THEME.*/ZSH_THEME="dpoggi"/' ~/.zshrc
 
-echo "Installing Tmux Settings"
-git clone https://github.com/gpakosz/.tmux.git ~/.tmux
-ln -s ~/.tmux/.tmux.conf ~/.tmux.conf
-cp ~/.tmux/.tmux.conf.local ~/
-
-echo "Install VIM settings"
-git clone --depth=1 https://github.com/amix/vimrc.git ~/.vim_runtime
-
 echo "Configrating Git"
-git config --global merge.tool diffmerge
-git config --global merge.conflictstyle diff3
-git config --global mergetool.prompt false
-git config --global alias.co checkout
-git config --global alias.ci commit
-git config --global alias.st status
-git config --global alias.br branch
 git config --global core.editor $(which vim)
-git config --global alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --"
-git config --global alias.tree "log --graph --full-history --all --color --date=short --pretty=format:'%Cred%x09%h %Creset%ad%Cblue%d %Creset %s %C(bold)(%an)%Creset'"
-
+## diff-so-fancy config
+git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"
+git config --global interactive.diffFilter "diff-so-fancy --patch"
+git config --global color.ui true
+git config --global color.diff-highlight.oldNormal    "red bold"
+git config --global color.diff-highlight.oldHighlight "red bold 52"
+git config --global color.diff-highlight.newNormal    "green bold"
+git config --global color.diff-highlight.newHighlight "green bold 22"
+git config --global color.diff.meta       "11"
+git config --global color.diff.frag       "magenta bold"
+git config --global color.diff.func       "146 bold"
+git config --global color.diff.commit     "yellow bold"
+git config --global color.diff.old        "red bold"
+git config --global color.diff.new        "green bold"
+git config --global color.diff.whitespace "red reverse"
 
 echo "Enabling Services"
 open /Applications/Alfred\ 4.app
-open /Applications/Gas\ Mask.app
-open /Applications/Clipy.app
 open /Applications/Rectangle.app
diff --git a/update.sh b/update.sh
@@ -1,17 +1,8 @@
 #!/bin/sh 
 git pull
 
-
 echo "Updating Homebrew"
 brew update && brew upgrade && brew cleanup && brew cask cleanup; brew bundle; brew doctor
 
 echo "Updating Oh My Zsh"
 env ZSH=$ZSH sh $ZSH/tools/upgrade.sh
-
-echo "Updating VIM"
-cd ~/.vim_runtime
-git pull --rebase
-
-echo "Updating Tmux"
-cd ~/.tmux
-git pull --rebase
diff --git a/Brewfile b/Brewfile
@@ -85,21 +85,6 @@ cask 'sequel-pro'
 cask 'psequel'
 cask 'sourcetree'
 
-# Finder Quicklook
-cask 'qlcolorcode'
-cask 'qlstephen'
-cask 'qlmarkdown'
-cask 'quicklook-json'
-cask 'qlimagesize'
-cask 'webpquicklook'
-cask 'suspicious-package'
-cask 'quicklookase'
-cask 'qlvideo'
-cask 'provisionql'
-cask 'quicklookapk'
-cask 'quicklook-csv' #++
-cask 'jupyter-notebook-ql' #++
-
 # Fonts
 cask 'font-source-code-pro-for-powerline'
 cask 'font-source-code-pro'

diff --git a/Brewfile b/Brewfile
@@ -104,7 +104,6 @@ cask 'jupyter-notebook-ql' #++
 cask 'font-source-code-pro-for-powerline'
 cask 'font-source-code-pro'
 cask 'font-source-sans-pro'
-cask 'font-source-serif-pro'
 
 # App
 mas 'XCode', id: 497799835
diff --git a/Brewfile b/Brewfile
@@ -64,7 +64,7 @@ cask 'namechanger'
 ## Editor
 cask 'visual-studio-code'
 cask 'macdown'
-brew 'vim', args: ["--with-lua"]
+brew 'vim'
 
 ## Development
 cask 'atext'

diff --git a/Brewfile b/Brewfile
@@ -1,8 +1,6 @@
 # Taps
-tap 'caskroom/cask'
 tap 'homebrew/cask-fonts'
 tap 'homebrew/cask-versions'
-tap 'homebrew/bundle'
 tap 'heroku/brew' 
 
 # Install CLI Tools
@@ -17,7 +15,6 @@ brew 'jq'
 brew 'q'
 brew 'docker-compose'
 brew 'ack'
-brew 'the_silver_searcher'
 
 ## Network Utilities
 brew 'htop'

diff --git a/init.sh b/init.sh
@@ -27,7 +27,6 @@ cp ~/.tmux/.tmux.conf.local ~/
 
 echo "Install VIM settings"
 git clone --depth=1 https://github.com/amix/vimrc.git ~/.vim_runtime
-sh ~/.vim_runtime/install_awesome_vimrc.sh
 
 echo "Configrating Git"
 git config --global merge.tool diffmerge

diff --git a/init.sh b/init.sh
@@ -43,7 +43,7 @@ git config --global alias.tree "log --graph --full-history --all --color --date=
 
 
 echo "Enabling Services"
-open /Applications/Alfred\ 3.app
+open /Applications/Alfred\ 4.app
 open /Applications/Gas\ Mask.app
 open /Applications/Clipy.app
-open /Applications/Rectagle.app
+open /Applications/Rectangle.app
diff --git a/Brewfile b/Brewfile
@@ -70,7 +70,7 @@ cask 'macdown'
 brew 'vim', args: ["--with-lua"]
 
 ## Development
-cask 'android-sdk'
+cask 'atext'
 cask 'diffmerge'
 cask 'fastlane'
 cask 'firefox'

diff --git a/init.sh b/init.sh
@@ -9,6 +9,9 @@ echo "Install Homebrew Packages"
 brew tap homebrew/bundle
 brew bundle
 
+echo "Install XCode CLI Tool"
+xcode-select --install
+
 echo "Installing Oh My Zsh"
 sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"
 git clone git://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/plugins/zsh-autosuggestions
@@ -43,4 +46,4 @@ echo "Enabling Services"
 open /Applications/Alfred\ 3.app
 open /Applications/Gas\ Mask.app
 open /Applications/Clipy.app
-open /Applications/Spectacle.app
+open /Applications/Rectagle.app
diff --git a/Brewfile b/Brewfile
@@ -52,7 +52,7 @@ cask 'alfred'
 cask 'go2shell'
 cask 'docker'
 cask 'google-chrome'
-cask 'spectacle'
+cask 'rectangle'
 cask 'keycastr'
 cask 'clipy'
 cask 'cheatsheet'

diff --git a/Brewfile b/Brewfile
@@ -1,8 +1,9 @@
 # Taps
 tap 'caskroom/cask'
-tap 'caskroom/fonts'
-tap 'caskroom/versions'
+tap 'homebrew/cask-fonts'
+tap 'homebrew/cask-versions'
 tap 'homebrew/bundle'
+tap 'heroku/brew' 
 
 # Install CLI Tools
 ## Shell Utilities
@@ -33,7 +34,7 @@ brew 'trash'
 
 ## Dev Utilities
 brew 'diff-so-fancy'
-brew 'heroku-toolbelt'
+brew 'heroku'
 brew 'reattach-to-user-namespace'
 brew 'git'
 brew 'awscli'

diff --git a/init.sh b/init.sh
diff --git a/update.sh b/update.sh
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Basic Setup
 ```
 git clone https://gist.github.com/059e210f8fe15e7eadc4a28e8b3e6b27.git setup
-cd setup && sh ./install.sh
+cd setup && sh ./init.sh
 ```
 # Shell Configuration
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Basic Setup
 ```
-git clone https://bitbucket.org/snippets/edlabtc/4Lkd9/mac-setup.git
-cd mac-setup && sh ./install.sh
+git clone https://gist.github.com/059e210f8fe15e7eadc4a28e8b3e6b27.git setup
+cd setup && sh ./install.sh
 ```
 # Shell Configuration
 

diff --git a/Brewfile b/Brewfile
@@ -0,0 +1,112 @@
+# Taps
+tap 'caskroom/cask'
+tap 'caskroom/fonts'
+tap 'caskroom/versions'
+tap 'homebrew/bundle'
+
+# Install CLI Tools
+## Shell Utilities
+brew 'coreutils'
+brew 'findutils'
+brew 'autojump'
+brew 'zsh'
+brew 'zsh-completions'
+brew 'tmux'
+brew 'jq'
+brew 'q'
+brew 'docker-compose'
+brew 'ack'
+brew 'the_silver_searcher'
+
+## Network Utilities
+brew 'htop'
+brew 'nmap'
+brew 'mtr'
+brew 'wget'
+
+## System Utilities
+brew 'terminal-notifier'
+brew 'tree'
+brew 'mackup'
+brew 'mas'
+brew 'trash'
+
+## Dev Utilities
+brew 'diff-so-fancy'
+brew 'heroku-toolbelt'
+brew 'reattach-to-user-namespace'
+brew 'git'
+brew 'awscli'
+brew 'w3m'
+brew 'nvm'
+brew 'node'
+
+# Mac Apps
+## Communication
+cask 'slack'
+cask 'skype'
+
+## Productivity
+cask 'alfred'
+cask 'go2shell'
+cask 'docker'
+cask 'google-chrome'
+cask 'spectacle'
+cask 'keycastr'
+cask 'clipy'
+cask 'cheatsheet'
+
+## System
+cask 'skitch'
+cask 'the-unarchiver'
+cask 'coconutbattery'
+cask 'appcleaner'
+cask 'namechanger'
+
+## Editor
+cask 'visual-studio-code'
+cask 'macdown'
+brew 'vim', args: ["--with-lua"]
+
+## Development
+cask 'android-sdk'
+cask 'diffmerge'
+cask 'fastlane'
+cask 'firefox'
+cask 'gas-mask'
+cask 'gpg-suite'
+cask 'imageoptim'
+cask 'iterm2'
+cask 'java8'
+cask 'microsoft-remote-desktop-beta'
+cask 'ngrok'
+cask 'opera'
+cask 'postman'
+cask 'robo-3t'
+cask 'sequel-pro'
+cask 'psequel'
+cask 'sourcetree'
+
+# Finder Quicklook
+cask 'qlcolorcode'
+cask 'qlstephen'
+cask 'qlmarkdown'
+cask 'quicklook-json'
+cask 'qlimagesize'
+cask 'webpquicklook'
+cask 'suspicious-package'
+cask 'quicklookase'
+cask 'qlvideo'
+cask 'provisionql'
+cask 'quicklookapk'
+cask 'quicklook-csv' #++
+cask 'jupyter-notebook-ql' #++
+
+# Fonts
+cask 'font-source-code-pro-for-powerline'
+cask 'font-source-code-pro'
+cask 'font-source-sans-pro'
+cask 'font-source-serif-pro'
+
+# App
+mas 'XCode', id: 497799835
diff --git a/README.md b/README.md
@@ -0,0 +1,23 @@
+# Basic Setup
+```
+git clone https://bitbucket.org/snippets/edlabtc/4Lkd9/mac-setup.git
+cd mac-setup && sh ./install.sh
+```
+# Shell Configuration
+
+1. Enable plugins - edit ***~/.zshrc***
+
+    Update plugins
+
+    ```
+     plugins=(autojump git brew common-aliases zsh-autosuggestions copydir copyfile encode64 node osx sublime tmux xcode pod docker git-extras git-prompt)
+    ```
+
+# Generate Your Development SSH Key
+1. Generate your key for the development machine
+
+    ```
+    ssh-keygen -t rsa -b 2048
+    ```
+
+1. Copy your public key (***~/.ssh/id_rsa.pub***) to your Bitbucket Account's "SSH Keys"
diff --git a/init.sh b/init.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+echo "Installing Homebrew"
+if test ! $(which brew); then
+  /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+fi
+brew update
+echo "Install Homebrew Packages"
+brew tap homebrew/bundle
+brew bundle
+
+echo "Installing Oh My Zsh"
+sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"
+git clone git://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/plugins/zsh-autosuggestions
+git clone git://github.com/zsh-users/zsh-syntax-highlighting ~/.oh-my-zsh/plugins/zsh-syntax-highlighting
+echo "source ~/.oh-my-zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" >> ~/.zshrc
+sed -io 's/^plugins=.*/plugins=(autojump git brew common-aliases zsh-autosuggestions copydir copyfile encode64 node osx sublime tmux xcode pod docker git-extras git-prompt)/' ~/.zshrc
+sed -io 's/^ZSH_THEME.*/ZSH_THEME="dpoggi"/' ~/.zshrc
+
+echo "Installing Tmux Settings"
+git clone https://github.com/gpakosz/.tmux.git ~/.tmux
+ln -s ~/.tmux/.tmux.conf ~/.tmux.conf
+cp ~/.tmux/.tmux.conf.local ~/
+
+echo "Install VIM settings"
+git clone --depth=1 https://github.com/amix/vimrc.git ~/.vim_runtime
+sh ~/.vim_runtime/install_awesome_vimrc.sh
+
+echo "Configrating Git"
+git config --global merge.tool diffmerge
+git config --global merge.conflictstyle diff3
+git config --global mergetool.prompt false
+git config --global alias.co checkout
+git config --global alias.ci commit
+git config --global alias.st status
+git config --global alias.br branch
+git config --global core.editor $(which vim)
+git config --global alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --"
+git config --global alias.tree "log --graph --full-history --all --color --date=short --pretty=format:'%Cred%x09%h %Creset%ad%Cblue%d %Creset %s %C(bold)(%an)%Creset'"
+
+
+echo "Enabling Services"
+open /Applications/Alfred\ 3.app
+open /Applications/Gas\ Mask.app
+open /Applications/Clipy.app
+open /Applications/Spectacle.app
diff --git a/update.sh b/update.sh
@@ -0,0 +1,17 @@
+#!/bin/sh 
+git pull
+
+
+echo "Updating Homebrew"
+brew update && brew upgrade && brew cleanup && brew cask cleanup; brew bundle; brew doctor
+
+echo "Updating Oh My Zsh"
+env ZSH=$ZSH sh $ZSH/tools/upgrade.sh
+
+echo "Updating VIM"
+cd ~/.vim_runtime
+git pull --rebase
+
+echo "Updating Tmux"
+cd ~/.tmux
+git pull --rebase
No results found