new stuff!

5 files changed, 79 insertions, 11 deletions

diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 7fe8106..2a8dff8 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -10,6 +10,6 @@ XDG_DOWNLOAD_DIR="$HOME/tmp"
 XDG_TEMPLATES_DIR="$HOME/"
 XDG_PUBLICSHARE_DIR="$HOME/"
 XDG_DOCUMENTS_DIR="$HOME/"
-XDG_MUSIC_DIR="$HOME/media/music"
+XDG_MUSIC_DIR="$HOME/"
 XDG_PICTURES_DIR="$HOME/media/photos"
 XDG_VIDEOS_DIR="$HOME/media"
diff --git a/.ispell_default b/.ispell_default
index c0115b8..bcf788c 100644
--- a/.ispell_default
+++ b/.ispell_default
@@ -3,16 +3,19 @@ Azcarraga
 bnewbold
 bootloader
 Breitenbach
+Bryan
 Buzek
 ccc
 cgs
 cohomology
+com
 commutator
 diagonalized
 documentclass
 DOI
 Drummond
 eds
+edu
 eigenspace
 Elsevier
 Engel
@@ -20,6 +23,7 @@ Eq
 esu
 Europhysics
 eV
+fas
 Ficek
 Fock
 Franken
@@ -28,8 +32,10 @@ gm
 hbar
 Hirota
 Hollber
+html
 http
 iconography
+internet
 Izquierdo
 Jaekel
 Jaffe
@@ -43,6 +49,7 @@ Leonhardt
 libmaple
 LIGO
 linux
+localhost
 MUS
 Newbold
 Noam
@@ -51,22 +58,32 @@ Num
 observable's
 observables
 opto
+org
+OSX
 Phd
 Phys
 PySerial
+RealVNC
+realvnc
 Reynaud
 sec
 sech
 Slusher
 SNR
+sourceforge
 SQL
+ssh
 Styer
 toolchain
+Ubuntu
+uk
 Universitat
 unsqueezed
 USB
+VNC
 Von
 Weyl
 wget
 WH
+www
 Yuen
diff --git a/.pinerc b/.pinerc
index a9b889c..f99d9a8 100644
--- a/.pinerc
+++ b/.pinerc
@@ -72,7 +72,10 @@ feature-list=enable-flag-cmd,
 	enable-flag-screen-keyword-shortcut,
 	enable-unix-pipe-cmd,
 	quell-dead-letter-on-cancel,
-	quell-charset-warning
+	quell-charset-warning,
+	use-current-dir,
+	prefer-plain-text,
+	no-copy-to-address-to-from-if-it-is-us
 
 # Pine executes these keys upon startup (e.g. to view msg 13: i,j,1,3,CR,v)
 initial-keystroke-list=
@@ -81,7 +84,8 @@ initial-keystroke-list=
 default-composer-hdrs=
 
 # Add these customized headers (and possible default values) when composing
-customized-hdrs=Reply-To:
+customized-hdrs=From:,
+	Reply-To:
 
 # When viewing messages, include this list of headers
 viewer-hdrs=
@@ -160,7 +164,7 @@ character-set=
 editor=
 
 # Specifies the program invoked by ^T in the Composer.
-speller=/usr/bin/ispell
+speller=/usr/bin/aspell --mode=email check
 
 # Specifies the column of the screen where the composer should wrap.
 composer-wrap-column=
@@ -185,14 +189,23 @@ use-only-domain-name=
 
 # This variable takes a list of programs that message text is piped into
 # after MIME decoding, prior to display.
-display-filters=_LEADING("-----BEGIN PGP SIGNED MESSAGE")_ /usr/bin/gpg --decrypt, _LEADING("-----BEGIN PGP MESSAGE")_ /usr/bin/gpg --decrypt
+display-filters=_BEGINNING("-----BEGIN PGP")_ ~/bin/ez-pine-gpg-incoming
 
 # This defines a program that message text is piped into before MIME
 # encoding, prior to sending
