Zsh: Ensure RPROMPT is unset when setting prompt

Xmodmap: Fix Alt mapping for external keyboards

Emacs: Enable ledger weaving with org-babel

Emacs: Improve ledger reconciliation

Emacs: Install and configure ledger-mode

Add xmodmaprc for Marvin the ThinkPad

Merge branch 'master' of git://github.com/alanpearce/dotfiles

Emacs: Add nix-mode configuration

zsh: Fix E alias

Emacs: Open files via sudo if needed

Emacs: Disable auto-indent in nix-mode

Zsh: Remove fasd autoload

Emacs: Remove unneeded diminish line

Emacs: Fix eshell init

Emacs: Autoload global-smart-tab-mode

Emacs: Check before loading oracle-mode

Zsh: Fix arrows in Xfce Terminal

Emacs: Reinstall ido and related packages

Emacs: Move underline, improve mode-line rendering

Emacs: Switch from leuven back to solarized-light

Emacs: Remove unused hemisu theme

ZSH: Set LESSGLOBAL to view global tags in less

Emacs: Disable auto-indent in yaml/salt modes

Revert "Emacs: Install flycheck-pos-tip"

This reverts commit 35bc57878c8dff67bdd17ddf207a2ba3d5076d3a.

Emacs: Install flycheck-pos-tip

Emacs: Setup dired-k

Emacs: Configure twig tag pairs

Emacs: Add and bind isearch-yank-symbol

Emacs: Add typo mode for nice “quotes”

Emacs: Use symfony style in PHP

Git: Remove template

Git: Don't ignore .envrc

Emacs: Offer to create missing directories

OSX: Update Syncthing launch agent

zsh: Add composer bin dir to path

fixup! Emacs: Try boon mode

Emacs: Try boon mode

Emacs: Open composer.lock files in js-mode

Clojure: Update user plugins

Clojure: Add lein-ancient to user plugins

Emacs: Revert to paredit for lisp modes.

Smartparens is nice, but isn't as nice as paredit in lispy languages,
even in strict mode.

Emacs: Bind smartparens hybrid commands

Emacs: Add wgrep-ag package for editing ag results

Add clojure tag to relevant boxen

Add Leiningen profiles to new Clojure tag

Emacs: Add highlight-stages mode

Emacs: Disable web-mode auto-pairing

Emacs: Fix smartparens load issues

Emacs: Use smartparens to replace 4 other modes

Paredit, autopair, cedit and smart-forward. Should work nicely in HTML
modes, too!

File ending cleanup

Emacs: Install clj-refactor-mode

Emacs: Use Clojure dash documentation

Emacs: Remove cider-mode-map C-c C-f binding

zsh: Source gibo completion file if present

Emacs: Set up clojure-mode and cider

Emacs: Install feature-mode

Emacs: Fix startup error from eshell keybind

Really weird that I needed to bind the key inside a hook, anything else
seemed to get evaluated before eshell was loaded

Emacs: Fix startup error from comint keybind

Git: Add template dir from git_template project

Emacs: Install jquery-doc

Emacs: Install and configure helm-swoop

Emacs: Fix frame-title-format error when loading

Add syncthing plist

Emacs: Defer org submodule initialisation

Emacs: Update MobileOrg sync location

XMonad: Add dmenu_path shortcut

Emacs: Fix dash hook creation

Emacs: Remove salt files from yaml-mode

Emacs: Enable fontification of dash keywords

Emacs: Add nginx helm-dash documentation hook

Git: Fix `standup` alias

XMonad: Make keybindings more Emacs-like

XMonad: Reformat and refactor

Follow comma-first style. Extract manage hook

XMonad: Auto-move common windows to workspaces

Emacs: Eager-load helm-dash configuration

Emacs: Enable auto-fill-mode in markdown-mode

Emacs: Rebind C-M-[ae] to be useful in text modes

Emacs: Associate Markdown mode and dash docset

rcm: Remove fasd-cache from zsh init hook

zsh: Use version-controlled zsh file

Makes configuration a lot easier.

zsh: Move sf=app/console alias definition

Emacs: Add shell script submode to markdown

Emacs: Open .jinja files in jinja2-mode

rcm: Fix logic error in zsh post-up hook

Emacs: Create mode for Salt to use with helm-dash

Emacs: Load Cask file in emacs-lisp-mode

Emacs: Remove unused mustache-mode

Emacs: Configure helm-dash-docsets for PHP & Twig

Emacs: Use ansible dash docset for ansible-mode

Emacs: Create basic ansible major mode

Emacs: Add function for per-mode helm-dash-docsets

Use a function generator to avoid repetition

