From fe1f6cc0025d9c564a1cdb7cfb85739e0134526c Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Wed, 1 Jun 2016 10:58:37 -0500
Subject: [PATCH] merge conflict

---
 cray.org  |  3 ++-
 emacs.org | 12 ++++++++++++
 git.org   |  2 ++
 nix.org   |  8 +++-----
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/cray.org b/cray.org
index a1d24c8..e787282 100644
--- a/cray.org
+++ b/cray.org
@@ -221,7 +221,8 @@ while true; do
   cd ..
 done
 
-svn_url=$(git svn info --url)
+#svn_url=$(git svn info --url)
+svn_url="https://svn.us.cray.com/svn/xt/subsystems/BB/dwfs2/trunk12"
 remote_svn="/notbackedup/users/mtishmack/mod_data/${branch}"
 
 ssh $remote "module load cpkg sdev craysvn; rm -fr ${remote_svn}; mkdir -p ${remote_svn} && svn co ${svn_url} ${remote_svn} > /dev/null 2>&1;"
diff --git a/emacs.org b/emacs.org
index e731836..f4e2668 100644
--- a/emacs.org
+++ b/emacs.org
@@ -710,8 +710,20 @@ Org-mode keybindings and settings, pretty sparse really.
                                  (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
       )
     )
+#+END_SRC
+
+#+BEGIN_SRC emacs-lisp :tangle no
+(require 'ox-latex)
+ox-latex
 
+(unless (boundp 'org-latex-classes)
+  (setq org-latex-classes nil))
+nil
 
+(add-to-list 'org-latex-classes
+             '("article"
+               "\\documentclass{article}"
+               ("\\section{%s}" . "\\section*{%s}")))
 #+END_SRC
 
 *** flycheck
diff --git a/git.org b/git.org
index a79cbad..4a34707 100644
--- a/git.org
+++ b/git.org
@@ -76,6 +76,8 @@ General git configuration split out into sections mostly.
     # help the gc a bit and get a bit more space back for a local clone
     trim = !git reflog expire --expire=now --all && git gc --prune=now
     aliases = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\ \t => \\2/' | sort
+    defremote = !git branch -rvv | egrep 'HEAD' | awk '{print $1}' | sed -e 's|/HEAD||g'
+    p = !sh -c 'git branch ${1:-$(git defremote)}pr$0@$(iso8601 -s) $(git ls-remote -q ${1:-$(git defremote)} | grep refs/pull-requests/$0/from | cut -c1-8)'
 #+END_SRC
 ** github
 #+BEGIN_SRC conf :tangle (when (eq git-p t) "tmp/.gitconfig")
diff --git a/nix.org b/nix.org
index a75d018..68efb82 100644
--- a/nix.org
+++ b/nix.org
@@ -59,6 +59,7 @@ in
         sloccount
         cloc
         less
+        llvm
         multitail
         rlwrap
         gdbm
@@ -102,12 +103,10 @@ in
         python27Packages.flake8
         python27Packages.virtualenv
         python27Packages.pip
-        haskellPackages.alex
-        haskellPackages.happy
+        python27Packages.bugzilla
         haskellPackages.bake
         haskellPackages.cabal-dependency-licenses
         haskellPackages.cabal-install
-        haskellPackages.cabal-meta
         haskellPackages.ghc-core
         haskellPackages.ghc-mod
         haskellPackages.hasktags
@@ -116,8 +115,8 @@ in
         haskellPackages.hspec
         haskellPackages.pandoc
         haskellPackages.shake
+        haskellPackages.idris
         haskellPackages.ShellCheck
-        haskellPackages.stack
         haskellPackages.idris
         haskellPackages.nats
         haskellPackages.transformers-compat
@@ -125,7 +124,6 @@ in
       # some of these are broken on osx, fix them
         rtags
         pylint
-        texLiveFull
         cscope
       ];
     };