diff --git a/bin/start_website_photos b/bin/start_website_photos new file mode 100755 index 0000000..be60918 --- /dev/null +++ b/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 + diff --git a/bootstrap-mac.sh b/bootstrap-mac.sh index e05faa4..51ac604 100644 --- a/bootstrap-mac.sh +++ b/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 diff --git a/mbsyncrc b/mbsyncrc index 75af4ba..be5bcfb 100644 --- a/mbsyncrc +++ b/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 diff --git a/msmtprc b/msmtprc index 40353ca..e9655fe 100644 --- a/msmtprc +++ b/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 diff --git a/mutt/muttrc b/mutt/muttrc index 25d0230..bf57adb 100644 --- a/mutt/muttrc +++ b/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 sidebar-next -bind index sidebar-prev -bind index sidebar-open +#set sidebar_delim = ' │' +#set sidebar_visible = yes +#set sidebar_width = 50 +## color sidebar_new color221 color233 +#bind index sidebar-next +#bind index sidebar-prev +#bind index sidebar-open # Status Bar #set status_chars = " *&A" diff --git a/packages b/packages index 0e3d8f3..ab76463 100644 --- a/packages +++ b/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" }, -], +]; diff --git a/symlinks.sh b/symlinks.sh index df493db..c6e8946 100644 --- a/symlinks.sh +++ b/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 diff --git a/tmux.conf b/tmux.conf index 1e7fcc2..9e0cd9b 100644 --- a/tmux.conf +++ b/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 diff --git a/vimperatorrc b/vimperatorrc new file mode 100644 index 0000000..797afac --- /dev/null +++ b/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' diff --git a/vimrc b/vimrc index 613cac7..8252d42 100644 --- a/vimrc +++ b/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'