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

diff --git a/bash/.bash_profile b/bash/.bash_profile
index c80cb2dd74ef94227357e06a45e21e74337efec5..106bfe29d732ce376ed82e82591887aafe46becc 100644 (file)
--- 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 c9f551b32301e762cfe73582f1ae7fde080d5be8..e4400e457ac1fc6bc4c75c283ca24e660b2dc5e1 100644 (file)
--- 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 58c4c97ba9ed980e7ddc1b3eb6c9aaa0e85d6e30..00d2ace5ca7357a1ff28c8749191c4867a443c1c 100644 (file)
--- 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 f80912770cba32cd54faa8469ca757994964eb7b..63cb2814f12ed7beb0b84d3ea00c9b4a84c8b89c 100644 (file)
--- 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 9174faeb5cb08861cc641f504bb69dcabe1f81cd..3617cd60f3213c1641c6cfdc23c2d776b7bca574 100644 (file)
--- 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 9dcb2cb2a174724a45036a52a2d4f5ed90d6d8b9..d76477c7851f0ae4c03919c982f280b306bddc72 100644 (file)
--- 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