Skip to content

Commit

Permalink
Small cleanup (#95)
Browse files Browse the repository at this point in the history
* cleans up flake and moves packages to template

* Fix whitespace

* cleanup

* cleanup
  • Loading branch information
matsavage authored Jun 1, 2024
1 parent 5ca31b7 commit a63247a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 18 deletions.
1 change: 0 additions & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
github: matsavage

4 changes: 1 addition & 3 deletions characters/aaliyah-plain.tex
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
\documentclass[letterpaper,openany,oneside,twocolumn]{book}
\usepackage{bookmark}
%\usepackage[justified]{dnd}
\usepackage{xstring}
\usepackage{ragged2e}

\usepackage{graphicx}
\usepackage{ifthen}
\usepackage{geometry}
\usepackage{pstricks}

Expand Down
2 changes: 2 additions & 0 deletions dndtemplate.sty
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
\usepackage{fontspec}
\usepackage{ifthen}
\usepackage{pstricks}
\usepackage{xstring}
\usepackage{ragged2e}

% DEFINE FONT FOR USER INPUTTED TEXT
\newfontfamily\entryfont{Kalam}[Path=template/fonts/,Extension=.ttf,UprightFont=Kalam-Regular,BoldFont=Kalam-Bold]
Expand Down
18 changes: 4 additions & 14 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
# Executables:

latexmk
xetex
luatex
luahbtex
latex-bin
Expand Down Expand Up @@ -100,10 +99,7 @@
pdfcol
pstricks
tikzfill
# Needed for xdv to pdf:

pst-tools
xetex-pstricks
# Needed for lualatex and transparencies:

luapstricks
Expand All @@ -113,7 +109,7 @@

buildInputs = [
texlive
pkgs.ghostscript_headless # needed for the xdv to pdf step
# pkgs.ghostscript_headless # needed for the xdv to pdf step
pkgs.gnused
];

Expand All @@ -123,6 +119,8 @@
FONTCONFIG_FILE = pkgs.makeFontsConf {fontDirectories = [./template/fonts];};
TEXINPUTS = "${builtins.toString ./.}//:${dnd}//:";
TTFONTS = "${builtins.toString ./.}//:${dnd}//:";
TEXMFHOME = ".cache";
TEXMFVAR = ".cache/texmf-var";
};

build_character = (
Expand All @@ -135,16 +133,8 @@

inherit buildInputs;

patchPhase = ''
'';

buildPhase = ''
env TEXMFHOME=.cache TEXMFVAR=.cache/texmf-var \
latexmk -interaction=nonstopmode -pdf -lualatex ${directory}/${file_name}
'';

postBuild = ''
cat ./*.log
latexmk -interaction=nonstopmode -pdf -lualatex ${directory}/${file_name}
'';

installPhase = ''
Expand Down

0 comments on commit a63247a

Please sign in to comment.