From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Wed, 5 Oct 2016 09:20:16 +0000 (+0100)
Subject: Merge branch 'master' of github.com:maxf130/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=d4686f7d2de2f40700aa01e6591921ac28ac9d70;hp=3750a2a63e0bdf7235cfa75267731df8a8546adb;p=max%2Fdotfiles.git

Merge branch 'master' of github.com:maxf130/dotfiles
---

diff --git a/bash/.bash_profile b/bash/.bash_profile
index c80cb2d..106bfe2 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,11 +1,6 @@
-export NPM_PACKAGES="$HOME/.npm-packages"
 export EDITOR="/usr/bin/vim"
 export PAGER="/usr/bin/less"
-export PATH="/home/max/.local/bin:$NPM_PACKAGES/bin:$HOME/.gem/ruby/2.1.0/bin/:$HOME/.rvm/bin:${PATH}"
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-unset MANPATH
-MANPATH="$NPM_PACKAGES/share/man:$(manpath)"
-NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
+export PATH="/home/max/.local/bin:${PATH}"
 
 if [ -n "$BASH_VERSION" ]; then
   # include .bashrc if it exists
diff --git a/offline_mail/.mailcap b/offline_mail/.mailcap
index c9f551b..e4400e4 100644
--- a/offline_mail/.mailcap
+++ b/offline_mail/.mailcap
@@ -1 +1 @@
-text/html; w3m -I %{charset} -T text/html; copiousoutput
+text/html; lynx -stdin -dump -force_html ; copiousoutput
diff --git a/offline_mail/.mbsync/aber.mbsync b/offline_mail/.mbsync/aber.mbsync
index 58c4c97..00d2ace 100644
--- a/offline_mail/.mbsync/aber.mbsync
+++ b/offline_mail/.mbsync/aber.mbsync
@@ -2,7 +2,7 @@ IMAPAccount aber
 Host outlook.office365.com 
 User maf54@aber.ac.uk 
 PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/aber.gpg"
-UseIMAPS yes
+SSLType STARTTLS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 IMAPStore aber-remote
diff --git a/offline_mail/.mbsync/personal-gmail.mbsync b/offline_mail/.mbsync/personal-gmail.mbsync
index f809127..63cb281 100644
--- a/offline_mail/.mbsync/personal-gmail.mbsync
+++ b/offline_mail/.mbsync/personal-gmail.mbsync
@@ -2,7 +2,7 @@ IMAPAccount gmail
 Host imap.gmail.com
 User maxf130@gmail.com
 PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/personal-gmail.gpg"
-UseIMAPS yes
+SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 IMAPStore gmail-remote
diff --git a/offline_mail/.mbsync/personal.mbsync b/offline_mail/.mbsync/personal.mbsync
index 9174fae..3617cd6 100644
--- a/offline_mail/.mbsync/personal.mbsync
+++ b/offline_mail/.mbsync/personal.mbsync
@@ -2,7 +2,7 @@ IMAPAccount personal
 Host mail.friedersdorff.com
 User max
 PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/personal.gpg"
-UseIMAPS yes
+SSLType STARTTLS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 IMAPStore personal-remote
diff --git a/ratpoison/.ratpoisonrc b/ratpoison/.ratpoisonrc
index 9dcb2cb..d76477c 100644
--- a/ratpoison/.ratpoisonrc
+++ b/ratpoison/.ratpoisonrc
@@ -10,4 +10,4 @@ bind t time
 bind l ratclick 1
 bind v ratclick 2
 
-bind S exec ~/.local/bin/suspend
+bind $ exec ~/.local/bin/suspend