Emacs: Fix init error with paredit+cedit

paredit-space-for-delimiter-predicates isn't declared until paredit is
loaded properly, so add to it after it's been loaded

Emacs: Remove paredit spaces when cedit enabled

Emacs: Require presence of hemisu-theme

Emacs: Fix trailing parens

Emacs: Add leuven face for perspective

ZSH: Source osx-specific configuration

Zsh: Add netmount function for OSX

Git: Alias up to merge in FETCH_HEAD

This means I can leave the fetching to the pure prompt background task
and merge in the result after I see an indicator

Emacs: Recreate header-line setup

Emacs: add dependency on rainbow-mode

Emacs: Switch to Leuven theme

Emacs: Move vc and misc info back to mode line

Emacs: Bind C-x v C to vc-resolve-conflicts

zsh: Remove fasd 'sf' alias

Revert "Xprofile: De-duplicate envoy setup"

This reverts commit 593b2f866a5557a1978e3352d311829e57952b25.

Emacs: Fix error when opening magit

Gitk: Increase height of log window

Gitk: Configure better fonts

Gitk: Set tabstops

Git: Add gitk config

Add globalrc

zsh: Create sf alias to `app/console`

Emacs: Disable autopair in c-mode-common-hook

Superfluous with cedit

Emacs: Rename lisp-common-mode-hook

Make it the same style as c-mode-common-hook

Emacs: Move cedit's c-mode hook to cedit init

Emacs: Enable paredit-mode with cedit-mode

Emacs: Rebind beg/end-of-statement to M-a/e

Allows C-M-f and C-M-b to be used for smaller movements.

Emacs: Move cedit mode into cedit :init block

Emacs: Enable cedit in c-style modes

Emacs: Define minor mode for cedit

Emacs: Configure cedit

Xresources: Set Emacs font to Terminus

Emacs: Remove commented-out code

Emacs: Pick a displayable branch char for magit

Xprofile: De-duplicate envoy setup

Xmonad: Force mpv to fullscreen

Xmonad: Improve fullscreen support

Emacs: Enable rainbow-mode for xmonad-type files

Create a derived mode to enable specific mode hooks for such files
Add hook to new mode for enabling rainbow-mode

Xmonad: fix compiler warnings

Emacs: Install git-timemachine

Add initial xprofile

Emacs: Add binding for ace-jump-line-mode

Emacs: Bind s-s to switching between perspectives

Xmonad: Remove borders from fullscreen windows

Xmonad: fix fullscreen

Xmobar: use solarized-light colours

Xmobar: use terminus font

zsh: Check SSH_AUTH_SOCK more precisely

Xmobar: Reduce width to 90%

Xmonad: Increase length of xmobar window titles

Xmobar: Reorder items

Xmobar: fix freezing in Xmonad

zsh: Don't run envoy when SSH_AUTH_SOCK is defined

Emacs: Fix package archive functions' for 24.3

Add xmonad and xmobar tags to host "prefect"

Xmonad: Add initial configuration

Delete sakura

Emacs: Replace dash-at-point with helm-dash

No longer depends on Dash.app.

Emacs: Use GnuTLS defaults for prime bits

Emacs: Shut up about omitting files

Emacs: Run dired-omit-mode in the correct place

Needs to run in dired-mode-hook. Create a wrapper command so that we can
call it interactively otherwise.

Emacs: Unshadow discover-my-major key in dired

Move diredp-describe-file to '.'.

Emacs: Require help-fns+ for diredp-describe-file

Emacs: Add command switch-to-dotfiles (s-,)

Runs via projectile-persp, which means it should switch nicely when the
perspective has been opened.

Emacs: fix warning about use-package-verbose

Zsh: add envoy support

Emacs: Fix error in package-list-installed

Not really sure what happened here. The elements are a cons of a symbol
and an array, so cadr makes no sense.

Emacs: Make package-archive-stats more resilient

Filters out packages missing from package-archive-contents

Emacs: define package-desc-archive, if it isn't

Emacs: Re-add marmalade. For one package.

Emacs: Run lisp-common-mode-hook in ielm

Emacs: Simplify php-sql to work with heredocs only

Emacs: disable auto-starring packages on github

Emacs: Diminish magit to a branch ideograph

Emacs: refactor rename-modeline

Emacs: fix typo in docstring

Emacs: diminish company mode

Emacs: diminish highlight-changes mode

Emacs: refactor toggle-window-dedicated

Emacs: Move some mode-line information to the header

Emacs: Show project, not buffer in frame title

Emacs: Add project name to frame title

Emacs: Add markdown+lisp MMM configuration

Emacs: Simplify PHP-SQL MMM configuration

