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

.bash_aliases

@@ -46,3 +46,14 @@ function fuck() {
     echo ; echo " (╯°□°）╯︵$(echo "$2"|toilet -f term -F rotate)"; echo
   fi
 }
+
+#20140614 wrapper around bpython to load the virtualenv's python path
+bpython() {
+  if test -n "$VIRTUAL_ENV"
+  then
+    PYTHONPATH="$(python -c 'import sys; print ":".join(sys.path)')" \
+    command bpython "$@"
+  else
+    command bpython "$@"
+  fi
+}

.bashrc

@@ -127,4 +127,8 @@ if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
     . /etc/bash_completion
 fi
 
+if [ -x ~/.privdotfiles/bin ]; then
+    PATH=$PATH:~/.privdotfiles/bin
+fi
+
 PATH=$PATH:/usr/local/bin/android-sdk-linux/platform-tools

.tmux.conf

@@ -70,5 +70,8 @@ bind C-a last-window
 # Bigger history
 set -g history-limit 10000
 
+# Fix for shift-keys with Fn; needs correct terminfo too
+setw -g xterm-keys on
+
 # Local config
 if-shell "[ -f ~/.tmux.conf.user ]" 'source ~/.tmux.conf.user'

.vimrc

@@ -17,6 +17,15 @@ Plugin 'mhinz/vim-signify'
 Plugin 'tpope/vim-sensible'
 " Nice colour scheme
 Plugin 'jnurmine/Zenburn.git'
+" Python autocompletion
+Plugin 'davidhalter/jedi-vim'
+" Handy Markdown stuff
+Plugin 'tpope/vim-markdown'
+" Pandoc, for stuff like autocompletion of citations from bibtex, other LaTeX
+" stuff
+Plugin 'vim-pandoc/vim-pandoc'
+" Distraction-free writing, start with <Leader>V (\V)
+Plugin 'mikewest/vimroom'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required

README.md

@@ -6,3 +6,7 @@ After having my homedirs in subversion for years, move to Git.
 ```
 sh install.sh
 ```
+
+# Fix for shift+F6 in tmux (and screen probably)
+
+In tmux, do `infocmp > screen-256color`. Add the line `kf16=\E[17;2~,` and compile the file with tic. This will result in `~/.terminfo/s/screen-256color` with the correct keycode for shift+F6. `.tmux.conf` needs the line `setw -g xterm-keys on` for it to register correctly.