General cleanup, some mail stuff. Some switching from brew to nix

bootstrap-mac.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-sudo -v # ask for password only at the beginning
-
-ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
-
-# Homebrew
-brew update
-brew upgrade
-brew tap homebrew/dupes
-brew tap phinze/homebrew-cask
-brew tap jimbojsb/launchrocket
-brew tap homebrew/versions
-
-# Symlinks
-bash ~/dotfiles/symlinks.sh
-
-# Python
-pip install --upgrade setuptools
-pip install --upgrade pip
-
-# Ruby TODO -- set up chruby, ruby-build some stuff
-ruby-build 2.1.0 ~/.rubies/ruby-2.1.0
-chruby 2.1.0
-
-# Gems TODO
-# Node packages TODO
-# Cabal packages TODO
-
-# Sane OS X defaults
-bash ~/dotfiles/osx
-
-# Run some of these: Alfred, slate, asepsis, keyremap4macbook, etc.
-
-# App Store
-echo "Install Xcode and Pixelmator from the App Store!"

brew_cask_list

@@ -1,38 +0,0 @@
-adium
-alfred
-asepsis
-bittorrent-sync
-charles
-chicken
-cord
-cyberduck
-dropbox
-electrum
-firefox
-flux
-google-chrome
-google-drive
-gpgtools
-heroku-toolbelt
-iterm2
-julia
-karabiner
-keepassx
-kindle
-multibit
-p4merge
-p4v
-rdio
-sketchup
-slate
-spotify
-steam
-the-unarchiver
-thunderbird
-time-out
-transmission
-truecrypt (!)
-vlc
-xquartz
-emacs
-karabiner

brew_list

@@ -1,68 +1,96 @@
-ack
+atk
-bash
+autoconf
+automake
+bdw-gc
+bison
+boost
+boost-python
 brew-cask
-cask
+cairo
-chruby
+cmake
-coreutils
+faad2
-ctags
-ffmpeg
-findutils
 flac
-ghc
+fontconfig
-gist
+freetype
-git
+ftgl
-gnupg2 --with-readline
+gdbm
+gdk-pixbuf
+gettext
+glib
+glib-networking
+gmime
+gmp
+gnu-sed
 gnutls
-haskell-platform
+go
-htop-osx
+gobject-introspection
-imagemagick
+gsettings-desktop-schemas
-imagesnap
+gst-plugins-bad
-isl
+gst-plugins-bad010
-isync
+gst-plugins-base
+gst-plugins-base010
+gst-plugins-good
+gst-plugins-good010
+gst-plugins-ugly
+gst-plugins-ugly010
+gst-python010
+gstreamer
+gstreamer010
+gtk+
+guile
+harfbuzz
+haskell-stack
+hicolor-icon-theme
+icu4c
 jpeg
-jq
+keybase
-keychain
 lame
-lua
+ledger
-luarocks
+leveldb
-macvim --override-system-vim
+libatomic_ops
-mailutils
+libffi
-markdown
+libmms
-md5sha1sum
+libmpdclient
-mercurial
+libogg
+libpng
+libshout
+libsndfile
+libsoup
+libtasn1
+libtiff
+libtool
+libunistring
+libvorbis
+libxml2
+mad
 mobile-shell
-mpc
-mpd
 mpfr
-mpg123
-mplayer
 msmtp
-mu --with-emacs
+mu
-multitail
+ncmpcpp
-neovim
+nettle
-nvm
-offline-imap
 openssl
+p7zip
+pango
 perforce
 pinentry-mac
-postgresql
+pixman
-python3
+pkg-config
+protobuf
+py2cairo
+pygobject
+pygtk
+python
 readline
-reattach-to-user-namespace
+scons
-rlog
+snappy
-ruby-build
+speex
-ruby-install
+sphinx-doc
-sbcl
 sqlite
-ssh-copy-id
+taglib
-terminal-notifier
+theora
-the_silver_searcher
+two-lame
-tmux
+vala
-trash
-tree
-urlview
 w3m
-watch
+xapian
-wget
+xz
-zsh
-emacs --cocoa --with-glib --with-imagemagick --with-librsvg --with-mailutils

msmtprc

@@ -8,9 +8,10 @@ port 465
 protocol smtp
 from dustin@dustinswan.com
 user dustinswan@fastmail.com
-passwordeval "gpg --no-tty -q -d ~/.fastmail-password.gpg"
+passwordeval "gpg --no-tty -q -d ~/.dustinswan@fastmail.com-password.gpg"
 auth on
 tls on
+tls_starttls off
 tls_trust_file "/usr/local/etc/openssl/cert.pem"
 
 account IOCOM

offlineimaprc

@@ -17,7 +17,8 @@ remotehost = secure.emailsrvr.com
 remoteuser = dswan@insors.com
 remotepasseval = decrypt_password(".iocom-password.gpg")
 realdelete = no
-
+ssl = yes
+sslcacertfile = ~/.nix-profile/etc/ssl/certs/ca-bundle.crt
 
 [Account FastMail]
 localrepository = FastMailLocal
@@ -33,5 +34,6 @@ remotehost = mail.messagingengine.com
 remoteuser = dustinswan@fastmail.com
 remotepasseval = decrypt_password(".dustinswan@fastmail.com-password.gpg")
 realdelete = no
-sslcacertfile=/usr/local/etc/openssl/osx_cert.pem
+# sslcacertfile=/usr/local/etc/openssl/osx_cert.pem
+sslcacertfile = ~/.nix-profile/etc/ssl/certs/ca-bundle.crt
 ssl = yes