Emacs: Use MMM for toml in markdown front matter

Emacs: Remove linum configuration

Xmobar: Hide seconds from date

Xmobar: reduce update frequency of CPU and RAM monitors

Xmobar: remove MPD

Xmobar: increase 'high' weather temperature

Xmobar: whitespace cleanup

Emacs: disable popwin until 24.4 is released

Emacs: Fix incorrect syntax

Emacs: Remove unused package archives

Those last query functions were useful.

Emacs: Create package archive query functions

Count packages installed from each archive
Show installed packages from an archive

Emacs: Auto-install req-package if neeeded

init.el is now self-bootstrapping, which is useful on OSX when the Emacs
application doesn't supply an `emacs` binary for `cask`

Emacs: Remove cdnjs dependency

Emacs: remove ntcmd

Emacs: Enable helm-adaptive-mode

Lets see what this does.

Emacs: re-enable smart-mode-line

Emacs: Load helm-projectile

Fix: Emacs: Enable menu-bar on OSX

Emacs: Enable menu-bar on OSX

Emacs: Set package name for helm

Emacs: Add mmm-mode for SQL inside PHP

…assuming I got the regex right.

Emacs: Use system trash on OSX

Emacs: Extend kill-this-buffer-dwim to delete file

Deletes current-buffer's file if called with universal prefix argument.

Emacs: Simplify delete-current-buffer-file

Emacs: Use ido 'ghost' buffers feature in helm

Emacs: Load helm on startup

Emacs: workaround ws-butler daemon issue

lewang/ws-butler#4

zsh: Only set gh completion when _gh is defined

Emacs: fully diminish helm-mode

Emacs: workaround popwin/smart-mode-line errors

Disable smart-mode-line for now

Emacs: diminish helm-mode

Emacs: fix dired-subtree load order

Emacs: diminish emmet-mode

zsh: Re-assert default key-binding for history

Filed jimhester/per-directory-history#6 to see if this can be changed

zsh: Store per-directory history in .cache

rcm: Add hook to ensure submodules are correct

zsh: Add and configure per-directory-history

Emacs: install and configure go-oracle

Emacs: install and configure dired-subtree

Emacs: Switch projectile completion system to helm

Emacs: add and configure fasd-mode

Emacs: add discover-my-major mode

Emacs: Fix q ggtags-navigation-mode-abort binding

Emacs: Make open-subfolder-project require match

Emacs: Add configuration for ggtags-mode

Fix zsh dotfile installation

Emacs: add kill-this-buffer-dwim for server edits

Emacs: rebind C-x i to helm-semantic-or-imenu

Emacs: fix helm keymap errors

Emacs: Switch tab and C-z in helm-find-files

Emacs: Switch from to helm

Almost everything!

Emacs: make helm instant

Emacs: Fix incorrect lisp auto-indentation

Emacs: re-enable popwin

Whitespace fixup

Emacs: configure timeclock-mode

Emacs: reduce flx-ido max entries to 1000

zsh: Remove noglob salt alias

zsh: Update pure prompt

Emacs: fix typo in popwin configuration

Emacs: Stop company-dabbrev from lowercasing

Emacs: Configure popwin to tame helm windows

Emacs: disable lock file creation

zsh: Use clearer process substitution syntax

zsh: Fix emacsclient 'frameNeeded' logic

Emacs: check if server is already running

Emacs: Fix skewer autoloading issue

Emacs: Increase vertical window split threshold

Emacs: Make auto-indent-mode start at init

Emacs: Add litable

Emacs: Only complete when explicitly requested

Emacs: more deferred loading

Emacs: Start server unless running as daemon

Add gemrc file for user-installs to common bin folder

Emacs: Fix company completion double-paren issue

Emacs: show completions from multiple backends

Now gtags candidates can be shown alongside native php candidates, for
example.

Emacs: fix relative paths with subfolder-projects

rcm: Fix zsh compilation error when missing fasd

zsh: Generalise '1' alias to 1‒5 and -1‒-5 (tail)

Emacs: use unicode ido-vertical-decorations

Revert "Emacs: use dired-x-find-file over ido-find-file"

This reverts commit a8f44b320cdbfb7921f78c03833fcba41df0be49.

Emacs: Add commands to open a work or home project

Given that the projects are folders under (work|home)-project-directory
which match projectile's own predicates, switch to them with projectile,
even if they're not 'known' to it.

Emacs: add and configure scss-mode

zsh: dired: take an optional dir argument

Emacs: remove puppet-mode

zsh: Generalise ec function to work outside daemon

Emacs: set OSX font to Monaco

Emacs: set default font in current and new frames

zsh: Alias 1 to head -n1

