From db3bb300e0d1506183329421a65182644aa5402a Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Mon, 2 Nov 2015 09:24:21 -0700 Subject: [PATCH] a bunch of small updates --- msmtprc | 14 +++++++------- ruby-version | 2 +- symlinks.sh | 1 + tmux.conf | 6 ------ zshrc | 52 ++++++++-------------------------------------------- 5 files changed, 17 insertions(+), 58 deletions(-) diff --git a/msmtprc b/msmtprc index f434685..70a2666 100644 --- a/msmtprc +++ b/msmtprc @@ -2,13 +2,13 @@ defaults protocol smtp logfile "~/.msmtp.log" -account Gmail -host smtp.gmail.com -port 587 +account FastMail +host mail.messagingengine.com +port 465 protocol smtp -from dustinswan@gmail.com -user dustinswan@gmail.com -passwordeval "gpg --no-tty -q -d ~/.gmail-password.gpg" +from dustin@dustinswan.com +user dustinswan@fastmail.com +passwordeval "gpg --no-tty -q -d ~/.fastmail-password.gpg" auth on tls on tls_trust_file "/usr/local/etc/openssl/cert.pem" @@ -25,4 +25,4 @@ tls_trust_file "/usr/local/etc/openssl/cert.pem" user dswan@insors.com passwordeval "gpg --no-tty -q -d ~/.iocom-password.gpg" -account default : Gmail +account default : FastMail diff --git a/ruby-version b/ruby-version index 9304515..378bc55 100644 --- a/ruby-version +++ b/ruby-version @@ -1 +1 @@ -ruby-2.1.0 +ruby-2.1.3 diff --git a/symlinks.sh b/symlinks.sh index 57d6afe..95e7496 100644 --- a/symlinks.sh +++ b/symlinks.sh @@ -19,6 +19,7 @@ mkdir -p ~/.ssh; rm ~/.ssh/config; ln -s ~/dotfiles/ssh/config ~/.ssh/config # Mail stuff rm ~/.offlineimaprc; ln -s ~/dotfiles/offlineimaprc ~/.offlineimaprc rm ~/.msmtprc; ln -s ~/dotfiles/msmtprc ~/.msmtprc +rm ~/.muttrc; ln -s ~/dotfiles/muttrc ~/.muttrc # TODO mac only rm ~/.slate.js; ln -s ~/dotfiles/slate.js ~/.slate.js diff --git a/tmux.conf b/tmux.conf index 0cc711d..32fe52f 100644 --- a/tmux.conf +++ b/tmux.conf @@ -7,12 +7,6 @@ bind C-c new-window bind C-d detach bind C-a last-window -# Mouse! -set -g mode-mouse on -set -g mouse-resize-pane on -set -g mouse-select-pane on -set -g mouse-select-window on - set -g mode-keys vi # Terminal Titles diff --git a/zshrc b/zshrc index 538734a..d64db60 100644 --- a/zshrc +++ b/zshrc @@ -11,7 +11,7 @@ alias vi=nvim alias vim=nvim alias l="ls -la" alias ta="tmux attach -d" -alias dustinswan="mosh dustinswan@dustinswan.org" +alias dustinswan="mosh dustinswan@dustinswan.com" alias kill_offlineimap="ps aux | grep offlineimap | awk '{ print $2 }' | xargs kill -9" alias e='emacsclient -a "" -t' export EDITOR=nvim @@ -26,24 +26,9 @@ export P4USER=dswan export P4PORT="humu.insors.net:1666" export P4CONFIG=p4.cfg export P4EDITOR=vim -alias p4diffv="export P4DIFF=vimdiff; set -x P4DIFF vimdiff; p4 diff" -alias p4diffi="export P4DIFF=icdiff; set -x P4DIFF icdiff; p4 diff" -alias visidev="ssh root@visidev.iocom.com 'cd /; p4 sync'; scp /opt/iocom/user/webclient/all_desktop.js root@visidev.iocom.com:/opt/iocom/user/webclient/; scp /opt/iocom/user/webclient/css/all_desktop.css root@visidev.iocom.com:/opt/iocom/user/webclient/css/" alias er='rm -rf logs; unzip -o' # PATH - -# building webrtc -export PATH=$HOME/depot_tools:$PATH -export GYP_CROSSCOMPILE=1 -export GYP_GENERATORS=ninja -## arm64 -#export GYP_DEFINES="OS=ios target_arch=arm64 target_subarch=arm64 build_with_chromium=0 include_tests=0 enable_video=0 clang_xcode=1 clang=1" -#export GYP_GENERATOR_FLAGS="output_dir=out_ios64" -# armv7 -# export GYP_DEFINES="OS=ios target_arch=arm arm_version=7 build_with_chromium=0 include_tests=0 enable_video=0 clang_xcode=1 clang=1" -# export GYP_GENERATOR_FLAGS="output_dir=out_iosv7" - export PATH=/usr/texbin:$PATH # Basictex export PATH=/usr/local/bin:/usr/local/sbin:$PATH # Homebrew export PATH=/Applications/Postgres.app/Contents/MacOS/bin:$PATH @@ -54,24 +39,8 @@ export PATH=/usr/local/share/npm/bin:$PATH export NODE_PATH=/usr/local/lib/node:/usr/local/share/npm/lib/node_modules export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages -# Nix -. $HOME/.nix-profile/etc/profile.d/nix.sh -export NIX_PATH=nixpkgs=$HOME/nixpkgs - -# Chruby -source /usr/local/share/chruby/chruby.sh -source /usr/local/share/chruby/auto.sh -#chruby $(cat ~/.ruby-version) - -# NVM -export NVM_DIR=~/.nvm -source $(brew --prefix nvm)/nvm.sh - -# pyenv -export PYENV_ROOT="$HOME/.pyenv" -export PATH="$PYENV_ROOT/bin:$PATH" -eval "$(pyenv init -)" -eval "$(pyenv virtualenv-init -)" +# nix +if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then . $HOME/.nix-profile/etc/profile.d/nix.sh; fi # Keychain eval `keychain --eval id_rsa` @@ -91,16 +60,11 @@ export PATH="/usr/local/heroku/bin:$PATH" autoload -U select-word-style select-word-style bash -# OPAM configuration -. /Users/dustinswan/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true - -export PATH=$HOME/ghc-mod/dist/build/ghc-mod:$PATH # Take out when ghc-mod is fixed - # FZF [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -# The next line updates PATH for the Google Cloud SDK. -source '/Users/dustinswan/google-cloud-sdk/path.zsh.inc' - -# The next line enables shell command completion for gcloud. -source '/Users/dustinswan/google-cloud-sdk/completion.zsh.inc' +PATH="/Users/dustinswan/perl5/bin${PATH+:}${PATH}"; export PATH; +PERL5LIB="/Users/dustinswan/perl5/lib/perl5${PERL5LIB+:}${PERL5LIB}"; export PERL5LIB; +PERL_LOCAL_LIB_ROOT="/Users/dustinswan/perl5${PERL_LOCAL_LIB_ROOT+:}${PERL_LOCAL_LIB_ROOT}"; export PERL_LOCAL_LIB_ROOT; +PERL_MB_OPT="--install_base \"/Users/dustinswan/perl5\""; export PERL_MB_OPT; +PERL_MM_OPT="INSTALL_BASE=/Users/dustinswan/perl5"; export PERL_MM_OPT;