From 39e1f02a61eaf6b4820b42da1dddcf6ce605f7a4 Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Sun, 24 Jul 2016 11:20:33 -0500
Subject: [PATCH] Update nix config and default package derivation.

---
 dotprofile.org | 24 +++++++++++++++++++-----
 nix.org        | 40 ++++++++++++++++++++--------------------
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/dotprofile.org b/dotprofile.org
index c86e296..d602c37 100644
--- a/dotprofile.org
+++ b/dotprofile.org
@@ -278,16 +278,30 @@ nix_env_setup()
   }
 }
 
-nix_env_setup
+nix-on() {
+  rm ~/.nonix
+}
+
+nix-off() {
+  touch ~/.nonix
+}
 #+END_SRC
 
 Workaround stupid ssl crap with recent nix.
 
 #+BEGIN_SRC sh :tangle (when (and (eq nix-p t) (eq osx-p t)) "tmp/.profile")
-SSL_CERT_FILE="${HOME}/.nix-profile/etc/ssl/certs/ca-bundle.crt"
-GIT_SSL_CAINFO=$SSL_CERT_FILE
-export SSL_CERT_FILE
-export GIT_SSL_CAINFO
+if [ ! -e ${HOME}/.nonix ]; then
+  SSL_CERT_FILE="${HOME}/.nix-profile/etc/ssl/certs/ca-bundle.crt"
+  GIT_SSL_CAINFO=$SSL_CERT_FILE
+  export SSL_CERT_FILE
+  export GIT_SSL_CAINFO
+fi
+#+END_SRC
+
+#+BEGIN_SRC sh :tangle (when (eq nix-p t) "tmp/.profile")
+if [ ! -e ${HOME}/.nonix ]; then
+  nix_env_setup
+fi
 #+END_SRC
 
 TODO Add linux ca-bundle detection
diff --git a/nix.org b/nix.org
index a75d018..6d02472 100644
--- a/nix.org
+++ b/nix.org
@@ -15,11 +15,11 @@ in
 
   packageOverrides = pkgs: with pkgs;
   let in rec {
-    my-pinentry = pinentry.override { gtk2 = null; qt4 = null; ncurses = null; };
-    my-gnupg = gnupg.override { x11Support = false; pinentry = false; };
-    my-youtube-dl = python27Packages.youtube-dl.override { pandoc = null; };
+    custom-pinentry = pinentry.override { gtk2 = null; qt4 = null; ncurses = null; };
+    custom-gnupg = gnupg.override { x11Support = false; };
+    custom-youtube-dl = python27Packages.youtube-dl.override { pandoc = null; };
 
-    my-git = git.override {
+    custom-git = git.override {
       pythonSupport = false;
       svnSupport = true;
       guiSupport = false;
@@ -41,7 +41,7 @@ in
         ctags
         diffutils
         patchutils
-        my-git
+        custom-git
         gitAndTools.gitFull
         gitAndTools.git-extras
         bazaarTools
@@ -52,8 +52,8 @@ in
         docbook5
         entr
         emacs
-        my-gnupg
-#        gnupg1compat
+        gnupg
+        gnupg1compat
         gnutar
         gnumake
         sloccount
@@ -70,10 +70,13 @@ in
         aspell
         aspellDicts.en
         openssl
-        my-pinentry
+        custom-pinentry
+        poppler_utils
+        ghostscript
         pbzip2
         pigz
         pv
+        pkgconfig
         postgresql
         readline
         rsync
@@ -92,22 +95,20 @@ in
         unrar
         watch
         nox
+        graphviz-nox
         mutt
         duply
-#        xhyve        compiles normally, figure out hypervisor framework issue
         lastpass-cli
-        my-youtube-dl
+        custom-youtube-dl
         python27Packages.howdoi
         python27Packages.pyflakes
         python27Packages.flake8
         python27Packages.virtualenv
         python27Packages.pip
-        haskellPackages.alex
-        haskellPackages.happy
+        python27Packages.pylint
         haskellPackages.bake
         haskellPackages.cabal-dependency-licenses
-        haskellPackages.cabal-install
-        haskellPackages.cabal-meta
+#        haskellPackages.cabal-install
         haskellPackages.ghc-core
         haskellPackages.ghc-mod
         haskellPackages.hasktags
@@ -118,15 +119,14 @@ in
         haskellPackages.shake
         haskellPackages.ShellCheck
         haskellPackages.stack
-        haskellPackages.idris
-        haskellPackages.nats
-        haskellPackages.transformers-compat
       ] ++ stdenv.lib.optionals stdenv.isLinux [
-      # some of these are broken on osx, fix them
+        # some of these are broken on osx, fix them
         rtags
-        pylint
-        texLiveFull
         cscope
+        gcc
+# disabled for now
+#      ] ++ stdenv.lib.optionals stdenv.isDarwin [
+#        xhyve        compiles normally, figure out hypervisor framework issue
       ];
     };
   };