Updates to dotfiles

README.md

@@ -6,15 +6,15 @@
 Install fish shell, then set it as the default shell:
 
 ```shell
-sudo echo /usr/local/bin/fish >> /etc/shells
+sudo bash -c "echo /usr/local/bin/fish >> /etc/shells"
 chsh -s /usr/local/bin/fish
 
 fish
 
 curl https://git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fish
 fisher add jethrokuan/z
 fisher add edc/bass
-fisher add laughedelic/pisces
+# fisher add laughedelic/pisces
 fisher add rafaelrinaldi/pure
 
 git checkout https://github.com/laserson/dotfiles.git
@@ -28,7 +28,7 @@ cp dotfiles/config.fish ~/.config/fish
 mkdir -p ~/.config/nvim/autoload/
 curl -fLo ~/.config/nvim/autoload/plug.vim \
     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-cp init.vim ~/.config/nvim/
+cp ~/dotfiles/init.vim ~/.config/nvim/
 nvim +PlugInstall +qall
 ```
 ## Update dotfiles
@@ -49,33 +49,23 @@ popd
 
 ## Setting up a new MacOS machine
 
-1.  Create ~/.ssh (700) and transfer ssh keys if necessary. (You can scp the
+1.  Set computer name (under Sharing in System Preferences)
+2.  Install homebrew (see reqs there for installing Xcode).
+3.  Create ~/.ssh (700) and transfer ssh keys if necessary. (You can scp the
     files from one to the other.  Also transfer config.)
-
-2.  Install homebrew. May require installing Apple's developer tools (Xcode) and
-    Command Line Tools.
-
-3.  Set computer name (under Sharing in System Preferences)
-
-4.  Checkout this repo into ~/dotfiles.
-
-5.  Install homebrew and homebrew cask packages listed below.
-
+4.  Checkout this repo into ~/dotfiles
+5.  Install whatever homebrew and homebrew cask packages listed below.
 6.  Install Python using `install_conda.sh`.
-
 7.  Install R and Rstudio.
-
 8.  Install the "Hack" font.
-
 9.  `mkdir ~/tmp`
-
 10. Go through https://github.com/mathiasbynens/dotfiles/blob/master/.macos to
     customize and execute. Diff it against the `macos` file currently in the
     repo.
-
-11. Get Solarized theme for Terminal (maybe in mathiasbynens again)
-
-12. Create symlink to Dropbox called `ul-dropbox`
+11. Apply Solarized theme for Terminal in this directory.
+12. Install Dropbox
+13. Create symlink to Dropbox called `ul-dropbox`
+14. Remap CAPS to Esc (using System Preferences)
 
 Useful homebrew commands
 
@@ -123,12 +113,8 @@ brew install zinc
 Useful homebrew cask commands
 
 ```shell
-brew cask install airfoil
-brew cask install crashplan
-brew cask install cyberduck
 brew cask install dozer
 brew cask install dropbox
-brew cask install evernote
 brew cask install firefox
 brew cask install google-chrome
 brew cask install intellij-idea

install_conda.sh

@@ -10,6 +10,3 @@ conda create -y -n py37 python=3.7 $PACKAGES_CONDA
 conda info -a
 rm miniconda-install.sh
 pip install $PACKAGES_PIP
-
-conda init fish
-

macos

@@ -127,12 +127,6 @@ defaults write com.apple.BluetoothAudioAgent "Apple Bitpool Min (editable)" -int
 # (e.g. enable Tab in modal dialogs)
 defaults write NSGlobalDomain AppleKeyboardUIMode -int 3
 
-# Use scroll gesture with the Ctrl (^) modifier key to zoom
-defaults write com.apple.universalaccess closeViewScrollWheelToggle -bool true
-defaults write com.apple.universalaccess HIDScrollZoomModifierMask -int 262144
-# Follow the keyboard focus while zoomed in
-defaults write com.apple.universalaccess closeViewZoomFollowsFocus -bool true
-
 # Disable press-and-hold for keys in favor of key repeat
 defaults write NSGlobalDomain ApplePressAndHoldEnabled -bool false
 
@@ -162,7 +156,7 @@ sudo systemsetup -settimezone "America/New_York" > /dev/null
 defaults write com.apple.screensaver askForPassword -int 1
 defaults write com.apple.screensaver askForPasswordDelay -int 0
 
-# Save screenshots to the desktop
+# Save screenshots to the Downloads
 defaults write com.apple.screencapture location -string "${HOME}/Downloads"
 
 # Save screenshots in PNG format (other options: BMP, GIF, JPG, PDF, TIFF)
@@ -194,10 +188,10 @@ defaults write com.apple.finder NewWindowTarget -string "PfLo"
 defaults write com.apple.finder NewWindowTargetPath -string "file://${HOME}/"
 
 # Show icons for hard drives, servers, and removable media on the desktop
-defaults write com.apple.finder ShowExternalHardDrivesOnDesktop -bool true
-defaults write com.apple.finder ShowHardDrivesOnDesktop -bool true
-defaults write com.apple.finder ShowMountedServersOnDesktop -bool true
-defaults write com.apple.finder ShowRemovableMediaOnDesktop -bool true
+defaults write com.apple.finder ShowExternalHardDrivesOnDesktop -bool false
+defaults write com.apple.finder ShowHardDrivesOnDesktop -bool false
+defaults write com.apple.finder ShowMountedServersOnDesktop -bool false
+defaults write com.apple.finder ShowRemovableMediaOnDesktop -bool false
 
 # Finder: show hidden files by default
 defaults write com.apple.finder AppleShowAllFiles -bool true
@@ -268,7 +262,7 @@ defaults write com.apple.finder OpenWindowForNewRemovableDisk -bool true
 
 # Use list view in all Finder windows by default
 # Four-letter codes for the other view modes: `icnv`, `clmv`, `glyv`
-defaults write com.apple.finder FXPreferredViewStyle -string "Nlsv"
+defaults write com.apple.finder FXPreferredViewStyle -string "clmv"
 
 # Enable the warning before emptying the Trash
 defaults write com.apple.finder WarnOnEmptyTrash -bool true
@@ -350,7 +344,7 @@ defaults write com.apple.dock showhidden -bool true
 defaults write com.apple.dock show-recents -bool false
 
 # Disable the Launchpad gesture (pinch with thumb and three fingers)
-#defaults write com.apple.dock showLaunchpadGestureEnabled -int 0
+defaults write com.apple.dock showLaunchpadGestureEnabled -int 0
 
 # Reset Launchpad, but keep the desktop wallpaper intact
 find "${HOME}/Library/Application Support/Dock" -name "*-*.db" -maxdepth 1 -delete