-sending-filters=
+sending-filters=~/bin/ez-pine-gpg-sign-and-encrypt _INCLUDEALLHDRS_ _RECIPIENTS_,
+	~/bin/ez-pine-gpg-encrypt _RECIPIENTS_,
+	~/bin/ez-pine-gpg-sign _INCLUDEALLHDRS_,
+	~/bin/ez-pine-gpg-symmetric 
 
 # A list of alternate addresses the user is known by
-alt-addresses=
+alt-addresses=bnewbold@alum.mit.edu,
+	bnewbold@mit.edu,
+	bnewbold@cfa.harvard.edu,
+	bnewbold@robocracy.org,
+	bnewbold@gmail.com,
+	bnewbold@leaflabs.com,
+	bnewbold@bnewbold.net
 
 # A list of keywords for use in categorizing messages
 keywords=
diff --git a/.ssh/config b/.ssh/config
index 378377b..a1ab622 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -49,7 +49,10 @@ Host mars
 Host bmode
     HostName bicep0.caltech.edu
     User bnewbold
-Host bicep51
+Host bicep52
     HostName bicep.fas.harvard.edu
     User bicep
     ForwardX11 yes
+Host odyssey
+    HostName odyssey.fas.harvard.edu
+    User bnewbold
diff --git a/.vimrc b/.vimrc
index 5d390f6..d7058a4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -12,10 +12,12 @@ set history=50
 set wildmode=list:longest,full
 set showmode
 set showcmd
-set shiftwidth=4
-set tabstop=4
-set shiftround
+autocmd FileType * set tabstop=2|set shiftwidth=2
+autocmd FileType python set tabstop=4|set shiftwidth=4
+"set shiftwidth=4
+"set tabstop=4
 set expandtab
+set shiftround
 set autoindent
 set hidden          " allows modified buffers to be hidden
 
@@ -78,3 +80,36 @@ cnoremap <C-E>  <End>
 cnoremap <C-K>  <C-E><C-U>
 cnoremap <C-F>  <Right>
 cnoremap <C-B>  <Left>
+
+" for encrypted files
+set backupskip+=*.gpg
+augroup encrypted
+    au!
+    " First make sure nothing is written to ~/.viminfo while editing
+    " an encrypted file.
+    autocmd BufReadPre,FileReadPre      *.gpg set viminfo=
+    " We don't want a swap file, as it writes unencrypted data to disk
+    autocmd BufReadPre,FileReadPre      *.gpg set noswapfile
+    " Switch to binary mode to read the encrypted file
+    autocmd BufReadPre,FileReadPre      *.gpg set bin
+    autocmd BufReadPre,FileReadPre      *.gpg let ch_save = &ch|set ch=2
+    autocmd BufReadPre,FileReadPre      *.gpg let shsave=&sh
+    autocmd BufReadPre,FileReadPre      *.gpg let &sh='sh'
+    autocmd BufReadPre,FileReadPre      *.gpg let ch_save = &ch|set ch=2
+    autocmd BufReadPost,FileReadPost    *.gpg '[,']!gpg --decrypt --default-recipient-self 2> /dev/null
+    autocmd BufReadPost,FileReadPost    *.gpg let &sh=shsave
+    " Switch to normal mode for editing
+    autocmd BufReadPost,FileReadPost    *.gpg set nobin
+    autocmd BufReadPost,FileReadPost    *.gpg let &ch = ch_save|unlet ch_save
+    autocmd BufReadPost,FileReadPost    *.gpg execute ":doautocmd BufReadPost " . expand("%:r")
+    " Convert all text to encrypted text before writing
+    autocmd BufWritePre,FileWritePre    *.gpg set bin
+    autocmd BufWritePre,FileWritePre    *.gpg let shsave=&sh
+    autocmd BufWritePre,FileWritePre    *.gpg let &sh='sh'
+    autocmd BufWritePre,FileWritePre    *.gpg '[,']!gpg -q -c 2>/dev/null
+    autocmd BufWritePre,FileWritePre    *.gpg let &sh=shsave
+    " Undo the encryption so we are back in the normal text, directly
+    " after the file has been written.
+    autocmd BufWritePost,FileWritePost  *.gpg silent u
+    autocmd BufWritePost,FileWritePost  *.gpg set nobin
+augroup END