Settings for macbook

scripts/docker.sh

@@ -10,5 +10,5 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
     sudo gpasswd -a $USER docker
     newgrp docker
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-    brew cask install docker
+    brew install docker
 fi

scripts/emacs.sh

@@ -18,7 +18,7 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
     systemctl --user enable --now emacs
 elif [[ "$OSTYPE" == "darwin"* ]]; then
     brew tap railwaycat/emacsmacport
-    brew cask install emacs
+    brew install emacs
 fi
 
 ln -s $PARENT_FOLDER/emacs-config ~/.emacs.d

scripts/user_apps.sh

@@ -46,27 +46,30 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
     brew install fzf
 
     set +e
-    brew tap caskroom/fonts
-    brew cask install font-fira-mono
-    brew cask install font-fira-code
-    brew cask install font-fira-mono-for-powerline
-    brew cask install font-source-code-pro
+    brew tap homebrew/cask-fonts
+    brew install font-fira-mono
+    brew install font-fira-code
+    brew install font-fira-mono-for-powerline
+    brew install font-source-code-pro
 
-    brew cask install iterm2
-    brew cask install firefox
-    brew cask install chrome
-    brew cask install sketch
+    brew install visual-studio-code
+    brew install iterm2
+    brew install firefox
+    brew install chrome
+    brew install sketch
+    brew install alfred
+    brew install karabiner-elements
 
     # usability
-    brew cask install spectacle
-    brew cask install authy
-    brew cask install istat-menus
+    brew install spectacle
+    brew install authy
+    brew install istat-menus
 
     # fun
-    brew cask install spotify
-    brew cask install vlc
-    brew cask install webtorrent
-    brew cask install skype
-    brew cask install wireshark
+    brew install spotify
+    # brew cask install vlc
+    # brew cask install webtorrent
+    # brew cask install skype
+    # brew cask install wireshark
     set -e
 fi

start.sh

@@ -37,11 +37,12 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
 elif [[ "$OSTYPE" == "darwin"* ]]; then
     set +e
     xcode-select --install
+    sudo xcodebuild -license accept
     /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
     set -e
 
-    brew tap caskroom/cask
-    brew tap caskroom/versions
+    brew tap homebrew/cask
+    brew tap homebrew/cask-versions
 
     brew install coreutils
 fi

zsh/.zshenv

@@ -1,2 +1,3 @@
 # ssh
 
+source "$HOME/.cargo/env"