Emacs: Disable 'reverting buffer…' message

zsh: Add .cabal/bin to $PATH

zsh: Don't add .gem/ruby/*/bin to $PATH

In most cases, setting up .gemrc is better

Emacs: use ws-butler instead of crude hook

Now I'm not changing all the whitespace all the time!

Emacs: fix error when byte-compiling

Emacs: re-use directories in dired

Emacs: use dired-x-find-file over ido-find-file

Gains find-file-at-point functionality. With ido-everywhere, still uses ido.

Emacs: ido-completing read all the things!

Emacs: defer loading of more modes

Emacs: remove ERC configuration

Emacs: defer package loading for faster init

Emacs: Defer loading of go-mode

Emacs: install perspective and persp-projectile

Emacs: enable autopair in yaml and text modes

Emacs: enable tabs in nginx configuration

Merge branch 'master' of home:dotfiles

Emacs: add gist package

Emacs: Rebind s-, to edit init.el via imenu

Emacs: Set smart-tabs-mode from indent-tabs-mode

Emacs: enable web-mode in hugo theme layouts

Emacs: Disable smart-tabs in php-mode

I do not like PSR-1. Ah well.

Emacs: Disable autopair in web-mode

zsh: Complete gh commands with _gh, not _hub

Emacs: Add command to insert date and time

Emacs: Set sentences to end with two spaces

Emacs: install toml-mode

Emacs: open twig files in web-mode

Emacs: setup org-mobile, syncing via Dropbox

