add hooks

3 files changed, 29 insertions, 23 deletions

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5372f74..d1c0e1d 120000
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1 +1 @@
-/nix/store/sl54l2pqgb5ysmpd1qn500hrm61zk2i7-pre-commit-config.json
\ No newline at end of file
+/nix/store/1gjsgdiq4mwrd8i3a1kz44s7l8nw2n37-pre-commit-config.json
\ No newline at end of file
diff --git a/config/emacs.org b/config/emacs.org
index 0b71dbe..d262138 100644
--- a/config/emacs.org
+++ b/config/emacs.org
@@ -107,7 +107,7 @@ Emacs is self documenting, after all!
       (require 'subr-x)
       (server-start)
 
-      ;; start wiith sane defaults
+      ;; start with sane defaults
       (pixel-scroll-precision-mode 1)
       (display-battery-mode 1)
       (display-time-mode 1)
@@ -165,20 +165,20 @@ This is my org mode configuration, which also configures latex.
       (org-pretty-entities t "prettify org mode")
       (org-agenda-files (list "~/monorepo/agenda.org" "~/org/notes.org" "~/org/agenda.org") "set default org files")
       (org-default-notes-file (concat org-directory "/notes.org") "Notes file")
-      (org-html-with-latex 'html)
-      (org-html-mathjax-options nil)
-      (org-html-mathjax-template "")
-      (org-html-head-include-default-style nil) ; Clear Org's default CSS
-      (org-html-head-include-scripts nil)       ; Clear Org's default JS
+      (org-html-with-latex 'html "let my html handler handle latex")
+      (org-html-mathjax-options nil "disable mathjax, use MathML")
+      (org-html-mathjax-template "" "disable mathjax, use MathML")
+      (org-html-head-include-default-style nil "use my own css for everything")
+      (org-html-head-include-scripts nil "use my own js for everything")
       (org-html-divs '((preamble "header" "preamble")
                         (content "main" "content")
-                        (postamble "footer" "postamble")))
+                        (postamble "footer" "postamble")) "semantic html exports")
       (org-html-head-extra (concat "<meta name=\"theme-color\" content=\"#ffffff\">\n<link rel=\"preload\" href=\"/fonts/Inconsolata-Medium.woff2\" as=\"font\" type=\"font/woff2\" crossorigin>\n<meta name=\"theme-color\" content=\"#ffffff\">\n<link rel=\"preload\" href=\"/fonts/Lora-Medium.woff2\" as=\"font\" type=\"font/woff2\" crossorigin>\n<link rel=\"preload\" href=\"/fonts/CormorantGaramond-Bold.woff2\" as=\"font\" type=\"font/woff2\" crossorigin>\n<link rel=\"preload\" href=\"/fonts/CormorantGaramond-Medium.woff2\" as=\"font\" type=\"font/woff2\" crossorigin>\n<link rel=\"manifest\" href=\"/site.webmanifest\">\n<link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"/favicon-16x16.png\">\n<link rel=\"mask-icon\" href=\"/safari-pinned-tab.svg\" color=\"#5bbad5\">\n<link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"/favicon-32x32.png\">\n<link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"/apple-touch-icon.png\"><meta name=\"msapplication-TileColor\" content=\"#da532c\">\n"
                                    "<style>"
                                    (with-temp-buffer (insert-file-contents-literally "~/monorepo/combined.css") (buffer-substring-no-properties (point-min) (point-max)))
-                                   "</style>"))
+                                   "</style>") "add all these different headers for performance and compliance")
       (org-latex-to-html-convert-command 
-        "printf '%%s' %i | pandoc -f latex -t html --mathml | tr -d '\\n' | sed -e 's/^<p>//' -e 's/<\\/p>$//'")
+        "printf '%%s' %i | pandoc -f latex -t html --mathml | tr -d '\\n' | sed -e 's/^<p>//' -e 's/<\\/p>$//'" "latex to MathML with special character handling")
       (org-html-viewport '((width "device-width") 
                            (initial-scale "1.0") 
                            (minimum-scale "1.0")) "Prevent zooming out past default size")
@@ -408,13 +408,6 @@ Org superstar adds those nice looking utf-8 bullets:
 ** LSP
 We set up eglot, the LSP manager for emacs, now built in:
 #+begin_src emacs-lisp :tangle ../nix/init.el
-   ;; (use-package eglot
-   ;;   :hook
-   ;;   (prog-mode . eglot-ensure)
-   ;;   (nix-mode . eglot-ensure)
-   ;;   :config
-   ;;   (add-to-list 'eglot-server-programs '(nix-mode . ("nil"))))
-
    (use-package lsp
      :hook
      (prog-mode . lsp))
diff --git a/flake.nix b/flake.nix
index 09c8ea9..a524c32 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,15 +66,28 @@
         src = ./.;
         hooks = {
           deadnix.enable = true;
-          test-spontaneity-vm-with-site = {
+          spontaneity-smoke-test = {
             enable = true;
-            name = "spontaneity-vm";
-            description = "test boot the spontaneity vm to check nginx config. Required test as we inject monorepoSelf variable.";
+            name = "Spontaneity smoke test";
+            description = "tests if nginx is active/if the config works.";
             stages = [ "pre-merge-commit" ];
-            entry = "${pkgs.writeShellScript "website-check" ''
-nix build .#spontaneity
-''}";
+            entry = ''
+set -e
+set -o pipefail
+trap "echo -e '\nHook interrupted by user. Aborting merge!'; exit 1" INT TERM
+
+BRANCH=$(git branch --show-current)
+if [ "$BRANCH" != "main" ]; then
+  exit 0
+fi
+
+set +e
+nix build .#checks.${system}.spontaneity-website-test --no-link
+set -e
+'';
+            pass_filenames = false; 
           };
+
           website-build-check = {
             enable = true;
             name = "website-build";