Merge branch 'chore/perfect-css'

1 files changed, 14 insertions, 5 deletions

diff --git a/flake.nix b/flake.nix
index e9b26af..af8b06b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,9 +14,13 @@
     publish-org-roam-ui = {
       url = "git://nullring.xyz/publish-org-roam-ui.git";
     };
+    garamond = {
+      url = "github:fontalternative/cormorant-garamond";
+      flake = false;
+    };
   };
 
-  outputs = { nixpkgs, git-hooks, nixmacs, self, publish-org-roam-ui, ... }:
+  outputs = { nixpkgs, git-hooks, nixmacs, self, publish-org-roam-ui, garamond, ... }:
     let
       system = "x86_64-linux";
       pkgs = import nixpkgs { inherit system; };
@@ -36,7 +40,8 @@
       installer-iso = installer.config.system.build.isoImage;
 
       spontaneityHost = spontaneity.config.monorepo.vars.orgHost;
-      spontaneityUser = spontaneity.config.monorepo.vars.userName;
+
+      topology = nixmacs.topology.x86_64-linux.config.output;
 
       pre-commit-check = git-hooks.lib.${system}.run {
         src = ./.;
@@ -185,21 +190,23 @@ emacs -q --batch \
   --eval '(setq org-export-with-latex t)' \
   --eval '(setq org-confirm-babel-evaluate nil)' \
   --eval '(setq load-prefer-newer t)' \
-  --eval '(setq custom-safe-themes t)' \
   -l ${nixmacs}/init.el \
+  --eval '(setq custom-safe-themes t)' \
   --eval "(org-babel-do-load-languages 'org-babel-load-languages '((latex . t)))" \
   --eval '(setq org-roam-directory (expand-file-name "mindmap" (expand-file-name "~/monorepo")))' \
   --eval '(setq org-id-track-globally t)' \
   --eval '(org-roam-db-sync)' \
   --eval '(setq term-file-prefix nil)' \
   --eval '(load-theme (quote doom-rouge) t)' \
-  --eval '(setq custom-safe-themes t)' \
   --eval '(force-mode-line-update)' \
   --eval '(setq org-html-link-use-abs-url nil)' \
   --eval '(setq default-directory (expand-file-name "~/monorepo"))' \
   --eval '(setq org-html-link-use-abs-url nil)' \
   --eval '(setq org-html-link-org-files-as-html t)' \
-  --eval '(add-hook (quote org-publish-after-export-hook) (lambda (file) (font-lock-ensure)))' \
+  --eval '(require (quote htmlize))' \
+  --eval '(require (quote nix-mode))' \
+  --eval '(setq org-html-htmlize-output-type (quote css))' \
+  --eval '(setq org-html-head-extra "<link rel=\"stylesheet\" type=\"text/css\" href=\"/syntax.css\" />")' \
   --eval '(org-publish-all t)' \
   --eval '(org-publish-all nil)' || (echo "FAIL:" && cat /build/*.log && exit 1)
           echo "Setting up Graph View..."
@@ -214,8 +221,10 @@ mkdir -p $out/fonts
 
 cp -L ${pkgs.lora}/share/fonts/truetype/*.ttf $out/fonts/
 cp -L ${pkgs.inconsolata}/share/fonts/truetype/inconsolata/*.ttf $out/fonts
+cp ${garamond}/ttf/CormorantGaramond-Medium.ttf $out/fonts/
 
 cp -r $HOME/website_html/. $out/
+cp ${topology}/main.svg $out/img/topology.svg
 cp ${installer-iso}/iso/*.iso $out/installer.iso
 cd $out
 sha256sum installer.iso > installer.iso.sha256