Omnibus update for nix setup and emacs.

Mostly bugfixes

emacs.org

@@ -659,6 +659,7 @@ Org-mode keybindings and settings, pretty sparse really.
     :config
     (progn
       (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
+      (when window-system
       (let* ((variable-tuple (cond ((x-list-fonts "Source Sans Pro") '(:font "Source Sans Pro"))
                                    ((x-list-fonts "Lucida Grande")   '(:font "Lucida Grande"))
                                    ((x-list-fonts "Verdana")         '(:font "Verdana"))
@@ -676,6 +677,7 @@ Org-mode keybindings and settings, pretty sparse really.
                                 `(org-level-2 ((t (,@headline ,@variable-tuple :height 1.5))))
                                 `(org-level-1 ((t (,@headline ,@variable-tuple :height 1.75))))
                                 `(org-document-title ((t (,@headline ,@variable-tuple :height 1.5 :underline nil))))))
+	)
       (font-lock-add-keywords 'org-mode
                               '(("^ +\\([-*]\\) "
                                  (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
@@ -914,7 +916,7 @@ So I write gooder. Me fail English? Thats unpossible.
 
 Compress down python configuration a bit.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle no
   (use-package python
     :commands python-mode
     :mode ("\\.py\\'" . python-mode)
@@ -1304,6 +1306,6 @@ Load this up last to allow for local customization if needed and to keep from cu
 #+END_SRC
 
 * Load any local definitions
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle no
 (load-file "~/.emacs.d/local.el")
 #+END_SRC

git.org

@@ -117,7 +117,7 @@ General git configuration split out into sections mostly.
 [http]
   postBuffer = 209715200
 #+END_SRC
-** push
+q** push
 #+BEGIN_SRC conf :tangle (when (eq git-p t) "tmp/.gitconfig")
 [push]
   default = simple

nix.org

@@ -8,12 +8,8 @@
 Nix user config.nix setup.
 
 #+BEGIN_SRC conf :tangle (when (eq nix-p t) "tmp/.nixpkgs/config.nix")
-let
-  pkgs = import <nixpkgs> {};
-in
-{
-  packageOverrides = pkgs: with pkgs;
-  let in rec {
+{ pkgs }: {
+  packageOverrides = super: let pkgs = super.pkgs; in with pkgs; rec {
     custom-pybugz = with python34Packages; buildPythonPackage rec {
       name = "pybugz-${version}";
       version = "0.13";
@@ -79,6 +75,7 @@ in
         graphviz-nox
         haskellPackages.ShellCheck
         haskellPackages.bake
+        haskellPackages.cabal-install
         haskellPackages.cabal-dependency-licenses
         haskellPackages.ghc-core
         haskellPackages.ghc-mod