4.0.0 overhaul and remove old stuff, add some new, view HISTORY.md …

…for changes or look through the commit, yo!

HISTORY.md

@@ -3,6 +3,7 @@
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
 - [Release History](#release-history)  
+  - [v4.0.0](#v400)
   - [v3.3.2](#v332)
   - [v3.3.1](#v331)
   - [v3.3.0](#v330)
@@ -18,10 +19,21 @@
 
 # Release History
 
+## v4.0.0
+ * OSX references to MacOS (includes Sierra)
+ * remove aliases to things that are no longer useful (`usenode`, `useio`)
+ * adding `bpc` alias for a `buzzphrase` git commit + push (don't use this on shared code)
+ * `update` alias for updating all software
+ * comment out GO path in `.shellpaths` (was causing slowness on machines with no go path)
+ * comment out all tool shellpaths (enable them at will)
+ * adding iTerm2 shell integration source
+ * `weather $city` shellfn
+ * cask install `little-snitch` and `micro-snitch`
+
 ## v3.3.2
  * `curltime` shell function
- * OSX Sierra fixes for key repeat
- * OSX Sierra wallpaper
+ * Mac Sierra fixes for key repeat
+ * Mac Sierra wallpaper
 
 ## v3.3.1
  * fix restore

README.md

@@ -1,8 +1,8 @@
 [![Beerpay](https://beerpay.io/atomantic/dotfiles/badge.svg?style=flat-square)](https://beerpay.io/atomantic/dotfiles)
 
-# \\[._.]/ - Hi, I'm the OSX bot
+# \\[._.]/ - Hi, I'm the MacOS bot
 
-I will update your OSX machine with Better™ system defaults, preferences, software configuration and even auto-install some handy development tools and apps that my developer friends find helpful.
+I will update your MacOS machine with Better™ system defaults, preferences, software configuration and even auto-install some handy development tools and apps that my developer friends find helpful.
 
 You don't need to install or configure anything upfront! This works with a brand-new machine from the factory as well as an existing machine that you've been working with for years.
 
@@ -53,7 +53,7 @@ You don't need to install or configure anything upfront! This works with a brand
 
 Don't you hate getting a new laptop or joining a new team and then spending a whole day setting up your system preferences and tools? Me too. That's why we automate; we did it once and we don't want to do have to do it again.
 
-\\[^_^]/ - This started as [Adam Eivy](http://adameivy.com)'s OSX shell configuration dotfiles but has grown to a mutil-developer platform for machine configuration.
+\\[^_^]/ - This started as [Adam Eivy](http://adameivy.com)'s MacOS shell configuration dotfiles but has grown to a mutil-developer platform for machine configuration.
 
 When I finish with your machine, you will be able to look at your command-line in full-screen mode like this (running iTerm):
 
@@ -91,7 +91,7 @@ cd ~/.dotfiles;
 
 If you have existing dotfiles for configuring git, zsh, vim, etc, these will be backed-up into `~/.dotfiles_backup/$(date +"%Y.%m.%d.%H.%M.%S")` and replaced with the files from this project. You can restore your original dotfiles by using `./restore.sh $RESTOREDATE` where `$RESTOREDATE` is the date folder name you want to restore.
 
-# 3.0.0 Upgrade Instructions!
+# 3.x.x+ Upgrade Instructions!
 
 `3.0.0` brings huge changes. If you have made any modifications (and didn't make your own fork), you will want to backup your dotfiles prior to running `git-up` or `git pull` on `~/.dotfiles`.
 
@@ -120,7 +120,7 @@ You can `cron ~/.crontab` if you want to add my nightly cron software updates.
 ![Remap Caps Lock](https://raw.githubusercontent.com/atomantic/dotfiles/master/img/remap_capslock.png)
 
 # Settings
-This project changes a number of settings and configures software on OSX.
+This project changes a number of settings and configures software on MacOS.
 Here is the current list:
 
 ## Configuring General System UI/UX
@@ -130,7 +130,7 @@ Here is the current list:
 - Set a custom wallpaper image
 
 ## Standard System Changes
-- always boot in verbose mode (not OSX GUI mode)
+- always boot in verbose mode (not MacOS GUI mode)
 - allow 'locate' command
 - Set standby delay to 24 hours (default is 1 hour)
 - Disable the sound effects on boot
@@ -180,6 +180,7 @@ Here is the current list:
 - Enable HiDPI display modes (requires restart)
 
 ## Finder Configs
+- Keep folders on top when sorting by name (Sierra only)
 - Allow quitting via ⌘ + Q; doing so will also hide desktop icons
 - Disable window animations and Get Info animations
 - Set Desktop as the default location for new Finder windows

config.js

@@ -3,6 +3,8 @@ module.exports = {
     // http://conqueringthecommandline.com/book/ack_ag
     'ack',
     'ag',
+    // cmake is required to compile vim bundle YouCompleteMe
+    'cmake',
     // Install GNU core utilities (those that come with OS X are outdated)
     // Don’t forget to add `$(brew --prefix coreutils)/libexec/gnubin` to `$PATH`.
     'coreutils',
@@ -53,6 +55,8 @@ module.exports = {
     'gpgtools',
     //'ireadfast',
     'iterm2',
+    'little-snitch',
+    'micro-snitch',
     //'macvim',
     'sizeup',
     //'sketchup',

homedir/.gitignore

@@ -1,6 +1,6 @@
-#######
-# OSX #
-#######
+#########
+# MacOS #
+#########
 .DS_Store
 .AppleDouble
 .LSOverride

homedir/.profile

@@ -6,5 +6,6 @@ source ~/.shellvars
 source ~/.shellfn
 source ~/.shellpaths
 source ~/.shellaliases
+source ~/.iterm2_shell_integration.`basename $SHELL`
 # Private/Proprietary shell aliases (not to be checked into the public repo) :)
 #source ~/Dropbox/Private/Boxes/osx/.shellaliases

homedir/.shellaliases

@@ -78,13 +78,16 @@ alias game.seek='txt="";for i in {1..20};do txt=$txt"$i. ";done;txt=$txt" Ready
 # switches to 'develop' branch, updates all local branches (nicely using git-up), removes all local branches already merged into 'develop'
 alias gitdev='git checkout develop; git-up; git branch --merged develop | grep -v "\* develop" | xargs -n 1 git branch -d; git branch;'
 
-# node.js + io.js
-alias usenode='brew unlink iojs && brew link node && echo Using Node.js'
-alias useio='brew unlink node && brew link --force iojs && echo Using io.js'
-
 # firewall management
 alias port-forward-enable="echo 'rdr pass inet proto tcp from any to any port 2376 -> 127.0.0.1 port 2376' | sudo pfctl -ef -"
 alias port-forward-disable="sudo pfctl -F all -f /etc/pf.conf"
 alias port-forward-list="sudo pfctl -s nat"
 
 alias vtop="vtop --theme wizard"
+
+# buzzphrase commit
+# used for my presentation decks when I have nothing to say about the commit
+alias bpc='git add -A . && git cam "$(buzzphrase 2)" && git push'
+
+# Get macOS Software Updates, and update installed Ruby gems, Homebrew, npm, and their installed packages
+alias update='sudo softwareupdate -i -a; brew update; brew upgrade; brew cleanup; npm install npm -g; npm update -g; sudo gem update --system; sudo gem update; sudo gem cleanup'

homedir/.shellfn

@@ -54,13 +54,13 @@ function matrix2() {
 echo -e "\e[1;40m" ; clear ; characters=$( jot -c 94 33 | tr -d '\n' ) ; while :; do echo $LINES $COLUMNS $(( $RANDOM % $COLUMNS)) $(( $RANDOM % 72 )) $characters ;sleep 0.05; done|gawk '{ letters=$5; c=$4; letter=substr(letters,c,1);a[$3]=0;for (x in a) {o=a[x];a[x]=a[x]+1; printf "\033[%s;%sH\033[2;32m%s",o,x,letter; printf "\033[%s;%sH\033[1;37m%s\033[0;0H",a[x],x,letter;if (a[x] >= $1) { a[x]=0; } }}'
 }
 
-# Use Mac OSX Preview to open a man page in a more handsome format
+# Use Mac OS Preview to open a man page in a more handsome format
 function manp() {
   man -t $1 | open -f -a /Applications/Preview.app
 }
 
 # Show normally hidden system and dotfile types of files
-# in Mac OSX Finder
+# in Mac OS Finder
 function showhiddenfiles() {
   defaults write com.apple.Finder AppleShowAllFiles YES
   osascript -e 'tell application "Finder" to quit'
@@ -69,7 +69,7 @@ function showhiddenfiles() {
 }
 
 # Hide (back to defaults) normally hidden system and dotfile types of files
-# in Mac OSX Finder
+# in Mac OS Finder
 function hidehiddenfiles() {
   defaults write com.apple.Finder AppleShowAllFiles NO
   osascript -e 'tell application "Finder" to quit'
@@ -126,3 +126,9 @@ time_starttransfer:  %{time_starttransfer}\n\
 --------------------------\n\
         time_total:  %{time_total}\n" -o /dev/null -s "$1"
 }
+
+
+## weather seattle
+function weather() {
+  curl wttr.in/$1
+}

homedir/.shellpaths

@@ -7,7 +7,7 @@ export PATH=/usr/local/sbin:$PATH
 export PATH=/usr/local/bin:$PATH
 
 # GO
-export PATH=$PATH:/usr/local/opt/go/libexec/bin
+#export PATH=$PATH:/usr/local/opt/go/libexec/bin
 
 # The next line updates PATH for the Google Cloud SDK.
 #source "/Users/$(whoami)/Downloads/google-cloud-sdk/path.zsh.inc"

homedir/.shellvars

@@ -15,12 +15,12 @@ export MYDEVAPPS=/Applications/Dev
 #########################################################################
 # Tool paths
 #########################################################################
-export CLOJURE_HOME=/Applications/Dev/clojure
-export EC2_HOME=/Applications/Dev/ec2-api-tools-1.3-46266
-export JAVA_HOME=/Library/Java/Home
+#export CLOJURE_HOME=/Applications/Dev/clojure
+#export EC2_HOME=/Applications/Dev/ec2-api-tools-1.3-46266
+#export JAVA_HOME=/Library/Java/Home
 #export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
-export GOPATH=/usr/local/bin
-export GROOVY_HOME=/usr/local/opt/groovy/libexec
+#export GOPATH=/usr/local/bin
+#export GROOVY_HOME=/usr/local/opt/groovy/libexec
 
 #########################################################################
 # Tool settings

homedir/.vimrc

@@ -6,10 +6,10 @@ if has('gui_running')
 else
     set background=dark
 endif
-colorscheme solarized
 " syntax on " syntax highlighting on
 syntax enable
 let g:solarized_termtrans = 1
+colorscheme solarized
 call togglebg#map("<F5>")
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

homedir/.zshrc

@@ -33,6 +33,8 @@ plugins=(colorize compleat dirpersist autojump git gulp history cp)
 
 source $ZSH/oh-my-zsh.sh
 
+test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
+
 source /usr/local/opt/nvm/nvm.sh
 
 autoload -U add-zsh-hook

install.sh

@@ -93,12 +93,12 @@ if [[ $? = 0 ]]; then
 
   running "replacing items in .gitconfig with your info ($COL_YELLOW$fullname, $email, $githubuser$COL_RESET)"
 
-  # test if gnu-sed or osx sed
+  # test if gnu-sed or MacOS sed
 
   sed -i "s/GITHUBFULLNAME/$firstname $lastname/" ./homedir/.gitconfig > /dev/null 2>&1 | true
   if [[ ${PIPESTATUS[0]} != 0 ]]; then
     echo
-    running "looks like you are using OSX sed rather than gnu-sed, accommodating"
+    running "looks like you are using MacOS sed rather than gnu-sed, accommodating"
     sed -i '' "s/GITHUBFULLNAME/$firstname $lastname/" ./homedir/.gitconfig;
     sed -i '' 's/GITHUBEMAIL/'$email'/' ./homedir/.gitconfig;
     sed -i '' 's/GITHUBUSER/'$githubuser'/' ./homedir/.gitconfig;
@@ -275,7 +275,11 @@ ok
 ###############################################################################
 bot "Configuring General System UI/UX..."
 ###############################################################################
-
+# Close any open System Preferences panes, to prevent them from overriding
+# settings we’re about to change
+running "closing any system preferences to prevent issues with automated changes"
+osascript -e 'tell application "System Preferences" to quit'
+ok
 ###############################################################################
 # SSD-specific tweaks                                                         #
 ###############################################################################
@@ -356,7 +360,7 @@ sudo chflags uchg /Private/var/vm/sleepimage;ok
 ################################################
 bot "Standard System Changes"
 ################################################
-running "always boot in verbose mode (not OSX GUI mode)"
+running "always boot in verbose mode (not MacOS GUI mode)"
 sudo nvram boot-args="-v";ok
 
 running "allow 'locate' command"
@@ -525,6 +529,8 @@ sudo defaults write /Library/Preferences/com.apple.windowserver DisplayResolutio
 ###############################################################################
 bot "Finder Configs"
 ###############################################################################
+running "Keep folders on top when sorting by name (Sierra only)"
+defaults write com.apple.finder _FXSortFoldersFirst -bool true
 
 running "Allow quitting via ⌘ + Q; doing so will also hide desktop icons"
 defaults write com.apple.finder QuitMenuItem -bool true;ok

package.json

@@ -14,6 +14,7 @@
   "keywords": [
     "dotfiles",
     "osx",
+    "macos",
     "automation",
     "setup",
     "developer",