Update pdf environment

3 files changed, 15 insertions, 9 deletions

diff --git a/gup/pdf.gup b/gup/pdf.gup
index 7604813..3b3aa3a 100755
--- a/gup/pdf.gup
+++ b/gup/pdf.gup
@@ -1,8 +1,9 @@
 #!/usr/bin/env zsh
 
-gup -u ${2%.pdf}.md
+base=(${2%.pdf}.(md|lhs)([1]))
 
-for i in 0 1; do
-    pandoc -t latex -o $2 -V "geometry=margin=2cm" -V "fontfamily=libertine" -H preamble.tex --listings --latex-engine=lualatex ${2%.pdf}.md >&2
+gup -u ${base} preamble.tex
+
+for i ({0..1}); do
+    pandoc -t latex -o $1 -V "geometry=margin=2cm" -V "fontfamily=libertine" -H preamble.tex --listings --latex-engine=lualatex ${base} >&2
 done
-[[ -e $2 ]] && touch $2
diff --git a/preamble.tex b/preamble.tex
index d602be5..bd24801 100644
--- a/preamble.tex
+++ b/preamble.tex
@@ -1,6 +1,8 @@
+\usepackage{libertine}
 \usepackage{listings}
 \usepackage{algorithmic}
 \usepackage{amsmath}
+\usepackage{amsthm}
 \usepackage{bussproofs}
 \usepackage{tikz}
 \usepackage{tikz-qtree,tikz-qtree-compat,circuitikz}
@@ -13,7 +15,10 @@ frame=tb,
 numbers=left,
 numberstyle=\tiny,
 breaklines=true,
-postbreak=\raisebox{0ex}[0ex][0ex]{\ensuremath{\color{red}\hookrightarrow\space}}
+postbreak=\raisebox{0ex}[0ex][0ex]{\ensuremath{\color{red}\hookrightarrow\space}},
+extendedchars=true,
+inputencoding=utf8,
+keywordstyle=
 }
 
 \DeclareMathOperator{\Hom}{Hom}
@@ -24,3 +29,5 @@ postbreak=\raisebox{0ex}[0ex][0ex]{\ensuremath{\color{red}\hookrightarrow\space}
 \providecommand{\lequiv}{\ensuremath{\Leftrightarrow}}
 \providecommand{\limplies}{\ensuremath{\Rightarrow}}
 \providecommand{\seq}{\ensuremath{\Longrightarrow}}
+
+\newtheorem*{def*}{Definition}
diff --git a/shell.nix b/shell.nix
index 2f02543..19a4096 100644
--- a/shell.nix
+++ b/shell.nix
@@ -11,11 +11,9 @@ pkgs.stdenv.mkDerivation rec {
                   (pkgs.callPackage ./mars.nix {})
                   pkgs.sqlite
                   (pkgs.haskellPackages.ghcWithPackages (p:
-                    with p; [ yesod yesod-bin pandoc monad-par persistent-sqlite
+                    with p; [ yesod yesod-bin pandoc monad-par persistent-sqlite containers base-unicode-symbols containers-unicode-symbols
                             ]))
-                  (pkgs.texlive.combine {
-                    inherit (pkgs.texlive) scheme-small libertine tipa cm-super context bussproofs mweights fontaxes backnaur enumitem varwidth beamer algorithms tikz-qtree circuitikz todonotes;
-                  })
+                  pkgs.texlive.combined.scheme-full
                 ];
   shellHook = ''
     export PROMPT_INFO="${name}"