diff --git a/app/Shakefile.hs b/app/Shakefile.hs index 6008fbf..067e6ab 100644 --- a/app/Shakefile.hs +++ b/app/Shakefile.hs @@ -373,10 +373,10 @@ genPdfAction _getPost out = do , srcFile , "--resource-path=." , "-H", "engine" "deeplist.tex" - , "-V", "mainfont:CMU Serif" - , "-V", "mainfontoptions:Renderer=OpenType, Mapping=tex-text, ItalicFeatures={Alternate = 0}, Ligatures={Common,Rare,Historic,Contextual},Contextuals=Inner,Alternate=1" - , "-V", "monofont:Menlo" - , "-V", "monofontoptions:Scale=0.7" + -- , "-V", "mainfont:CMU Serif" + -- , "-V", "mainfontoptions:Renderer=OpenType, Mapping=tex-text, ItalicFeatures={Alternate = 0}, Ligatures={Common,Rare,Historic,Contextual},Contextuals=Inner,Alternate=1" + -- , "-V", "monofont:Menlo" + -- , "-V", "monofontoptions:Scale=0.7" , "-o", out ] diff --git a/engine/docker-run.sh b/engine/docker-run.sh index 3e09576..fb9a226 100755 --- a/engine/docker-run.sh +++ b/engine/docker-run.sh @@ -2,7 +2,7 @@ cd "$(git rev-parse --show-toplevel)" || exit 1 if (($#>0)); then - docker run --rm -v $PWD:/home/her.esy.fun --name her.esy.fun -it her.esy.fun /bin/sh -c "cd /home/her.esy.fun && nix-shell --run $@" + docker run --rm -v $PWD:/home/her.esy.fun --expose=3000 --name her.esy.fun -it her.esy.fun /bin/sh -c "cd /home/her.esy.fun && nix-shell --run $@" else - docker run --rm -v $PWD:/home/her.esy.fun --name her.esy.fun -it her.esy.fun + docker run --rm -v $PWD:/home/her.esy.fun --expose=3000 --name her.esy.fun -it her.esy.fun fi diff --git a/shell.nix b/shell.nix index cfa462c..33bb65b 100644 --- a/shell.nix +++ b/shell.nix @@ -29,7 +29,8 @@ pkgs.mkShell { perlPackages.URI minify imagemagick - texlive.combined.scheme-medium # https://nixos.wiki/wiki/TexLive + texlive.combined.scheme-full # https://nixos.wiki/wiki/TexLive + cm_unicode # dev env # niv git @@ -39,4 +40,7 @@ pkgs.mkShell { ripgrep nodePackages.http-server ]; + shellHook = '' + export FONTCONFIG_FILE=${pkgs.fontconfig.out}/etc/fonts/fonts.conf + ''; }