Emacs: switch PHP to Symfony style :(

Emacs: ring the bell a bit less often

Emacs: don't force ssh usernames

zsh: Alias composer to composer.phar if missing

Emacs: Make GNU ls detection path-specific

Emacs: ensure blink-cursor-mode is off

Emacs: show package load times

zsh: use gh instead of hub

Add rcrc.local for Studio-40 laptop

Zsh: hide error when fasd init file missing

Now show a warning instead

Emacs: Make fonts smaller on OSX. HiDPI displays!

Emacs: Bind s-k to kill-this-buffer

Emacs: add keybind for quickrun

Emacs: Use fonts from the system on OSX

Emacs: fix tramp proxy for local machine

Incorrect quoting form

Emacs: Only use GNU ls on OSX when found

Emacs: switch back to loading sml with req-package

Emacs: add go-projectile for go-based projects

Emacs: diminish eldoc-mode

Emacs: Add toggle-window-dedicated command

Tells Emacs not to replace the buffer in a window.

Emacs: add popwin-mode for better window handling

Emacs: Sort Cask

zsh: Remove existance check for ~/bin

zsh: set GOPATH and add bin folder to PATH

Emacs: reduce eldoc delay to 0.1s

Emacs: Parens trigger eldoc in autopair-mode

Emacs: Add and configure Go packages

Emacs: merge programming sections

Emacs: remove old shuffle-lines library

Emacs: switch from shuffle-lines to move-text

Workaround smart-mode-line init issue

Emacs: set org-replace-disputed-keys at the right time

rcm: Add vagrant tag to prefect

zsh: Hide output of magit and dired commands

Fix xresources include

xrdb should be now run as `xrdb -I$HOME/.xresources -merge
~/.Xresources`

Emacs: update path to zshrc

Add vagrant configuration with ansible provisioning

Emacs: fix incorrect smart-mode-line colors

Load solarized-theme first so that 'respectful uses the correct theme colours.

Emacs: Remove custom font-face configurations

I actually think they were for the other version of solarized.

Emacs: use correct flycheck mode for diminishing

Emacs: Refactor and simplify font settings

Emacs: add missing dependencies to cask

rcm: Only byte-compile files in elisp directory

rcm: Install Cask for Emacs if it isn't already

rcm: Update DOTFILES_DIRS to please lsrc

Emacs: star github packages automatically

Emacs: Disable detection of html in php-mode

Emacs: prettify emacs-lisp modeline indicator

Emacs: Fix flycheck error in cask initialisation

Emacs: add melpa-stable source to Cask

Emacs: install and configure paradox-mode

Emacs: shorten emacs-lisp-mode in modeline to El

Emacs: add helper macro for renaming major modes

Emacs: use unicode tick for flycheck-mode

Emacs: diminish magit-auto-revert-mode

Emacs: diminish fancy-narrow-mode

Emacs: install and configure smart-mode-line

Diminish projectile-mode as sml reads from it anyway

Emacs: Remove quack dependency from geiser

Emacs: add fallback for init-file when ignored

Emacs: don't mark spaces after tabs

Emacs: Whitespace cleanup

Emacs: use req-package on top of use-package

Emacs: configure winner-mode after initialising

Emacs: remove "env/" function set

Emacs: remove unused mu4e configuration

Add initial rcrc.local for Prefect

Emacs: Remove unused highlight-symbol config

Add rcrc.local for Bulb laptop

Emacs: install markdown-mode

Emacs: Disable autopair in yaml-mode

It seems that the annoying indent-on-return behaviour can't easily be
disabled.

Emacs: Remove non-existing info directory

I think it was from when I used el-get

Emacs: delete-current-buffer-file: remove vc check

Emacs: Remove non-cask package initialisation

Emacs: Disable auto-indent-mode in jinja2-mode

Emacs: use dired-x inside dired

Emacs: remove unused lacarte configuration

Emacs: Use yaml-mode for sls files

Git: add local configuration include

Git: fix global ignore path

Use correct path for zsh compdump in post-up hook

Emacs: install and configure flycheck

Emacs: sort cask sources

rcm: Run `cask install` for emacs, if installed

Emacs: remove project-persist mode

I didn't use it, and projectile can switch projects on its own now.

Emacs: add projectile switch-project config

Emacs: init projectile-mode on startup

Emacs: use discover-mode for keybind popups

Emacs: ensure that pallet is loaded on init

Emacs: Install visual-regexp.

Move C-c r from org-mode, since I don't really use it.

Emacs: Cleanup cask file

Create emacs pre-hook to remove old elisp symlink

zsh: Create compdump file before compiling it

Update and migrate zsh history file location

zsh: Simplify fasd compilation

zsh: Compile fasd and use as a function.

Sakura: initial configuration

Update and migrate fasd data file location

zsh: Update fasd init file location

zsh: Remove fasd autoload

zsh: Change cache directory for zcompdump

Fix syntax error in zsh post-up hook

rcm: Exclude readme

Add readme

Add modelines for zsh files

zsh: Remove host configuration for prefect

zsh: Remove unused parts of server host config

rcrc: test and source rcrc.local

Add rcrc file for excludes

Rename launchagents folder

zsh: Use $ZDOTDIR instead of hardcoded path

zsh: Use (and set) XDG_CONFIG_HOME for $ZDOTDIR

zsh: Create dotfile links under $ZDOTDIR

For some reason, zsh expects files under $ZDOTDIR to be dotfiles, unlike
many other programs.

zsh: Use system version of fasd

zsh: use .cache/zsh instead of .zsh/cache

Move install functionality to rcm hooks

Restructure everything to use rcm

https://github.com/thoughtbot/rcm

Rename gitignore for better linking

Xresources: add emacs font config on Prefect

zsh: Remove old hosts from completion array

zsh: Add missing 'then'

Use correct switch for testing commands

zsh: Fix typo in previous commit

zsh: Only run direnv when installed

Install: simplify launchagent installation

Install: clone repository before linking

Install: clone to target directory

Installer: switch URL to github

Installer: fix emacs detection

Emacs: add fancy-narrow function

Emacs: remove Windows line endings

Emacs: add narrow-to-function-indirect function

Emacs: remove PHP manual URL assignment

Emacs: use custom style for PHP indentation

zsh: Remove reference to home folder

Improve keybindings for magic buffer switching

Emacs: create DWIM function for switching buffers

Uses projectile inside a project and ido outside. Bound to C-c b

Zsh: remove hardcoded references to user alan

Emacs: Replace buggy eldoc-php with php-extras

Merge branch 'master' of git://github.com/alanpearce/dotfiles

Conflicts:
	install

Emacs: fix cask loading to follow official usage

Installer: create directories if not present

zsh: Fix path to FreeBSD configuration

Emacs: check and use cask, if installed

Installer: Create ~/projects/dotfiles if missing

Merge branch 'master' of server.home:dotfiles

Update pure prompt

Emacs: remove with-elapsed-timer call

Emacs: Simplify geiser-racket interaction

Change git push default tracking for backwards compatibility

Emacs: Enable and configure dired-omit-mode

zsh: Share history between terminal windows

Emacs: use coreutils' gls on OSX

Emacs: use server-side comments inside HTML

Emacs: Remove initial indentation of code inside script+style tags

zsh: Fix completion for git/hub

Emacs: disable automatic-pairing in web-mode

zsh: Ensure FreeBSD sources its own zsh configuration

Add Emacs daemon LaunchAgent file

Add OSX LaunchAgent installation

Emacs: remove defer keyword from all packages

Emacs: Fix mode specification for .zsh files

zsh: Don't fetch audit list when running update-check

zsh: Fix FreeBSD pkg UPDATING check

Emacs: Ensure .zsh files are opened as shell scripts

zsh: Add site-functions under /usr/local to fpath, if exists

Emacs: enable autopair-mode in yaml-mode

Emacs: enable yaml-mode for ansible (group|host)_vars files

zsh: Rename dangling reference to zshrc in installer

zsh: Separate startup files for different startup methods

zsh: Remove reference to gentoo configuration from installer

zsh: Remove unused file

zsh: Remove file for old work laptop

zsh: Remove file for gentoo

Emacs: Improve mouse/trackpad scrolling by only scrolling one line at a time

Emacs: Add a margin to ensure the next/previous line is always visible

zsh: Refactor magit and dired into functions

zsh: Remove title-changing precmd function

zsh: Remove check for cache directory; it's created by the installer

zsh: Recompile compdump file in dotfiles installer

zsh: rename auxillary files with extension

zsh: Add zsh-completions to fpath

Emacs: run diff-hl-update when magit refreshes a buffer

Emacs: use current frame when handling OSX open-file event

Emacs: load cc-mode on startup

Emacs: load tramp on startup

Emacs: eagerly load dired and dired+

zsh: Fix pure pull indicator showing when ahead of upstream

zsh: increase contrast of pure prompt character

Update pure prompt

zsh: Add alias for prettyping.sh

Emacs: Disable smart-tabs-mode in ruby-mode

zsh: Disable globbing for the salt command

Emacs: bind s-, to open emacs init file from register

Emacs: workaround issue setting variable-pitch fonts on OSX

zsh: Add alias to open the current directory in Emacs' dired

Emacs: add register for zshrc

zsh: Remove duplicate fasd e alias

Emacs: remove call to moz-minor-mode

Emacs: fix reference to missing font on OSX

Emacs: set a variable pitch font under darwin

Emacs: silence compiler warning about unused variable

Emacs: remove unnecessary lambda function

Emacs: remove commented-out code

Emacs: remove old-style indentation function

Emacs: ensure that org-journal is installed

Emacs: fix warning in project-persist configuration

Emacs: remove moz-repl mode

Add alias to launch magit in GUI emacs

Add ec and et commands to launch emacsclient in a terminal and GUI respectively

Emacs: improve font-setting on OSX when running as a daemon

Emacs: remove customisation of byte-compile-dest-file for init.el

Instead, rely on installer creating a symlink to ~/projects/dotfiles/init.elc

Git: fix path to global gitignore file

Emacs: switch to the Wordpress coding style in php-mode-hook

Remove unneeded canonicalisation from installer

Move dotfiles under ~/projects

Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	emacs/init.el

Use git instead of mercurial for cloning dotfiles on new installations

Installer: ensure that the fasdrc is symlinked correctly

zsh: Enable current path lookup in fasd only when using the e alias

zsh: remove e alias; duplicate of fasd

Revert "Replace auto-compile-mode with auto-async-byte-compile"

This reverts commit a7d64a6e05aa450dda63f9b8b68e637471b223c5.

Emacs: don't insure that SLIME is installed

Emacs: Load multiple-cursors eagerly

Emacs: install and enable diff-hl-mode

Emacs: fix ido initialisation

Emacs: switch from helm-ibuffer to ibuffer

Emacs: set ido-mode to add recent files to the buffer list

Emacs: setup recentf-mode

Emacs: Set smex variables before calling smex-initialize

MinTTY: Switch fonts

Merge remote-tracking branch 'refs/remotes/origin/master'

Emacs: add emmet-mode to web-mode-hook

Setup emmet-mode

Emacs: Setup file associations for ruby mode

Add GNU Global tags files to global gitignore

zsh: Fix error when no gem-based programs are installed

zsh: Fix prompt issues with TRAMP

Change Emacs font rendering on X11

Add font configuration for OSX

Set the editor to emacsclient by default

zsh: Remove unused aticonfig alias

zsh: Refactor and improve cross-platform handling of ls options

zsh: Refactor OS checking to use just one variable

zsh: Remove gnu-only dircolors assignment

zsh: Use gls instead of ls if available

zsh: Refactor OS check and include OSX

zsh: Remove unused namecoin alias

zsh: Remove extra newline from pure prompt

Merge remote-tracking branch 'refs/remotes/origin/master'

zsh: Add more contrast between success and failure prompt colours

zsh: Make git branch name visible in pure prompt

zsh: Optimise pure prompt git checking

Urxvt: use bright colours without bold fonts

zsh: Add solarized dircolors (ansi-universal)

zsh: Install and use the pure prompt

Merge branch 'master' of server.home:dotfiles

Xbindkeys: run dmenu with cache settings

Emacs: unbind s-m

Emacs: add s-G magit keybinding like s-D

Emacs: Unbind more unhelpful Mac keybindings

Merge remote-tracking branch 'refs/remotes/origin/master'

Emacs: Switch control and command on OSX

Emacs: add extra keybinding for projectile-find-file

Emacs: unbind unhelpful s-n key

Emacs: Fix control key issue on OSX

Emacs: make right modifier keys on Mac inherit the configuration of their left counterparts

Emacs: setup puppet-mode

Installer: check for host-specific zshrc before trying to compile

Ignore .DS_Store system files

Merge branch 'master' of home:dotfiles

Emacs: allow the option key to be used without inputting special characters

Emacs: make right modifier keys consistent with their left counterparts on OS X

Emacs: switch control and command keys

Emacs: install and configure org-journal

Emacs: setup slime with the quicklisp-slime-helper

Emacs: delay loading redshank until needed

Emacs: delay loading eldoc until needed

Emacs: delay loading quickrun until needed

Emacs: delay loading skewer until needed

Emacs: remove redundant :defer specifications

Emacs: globally highlight matching parentheses

Emacs: migrate expressions from ap/lisp-setup to lisp-common-mode-hook where possible

Emacs: add lisp-common-mode-hook to allow cleaner setup of Lisp modes

Emacs: disable CEDET configuration until I figure out how to update it again

Emacs: Bind shift+space to set the mark

Emacs: Improve X11 clipboard interoperability

Emacs: add function and keybinding for opening eshell in the current directory

Emacs: add keyboard binding for switching to eshell

Emacs: make helm update the candidate selection window more quickly

Emacs: install multi-term if it is not available

Emacs: enable auto-indent-mode in lisps and set its indent level to 2

Emacs: use *init-file* to track the location of init.el through symlinks

Emacs: make company overlay display more quickly

Installer: Fix relative paths

Installer: Fix FreeBSD detection

Installer: Fix directory stack popping too early

Emacs: rename deprecated org-alphabetical-lists variable

Emacs: fix bad diff again

Emacs: fix incorrect package name for js2-mode

Emacs: fix bad diff

Emacs: install and skewer-mode and hook into js2-mode

Emacs: replace js3-mode with js2-mode

Emacs: change goto-last-change binding to C-x <space> to avoid conflicting with pop-global-mark

Emacs: add register bindings for emacs init file and organiser.org

Emacs: add command to insert a formatted date

Emacs: move calendar setup to new ‘Dates & Times’ section

Emacs: use em-smart package to return to previous command in eshell sessions

Emacs: make shell-execute work when buffer is not visiting a file

Emacs: always disable C-z

Emacs: add use-package declarations to Imenu when in elisp

Emacs: turn on ido-mode instead of toggling

Emacs: setup javascript indentation rules

Emacs: fix typo in javascript setup

Emacs: only enable moz-minor-mode in javascript if loaded

Emacs: bind d in mu4e headers to mark for delete instead of for trash

Emacs: Add localhost to the list of TRAMP remotes which should not be proxied

Emacs: Don't call redshank-mode if redshank is not loaded

zsh: move smart_sudo alias from s to su to allow fasd to use s

Byte-compile all the emacs files

Emacs: delete obsolete package-install.el

Emacs: add redshank-mode and install into lisp hooks

Emacs: remove unused web-vcs

Emacs: set package-archives whilst compiling for bootstrapping awesomeness

Make fasd function executable

Fix typo in install

Emacs: download package lists if nonexistant to ease bootstrapping

Use post-merge hook instead of post-checkout

Migrate post-checkout hook code to install and run install from post-checkout hook

Migrate zsh file compilation to post-checkout hook

Add git hooks to recompile emacs init file and elisp directory

Emacs: enable init.el to be batch byte-compiled

Emacs: make JIT fontification faster

Emacs: remove eldoc-context

Emacs: remove workaround for compile errors from diminish

Emacs: add official org-mode package repository

Emacs: remove unmaintained tromey ELPA repository

Xbindkeys: Remove binding for xbindkeys_show

zsh: use 32-bit wine by default

Emacs: install quickrun-mode

Emacs: add autoload for mu4e

Emacs: remove unnecessary :idle forms

Emacs: only delete a frame when calling exit-emacs in a daemon

Emacs: ensure that lua-mode and haskell-mode are installed before use

Emacs: add setup for nginx-mode

Emacs: remove help+

Emacs: show fringes

Emacs: use :ensure to download packages when needed

Emacs: bind q in mu4e's main window to bury the buffer rather than quitting

Emacs: set mu4e to update its index every 5 minutes

Emacs: Remove electrify-return-if-match and replace with paredit keybindings in lisp-modes

Emacs: disable nxhtml-mode

Emacs: enable nxhtml on laptop rather than at work

DWM: make ediff windows float

Emacs: replace string-matches on system name with env/* comparisons

Emacs: whitespace fixes

Emacs: remove unnecessary :commands

Emacs: correctly start winner-mode

Emacs: remove setup of unused package color-theme-solarized

Emacs: remove unused variable

Emacs: fix typo in docstring

Emacs: merge `setq` forms

Emacs: whitespace fixes

Emacs: create systems for getting system location (i.e. work/home) and type (laptop/desktop/server)

Emacs: only run nxhtml at work

Emacs: disable nxhtml-menu-mode properly

Emacs: fix typo in org-mode bindings

Emacs: set org-mode to indent headings

Emacs: fix org-mode package reference

Emacs: Remove load-path hints which point to el-get

Emacs: load nxhtml from .emacs.d

Emacs: Check basic-packages list and install any missing packages

Emacs: Remove el-get in favour of package.el

Emacs: switch org-mode font back to fixed-pitch

Emacs: remove unused variable

Emacs: use lexical binding

Emacs: install and use company-mode

XResources: use ChromeOS fonts

Xresources: Fix colour ordering in solarized-light

Emacs: add SMTP submission port

Emacs: move mumamo workaround into nxhtml's use-package form

Emacs: fix typo in mumamo workaround

zsh: remove compinit warnings for root

Install: move dwm target directory under projects/

Emacs: Add lua-mode initial configuration

Emacs: delete-current-buffer-file should use vc-delete-file when appropriate

Emacs: rename-current-buffer-file should use vc-rename-file when appropriate

Emacs: add full host-name for comparison when determining whether to load mu4e configuration

Emacs: Improve add-subdirs-to-load-path by adding the directory itself to load path

Emacs: only setup mu4e on prefect, where mail is in the expected directories

Emacs: fix logic error in setting up load-path

Git: remove purr alias; rebasing is confusing

Git: Add my name.

zsh: New version of wprop alias to make class and instance names clearer

Emacs: setup mu4e

Git: initial configuration

Emacs: choose magit extensions based upon git configuration

Emacs: workaround mumamo buffer-local-vars warnings

Emacs: Add el-get-dir to load-path

Migrate repository from mercurial without history

Initial commit

zsh: check for gem directory and add bin folder to path if found

Emacs: improve configuration of common-lisp mode

Emacs: add eval-and-replace and bind to C-c e

zshrc: add X11 window role to wprop alias

Make shell-execute work with a universal prefix argument

Emacs: ensure org-mode package with contrib/ is installed

Emacs: fix compilation warning regarding eshell/cd

Emacs: load custom file

Emacs: don't initialise *init-file* when user-init-file is not set

Emacs: setup jinja2-mode

Git: use the patience diff algorithm

Setup ediff configuration

Emacs: Provide ap-functions in ap-functions.el

Add global gitignore file

Emacs: initialise smex on startup for faster usage

Emacs: setup web-mode

Merge remote-tracking branch 'refs/remotes/origin/master'

Emacs: save ido state file in emacs directory

Make installer create .zsh and .zsh/cache, if necessary

Merge branch 'master' of home:dotfiles

Emacs: Remove configuration for nxhtml mode

Emacs: rebind M-/ to hippie-expand

Emacs: set company completion to only happen after inserting text

Emacs: add s-G magit keybinding like s-D

Emacs: Unbind more unhelpful Mac keybindings

Emacs: Switch control and command on OSX

Emacs: add extra keybinding for projectile-find-file

Emacs: unbind unhelpful s-n key

Emacs: Fix control key issue on OSX

Emacs: Remove unnecessary eval-and-compile

Replace auto-compile-mode with auto-async-byte-compile

Emacs: disable ido-virtual-buffers due to issues with flx-ido

Emacs: Enable flx in ido

Emacs: Switch back to auto-compile from auto-async-byte-compile

Update FreeBSD update-check: portaudit -> pkg audit

Replace ido customisations for vertical candidate display with ido-vertical-mode

Switch default push tracking mode to current

Add envrc files to global gitignore

Add direnv

Add Brewfile with basic tools

Emacs: remove use-package ensure directives in favour of cask

Installer: create directories for links if needed

Emacs: bind magit-status keys to projectile-vc

More general, and won't have to find the .git folder every time as
projectile will already know the project root.

Emacs: simplify flycheck diminish call

Emacs: diminish redshank and paredit

Emacs: Install tools for Platinum Searcher

Merge branch 'master' of git://github.com/alanpearce/dotfiles

Emacs: add dash hook for SQL flavours