# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1414837619 14400
# Node ID f44901f85f39e947c22c62f7a194675a60a39140
# Parent  a006fee06b803b63cd5d05a8db0bf210791c3592# Parent  406f9396825e072b52565f6b7a270f96b7cac5e6
Merge from default

diff --git a/.pentadactylrc b/.pentadactylrc
new file mode 100644
--- /dev/null
+++ b/.pentadactylrc
@@ -0,0 +1,21 @@
+"hg7127
+
+loadplugins '\.(js|penta)$'
+group user
+
+" colorscheme solarized-light
+
+" Firefox's tabs
+hi TabNumber	color: #fff; margin: 0; padding-right: .3ex; text-shadow: #000 -1px 0 0, #000 0 1px 0, #000 1px 0 0, #000 0 -1px 0;
+
+set guioptions=bCrsn
+
+
+" navigation on tmbo
+set passkeys+=thismight.be:<Left>,<Right>
+
+" catch all post controls on tumblr
+set hinttags+=div.post_control
+
+
+" vim: set ft=vim
diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -164,6 +164,11 @@ if has('gui_running') || $LANG =~ 'UTF-8
   set fillchars=fold:∷,vert:│
 endif
 
+if exists('&breakindent')
+  set bri
+  set briopt+=sbr
+endif
+
 set virtualedit=block
 
 set autoindent
diff --git a/.xsessionrc b/.xsessionrc
--- a/.xsessionrc
+++ b/.xsessionrc
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ -d ~/bin ]; then
   export PATH="$HOME/bin:$PATH"
@@ -15,19 +15,20 @@ if [ -d ~/.rbenv ]; then
 fi
 
 
-if [ -x /usr/bin/xcompmgr ]; then
-  /usr/bin/xcompmgr -n &>/dev/null </dev/null &
+if [ "$(uname -s)" = "OpenBSD" ]; then
+  PATH="/usr/X11R6/bin:$PATH"
 fi
 
-/usr/bin/xmodmap ~/.xmodmaprc
+
+xcompmgr -n &>/dev/null </dev/null &
+
+xmodmap ~/.xmodmaprc
 
 if [ -r ~/.Xdefaults.local ]; then
-  /usr/bin/xrdb -quiet -merge -DUSE_LOCAL ~/.Xdefaults
+  xrdb -quiet -merge -DUSE_LOCAL ~/.Xdefaults
 fi
 
-if [ -x /usr/bin/urxvtd ]; then
-  /usr/bin/urxvtd -q -o -f
-fi
+urxvtd -q -o -f
 
 if [ -r ~/.xsessionrc.local ]; then
   . ~/.xsessionrc.local