Merge branch 'master' of ssh://github.com/dustinswan/dotfiles

bin/start_website_photos

@@ -0,0 +1,7 @@
+#!/bin/bash
+while [ 1 ];
+do
+    imagesnap - | convert - -resize "50%" jpeg:- | ssh dustinswan@dustinswan.org "cat > /srv/http/dustinswan.org/dustin.jpg"
+    sleep 10;
+done
+

bootstrap-mac.sh

@@ -23,6 +23,9 @@ brew install ranger
 brew install bash
 brew install fish
 brew install ack
+brew install tree
+brew install imagesnap
+brew install imagemagick
 brew install openssl
 brew install openssh --with-brewed-openssl
 brew install ssh-copy-id
@@ -43,26 +46,27 @@ brew cask install rdio
 brew cask install alfred
 brew cask alfred link
 brew cask install slate
-brew cask install google-chrome 
-brew cask install charles 
-brew cask install dropbox 
-brew cask install iterm2 
-#brew cask install macvim 
-brew cask install vlc 
-brew cask install transmission 
-brew cask install firefox 
-brew cask install the-unarchiver 
+brew cask install google-chrome
+brew cask install charles
+brew cask install dropbox
+brew cask install iterm2
+#brew cask install macvim
+brew cask install vlc
+brew cask install transmission
+brew cask install firefox
+brew cask install the-unarchiver
 brew cask install electrum
 brew cask install steam
 brew cask install sketchup
 #brew cask install gpgtools ???
 #brew cask install vagrant
-#brew cask install bittorrent-sync 
+#brew cask install bittorrent-sync
 #brew cask install truecrypt
 brew cask install asepsis
 brew cask install keyremap4macbook
 brew cask install audacity
 brew cask install launchrocket
+brew cask install thunderbird
 brew cleanup
 
 # Symlinks

mbsyncrc

@@ -1,10 +1,10 @@
 IMAPAccount gmail
 Host imap.gmail.com
 User dustinswan@gmail.com
-# PassCmd "gpg -d ~/.gmail-password.gpg"
+PassCmd "gpg -d ~/.gmail-password.gpg"
 # SSL
 UseIMAPS yes
-CertificateFile ~/.mail/gmail.pem
+#CertificateFile ~/.mail/gmail.pem
 
 IMAPStore gmail-remote
 Account gmail
@@ -17,7 +17,7 @@ Channel gmail
 Master :gmail-remote:
 Slave :gmail-local:
 # Include everything
-# Patterns *
+Patterns *
 # Automatically create missing mailboxes, both locally and on the server
 Create Both
 # Expunge Both

msmtprc

@@ -5,17 +5,17 @@ protocol smtp
 auth on
 from dustinswan@gmail.com
 user dustinswan@gmail.com
-passwordeval gpg --no-tty -d ~/.gmail_password.gpg
+passwordeval gpg -d ~/.gmail-password.gpg
 tls on
-tls_trust_file ~/.mutt/gmail_cert
+#tls_trust_file ~/.mutt/gmail_cert
 
-account DswanIOCOM
-host secure.emailsrvr.com
-port 587
-protocol smtp
-auth on
-from dswan@iocom.com
-user dswan@insors.com
-passwordeval gpg --no-tty -d ~/.iocom_password.gpg
+#account DswanIOCOM
+#host secure.emailsrvr.com
+#port 587
+#protocol smtp
+#auth on
+#from dswan@iocom.com
+#user dswan@insors.com
+#passwordeval gpg --no-tty -d ~/.iocom_password.gpg
 
 account default : DustinswanGmail

mutt/muttrc

@@ -46,13 +46,13 @@ set sort = threads
 set sort_aux = reverse-last-date-received
 
 # Sidebar
-set sidebar_delim   = '  │'
-set sidebar_visible = yes
-set sidebar_width   = 50
-# color sidebar_new color221 color233
-bind index <down>     sidebar-next
-bind index <up>       sidebar-prev
-bind index <right>    sidebar-open
+#set sidebar_delim   = '  │'
+#set sidebar_visible = yes
+#set sidebar_width   = 50
+## color sidebar_new color221 color233
+#bind index <down>     sidebar-next
+#bind index <up>       sidebar-prev
+#bind index <right>    sidebar-open
 
 # Status Bar
 #set status_chars = "  *&A"

packages

@@ -34,6 +34,9 @@ var packages = [
 { brew: "urlview", aur: "urlview" },
 { brew: "isync", aur: "isync" },
 { brew: "mosh", arch: "mosh" },
+{ brew: "tree", arch: "tree" },
+{ brew: "imagesnap" }, // TODO linux
+{ brew: "imagemagick", arch: "imagemagick" },
 
 // Desktop Applications
 // Mac Only
@@ -46,6 +49,8 @@ var packages = [
 { cask: "asepsis" },
 { cask: "keyremap4macbook" },
 { cask: "the-unarchiver" },
+{ cask: "launchrocket" },
+{ cask: "thunderbird" },
 
 // Linux Only
 { arch: "rxvt-unicode" },
@@ -62,4 +67,4 @@ var packages = [
 { cask: "sketchup" }, // TODO linux
 { cask: "audacity", arch: "audacity" },
 
-],
+];

symlinks.sh

@@ -11,6 +11,7 @@ rm ~/.ruby-version; ln -s ~/dotfiles/ruby-version ~/.ruby-version
 rm ~/.tmux.conf; ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
 rm ~/.vimrc; ln -s ~/dotfiles/vimrc ~/.vimrc
 rm -rf ~/.vim; ln -s ~/dotfiles/vim ~/.vim
+rm ~/.vimperatorrc; ln -s ~/dotfiles/vimperatorrc ~/.vimperatorrc
 
 # TODO mac only
 rm ~/.slate.js; ln -s ~/dotfiles/slate.js ~/.slate.js

tmux.conf

@@ -1,3 +1,6 @@
+# UGH
+set-option -g default-command "reattach-to-user-namespace -l fish"
+
 # Set the prefix to ^A
 unbind C-b
 set -g prefix C-a

vimperatorrc

@@ -0,0 +1,7 @@
+ignorekeys add mail\.google\.com
+ignorekeys add google\.com/calendar
+ignorekeys add docs\.google\.com
+ignorekeys add feedly\.com
+
+set gui = nonavigation
+set editor='bash -lc "mvim -f \$*" mvim'

vimrc

@@ -51,7 +51,6 @@ Bundle 'SirVer/ultisnips'
 Bundle 'lukerandall/haskellmode-vim'
 Bundle 'bitc/vim-hdevtools'
 " Bundle 'Shougo/neocomplcache'
-Bundle 'airblade/vim-gitgutter'
 Bundle 'qstrahl/vim-matchmaker'
 "Bundle 'bling/vim-airline'
 Bundle 'matze/vim-move'
@@ -60,7 +59,10 @@ Bundle 'tpope/vim-vinegar'
 Bundle 'itchyny/calendar.vim'
 Bundle 'lfilho/cosco.vim'
 Bundle 'ntpeters/vim-better-whitespace'
-Bundle "sdanielf/vim-stdtabs"
+" No good for IOCOM
+Bundle 'sdanielf/vim-stdtabs'
+Bundle 'airblade/vim-gitgutter'
+Bundle 'gcmt/wildfire.vim'
 
 let $GIT_SSL_NO_VERIFY = 'true'