X-Git-Url: http://git.shemshak.org/~bandali/bndl.org/blobdiff_plain/60d388dfb4838e3a29fd3be78f703b5abfb82a35..7a1f56a97e50f5f95e3c4b655c739fb0def44ace:/haunt.scm?ds=inline diff --git a/haunt.scm b/haunt.scm index 6a6f113..51f3e02 100644 --- a/haunt.scm +++ b/haunt.scm @@ -2,6 +2,7 @@ (haunt builder blog) (haunt builder atom) (haunt builder assets) + (haunt builder rss) (haunt html) (haunt page) (haunt post) @@ -11,10 +12,20 @@ (ice-9 match) (srfi srfi-19)) +(define my-scheme 'https) +(define my-domain "bandali.eu.org") +(define my-url + (string-append (symbol->string my-scheme) "://" my-domain)) + +(define my-date-format "~B ~d, ~Y") + (define (stylesheet name) `(link (@ (rel "stylesheet") (href ,(string-append "/" name ".css"))))) +(define* (aa content #:optional (uri content) . title) + `(a (@ (href ,uri) (title ,(apply string-append title))) ,content)) + (define* (base-layout site body #:key title) `((doctype "html") (html @@ -29,33 +40,52 @@ (footer (p "Copyright 2016–2019 Amin Bandali. See " - (a (@ (href "license.html")) "license.html") - " for license conditions. Please copy and share.")))))) + ,(aa "license.html" "/license.html") " for license " + "conditions. Please copy and share.")))))) -(define (bandali-post-template post) + +(register-metadata-parser! 'updated string->date*) + +(define (my-post-template post) `((header (h1 ,(post-ref post 'title)) - (address "By " - (a (@ (href "/")) - ,(post-ref post 'author)) + (address "By " ,(aa (post-ref post 'author) "/") " <" ,(post-ref post 'email) ">") (p (@ (class "date")) - ,(date->string (post-date post) "~B ~d, ~Y"))) - ,(post-sxml post))) + "Published " + ,(date->string (post-date post) my-date-format)) + ,(if (post-ref post 'updated) + `(p (@ (class "updated")) + "Updated " + ,(date->string (post-ref post 'updated) + my-date-format)) "")) + ,(post-sxml post) + (p (@ (class "muted inbox")) + "Have a question or comment? Start a discussion in my " + ,(aa "public inbox" "https://lists.sr.ht/~bandali/public-inbox") + " by sending an email to " + ,(aa "~bandali/public-inbox@lists.sr.ht" + "mailto:~bandali/public-inbox@lists.sr.ht") + (small + " [" ,(aa "mailing list etiquette" + "https://man.sr.ht/lists.sr.ht/etiquette.md") "]") + "."))) -(define (bandali-collection-template site title posts prefix) +(define (my-collection-template site title posts prefix) (define (post-uri post) (string-append (or prefix "") "/" (site-post-slug site post) ".html")) - `((h3 ,title) - (ul - ,@(map (lambda (post) - `(li - (a (@ (href ,(post-uri post))) - ,(post-ref post 'title)) - " — " ,(date->string (post-date post) "~B ~d, ~Y"))) - posts)))) + `((h2 ,title) + (table + (@ (class "post-list")) + (tbody + ,@(map (lambda (post) + `(tr + (td ,(aa (post-ref post 'title) (post-uri post))) + (td (@ (style "font-size: 0.875em;")) + ,(date->string (post-date post) my-date-format)))) + posts))))) (define bandali-theme (theme #:name "bandali" @@ -63,8 +93,14 @@ (lambda (site title body) (base-layout site body #:title title)) - #:post-template bandali-post-template - #:collection-template bandali-collection-template)) + #:post-template my-post-template + #:collection-template my-collection-template)) + +(define (static-page title file-name body) + (lambda (site posts) + (make-page file-name + (with-layout bandali-theme site title body) + sxml->html))) (define (index-material site posts) `(div @@ -72,17 +108,13 @@ "Amin Bandali") (p (@ (style "margin-top: 0;")) "Hi, I’m " - (a (@ (href "images/bandali-with-rms.jpg") - (title ,(string-append - "photo of bandali with rms wearing a " - "“pay cash don’t be tracked” pin"))) - "Amin Bandali") + ,(aa "Amin Bandali" "images/bandali-with-rms.jpg" + "photo of bandali with rms wearing a " + "“pay cash don’t be tracked” pin") ". I’m a graduate student at " - (a (@ (href "https://watform.uwaterloo.ca")) - "WatForm") + ,(aa "WatForm" "https://watform.uwaterloo.ca") " at University of Waterloo, supervised by " - (a (@ (href "https://cs.uwaterloo.ca/~nday/")) - "Dr. Nancy Day") + ,(aa "Dr. Nancy Day" "https://cs.uwaterloo.ca/~nday/") ". The main goal of my research is improving " (strong "software and systems reliability") " through application of " (em "formal methods") ".") @@ -90,62 +122,49 @@ "checking, and verification. I’m also interested in " "programming languages, theorem provers, and their " "type systems. You may wish to view my academic " - (a (@ (href "bandali-cv.html")) "curriculum vitae") ".") + ,(aa "curriculum vitae" "bandali-cv.html") ".") (p (@ (class "notice")) (strong "SE 212 students: ") - "see " (a (@ (href "se212-f19/")) "here") " for slides and " - "other material from the tutorials.") + "see " ,(aa "here" "se212-f19/") " for slides and other " + "material from the tutorials.") (p "On the side, I dabble in " - (a (@ (href "https://leanprover.github.io")) "Lean") - " and enjoy " - (a (@ (href "https://stallman.org/articles/on-hacking.html")) - "hacking") + ,(aa "Lean" "https://leanprover.github.io") " and enjoy " + ,(aa "hacking" "https://stallman.org/articles/on-hacking.html") " on " - (a (@ (href "https://www.gnu.org/software/emacs/manual/elisp.html")) - "Elisp") - ". I’m a " - (a (@ (href "https://www.gnu.org/philosophy/free-sw.html")) - "Free Software") - " activist and FSF " - (a (@ (href "https://www.fsf.org/associate/")) "supporter") - ", and a GNU " - (a (@ (href "https://www.gnu.org/people/#bandali")) - "maintainer") + ,(aa "Elisp" + "https://www.gnu.org/software/emacs/manual/elisp.html") + ". I’m a " ,(aa "Free Software" + "https://www.gnu.org/philosophy/free-sw.html") + " activist, a GNU " + ,(aa "maintainer" "https://www.gnu.org/people/#bandali") " and " - (a (@ (href "https://www.gnu.org/people/webmeisters.html#bandali")) - "webmaster") - ". I co-host the " - (a (@ (href "https://emacsel.com")) "Emacs.el") - " podcast with " - (a (@ (href "https://www.pygopar.com")) - "Daniel Gopar") ", and organize " - (a (@ (href "https://emacsconf.org")) "EmacsConf") " with help" - " from many wonderful people. I am also a member of the" - " Systems Committee for the " - (a (@ (href "https://csclub.uwaterloo.ca") - (title ,(string-append - "Computer Science Club of the " - "University of Waterloo"))) "CSC") + ,(aa "webmaster" + "https://www.gnu.org/people/webmeisters.html#bandali") + ", and an " ,(aa "associate member" + "https://www.fsf.org/associate/") + " of the " ,(aa "FSF" "https:///www.fsf.org" + "Free Software Foundation") + ". I co-host the " ,(aa "Emacs.el" "https://emacsel.com") + " podcast with " ,(aa "Daniel Gopar" "https://www.pygopar.com") + ", and organize " ,(aa "EmacsConf" "https://emacsconf.org") + " with help from many wonderful people. I am also a member of" + " the Systems Committee for the " + ,(aa "CSC" "https://csclub.uwaterloo.ca" + "Computer Science Club of the University of Waterloo") ".") - (p "See my " (a (@ (href "contact.html")) "contact") " page for " - "how to best reach me.") + (p "See my " ,(aa "contact" "contact.html") " page for how to " + "best reach me.") (h2 (@ (id "papers")) "Papers") (dl (dt "A Comparison of the Declarative Modelling Languages B, DASH, and TLA" (sup "+") - (span (@ (class "plinks")) - " [ " - (a (@ (href "papers/modre2018-declarative.pdf")) - "pdf") - " | " - (a (@ (href "papers/modre2018-declarative.bib")) - "bib") - " ]")) + (small + " [ " ,(aa "pdf" "papers/modre2018-declarative.pdf") " | " + ,(aa "bib" "papers/modre2018-declarative.bib") " ]")) (dd "Ali Abbassi, " - (a (@ (href "https://bandali.eu.org")) "Amin Bandali") ", " - (a (@ (href "https://cs.uwaterloo.ca/~nday/")) - "Nancy A. Day") - ", and Jose Serna" + ,(aa "Amin Bandali" my-url) ", " + ,(aa "Nancy A. Day" "https://cs.uwaterloo.ca/~nday/") ", " + "Jose Serna" (br) (em "2018 IEEE 8th International Model-Driven Requirements" " Engineering Workshop (MoDRE)") @@ -155,48 +174,40 @@ (dl (dt "The Magic of Specifications and Type Systems" - (span (@ (class "plinks")) - " [ " - (a (@ (href "talks/cucsc-2017-slides.pdf") - (title ,(string-append - "presented at the Canadian Undergraduate" - " Computer Science Conference 2017,\n" - "University of Toronto, Canada," - "June 15–17, 2017"))) - "slides") - " | " - (a (@ (href "talks/eecs4080-poster.pdf") - (title ,(string-append - "presented at the Lassonde Undergraduate" - " Summer Student Research Conference,\n" - "York University, Toronto, Canada," - "August 15, 2017"))) - "poster") - " ]")) - (dd (a (@ (href "https://bandali.eu.org")) "Amin Bandali") ", " - (a (@ (href "https://github.com/cipher1024")) - "Simon Hudon") - ", " - (a (@ (href "http://www.cse.yorku.ca/~jonathan/")) - "Jonathan S. Ostroff"))) + (small + " [ " + ,(aa "slides" "talks/cucsc-2017-slides.pdf" + "presented at the Canadian Undergraduate Computer Science" + " Conference 2017,\n" + "University of Toronto, Canada, June 15–17, 2017") + " | " + ,(aa "poster" "talks/eecs4080-poster.pdf" + "presented at the Lassonde Undergraduate Summer Student" + " Research Conference,\n" + "York University, Toronto, Canada, August 15, 2017") + " ]")) + (dd ,(aa "Amin Bandali" my-url) ", " + ,(aa "Simon Hudon" "https://github.com/cipher1024") ", " + ,(aa "Jonathan S. Ostroff" + "http://www.cse.yorku.ca/~jonathan/"))) (h2 (@ (id "projects")) "Projects") (p "Below are a number of free software projects I have worked " "on:") (dl - (dt (a (@ (href "https://git.sr.ht/~bandali/george-mode")) - "george-mode")) + (dt ,(aa "george-mode" "https://git.sr.ht/~bandali/george-mode")) (dd "Emacs major mode for editing George files") - (dt (a (@ (href "https://git.uwaterloo.ca/bandali/alloy-catalyst")) - "alloy-catalyst")) + (dt ,(aa "alloy-catalyst" + "https://git.uwaterloo.ca/bandali/alloy-catalyst")) (dd "Framework for performance analysis of Alloy models") - (dt (a (@ (href "https://github.com/unitb/unitb-web")) - "unitb-web")) + (dt ,(aa "unitb-web" "https://github.com/unitb/unitb-web")) (dd "Web interface for Unit-B") - (dt (a (@ (href "https://github.com/unitb/tex2png-hs")) - "tex2png-hs")) + (dt ,(aa "tex2png-hs" "https://github.com/unitb/tex2png-hs")) (dd "Library and CLI for converting TeX and LaTeX to PNG " "images")) (h2 (@ (id "notes")) "Notes") + (p "Here are notes about a variety of topics and issues I care " + "about. They’re also available via " ,(aa "Atom" "feed.atom") + " and " ,(aa "RSS" "feed.rss") " feeds.") (table (@ (class "post-list")) (tbody @@ -206,10 +217,9 @@ (string-append "/" (site-post-slug site post) ".html")) `(tr - (td (a (@ (href ,(post-uri post))) - ,(post-ref post 'title))) - (td (@ (style "font-size: 0.875em;")) - ,(date->string (post-date post) "~B ~d, ~Y")))) + (td ,(aa (post-ref post 'title) (post-uri post))) + (td (small + ,(date->string (post-date post) my-date-format))))) (take-up-to 10 (posts/reverse-chronological posts))))))) (define (index-page site posts) @@ -218,9 +228,200 @@ (base-layout site (index-material site posts)) sxml->html)) -(define my-domain "bandali.eu.org") +(define license-page + (static-page + "Licensing Information" + "license.html" + `((h1 "License information for " ,my-domain) + (p "I strongly believe in " + ,(aa "free culture" + "https://questioncopyright.org/what_is_free_culture") + " and that all creative works everywhere should be " + ,(aa "free" "https://freedomdefined.org/Definition") ".") + (p "Unless otherwise noted material on this site is licensed " + "under the GNU General Public License as published by the " + "Free Software Foundation, either version 3 of the License, " + "or (at your option) any later version. A copy of the " + "license is included at " ,(aa "gpl-3.0.html") ".") + (p "Some resources on free software and licenses:") + (ul + (li ,(aa "What is free software?" + "https://www.gnu.org/philosophy/free-sw.html")) + (li ,(aa "Various Licenses and Comments about Them" + "https://www.gnu.org/licenses/license-list.html")) + (li ,(aa "Proprietary Software Is Often Malware" + "https://www.gnu.org/proprietary/proprietary.html")))))) + +(define contact-page + (static-page + "Contact Information" + "contact.html" + `((h1 "Contact information") + (p "Email is by far my preferred method of communication. I may" + " be contacted at any of the following addresses (choose the" + " most closely related):") + (ul + (li "bandali@gnu.org") + (li "bandali@uwaterloo.ca") + (li "bandali@csclub.uwaterloo.ca")) + (p "If you want to send me GPG-encrypted mail, you can use my " + ,(aa "public key" "bandali-pubkey.txt") " with the" + " fingerprint " + (code "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103") + ".") + (table + (tbody + (tr + (td "IRC") + (td "bandali on " ,(aa "freenode" "https://freenode.net") ", " + ,(aa "moznet" "https://wiki.mozilla.org/IRC") ", and " + ,(aa "oftc" "https://www.oftc.net"))) + (tr + (td "XMPP") + (td ,(aa "bandali@member.fsf.org" + "xmpp:bandali@member.fsf.org"))) + (tr + (td "Matrix") + (td ,(aa "@bandali:matrix.org" + "https://matrix.to/#/@bandali:matrix.org"))) + (tr + (td "Fediverse") + (td ,(aa "@bandali@pleroma.site" + "https://pleroma.site/bandali"))))) + (h2 "Elsewhere") + (p "You may also find me at a few other places online. Stricken" + " through accounts are those I don’t use anymore, unless" + " absolutely necessary.") + (ul + (li ,(aa "bandali" "https://libreplanet.org/wiki/User:Bandali") + " on LibrePlanet") + (li ,(aa "bandali" "https://emacsconf.org/bandali") + " on EmacsConf") + (li ,(aa "bandali" "https://savannah.gnu.org/users/bandali") + " on Savannah") + (li ,(aa "bandali" "https://git.sr.ht/~bandali") + " on Sourcehut") + (li ,(aa "bandali" "https://lobste.rs/u/bandali") + " on Lobsters") + (li ,(aa "bandali" "https://hackage.haskell.org/user/bandali") + " on Hackage") + (li ,(aa "bandali" "https://gitlab.com/bandali") + " on GitLab") + (li ,(aa "bandali" + "https://news.ycombinator.com/user?id=bandali") + " on HN") + (li ,(aa "bandali" "https://www.reddit.com/u/bandali") + " on reddit") + (li (del ,(aa "bandali0" "https://github.com/bandali0") + " on GitHub")) + (li (del ,(aa "bandali0" "https://twitter.com/bandali0") + " on Twitter")))))) + +(define cv-page + (static-page + "Curriculum vitae" + "bandali-cv.html" + `((h1 "Curriculum vitae (" ,(aa "PDF" "bandali-cv.pdf") ")") + (table + (tbody + (tr + (td "Site") + (td ,(aa my-domain my-url))) + (tr + (td "Email") + (td "bandali@uwaterloo.ca")) + (tr + (td "Phone") + (td "available upon request via email")))) + (h2 "Education") + (h3 "Master of Mathematics (Computer Science) | 2018–present") + (p "University of Waterloo, Canada") + (p "Supervised by Dr. Nancy Day | GPA: 3.7/4.0 | " + "Expected completion: April 2020") + (p "Research focusing on formal logic, model checking, and " + "verification.") + (h3 "B.Sc. Honours Computer Science | 2013–2017") + (p "York University, Toronto, Canada") + (p "GPA: 7.84/9.0") + (p "Relevant courses: System Specification & Refinement, " + "Software Requirements Eng., Software Design, " + "Operating Systems, Computational Complexity, " + "Design & Analysis of Algorithms.") + (p "Finished first year (2013-14) at " (em "Carleton University") + " with a GPA of 11.0/12.0, then transferred to " + (em "York University") " in Fall 2014.") + (h2 "Publications") + (p "Listed on my " ,(aa "homepage" "/#papers")) + (h2 "Work & Research Experience") + (h3 "Cheriton School of Computer Science, University of Waterloo" + " | 2018–present") + (p "Instructional Apprentice, Teaching Assistant, " + "Research Assistant") + (ul + (li (abbr (@ (title "Logic and Computation")) "SE 212") ": " + (abbr (@ (title "Instructional Apprentice")) "IA") " in " + "Fall 2019, " + (abbr (@ (title "Teaching Assistant")) "TA") " in " + "Fall 2018") + (li (abbr (@ (title ,(string-append + "Software Requirements Specification and " + "Analysis"))) "SE 463") + ": TA in Summer 2019 and 2018") + (li (abbr (@ (title ,(string-append + "Elementary Algorithm Design and " + "Data Abstraction"))) "CS 136") + ": TA in Winter 2018")) + (h3 (abbr (@ (title + ,(string-append + "Electrical Engineering & Computer Science"))) + "EECS") + " Department, York University | Fall 2017") + (p "Teaching Assistant") + (p (abbr (@ (title "Net-Centric Introduction to Computing")) + "EECS 1012") + ": TA in Fall 2017")))) + +(define se212-f19-page + (static-page + "SE 212 Material" + "se212-f19/index.html" + `((h1 "Material from SE 212 tutorials") + (p "This page contains slides and other material from " + ,(aa "SE 212 tutorials" + "https://www.student.cs.uwaterloo.ca/~se212/times.html") + " held by me in Fall 2019. " + (del "If you have any questions, concerns, or suggestions " + "about the presented material, please email me at " + "bandali@uwaterloo.ca or come see me during my " + ,(aa "Friday office hours" + "https://www.student.cs.uwaterloo.ca/~se212/personnel.html") + ".")) + (ul + (li "Tutorial 1:" + (ul + (li ,(aa "TUT 101 slides" "se212-t01-101.pdf")) + (li ,(aa "TUT 102 slides" "se212-t01-102.pdf")) + (li ,(aa "Org beamer sources" "se212-t01.org")))) + (li "Tutorial 2:" + (ul + (li ,(aa "Homework 2 q04d solution" + "se212-h02q04d-soln.grg")))) + (li "Tutorial 3: —") + (li "Tutorial 4: —") + (li "Tutorial 5:" + (ul + (li ,(aa "Slides" "se212-t05.pdf")) + (li ,(aa "Org beamer sources" "se212-t05.org")))) + (li "Tutorial 6: —") + (li "Tutorial 7: worked through questions 1–5 of Homework 7") + (li "Tutorial 8: —") + (li "Tutorial 9: —") + (li "Tutorial 10: worked through questions 1–10 of " + "Homework 10"))))) (site #:title "Amin Bandali" + ;; TODO: uncomment after new haunt release + ;; #:scheme my-scheme #:domain my-domain #:default-metadata '((author . "Amin Bandali") @@ -232,6 +433,14 @@ `(("Notes" "notes.html" ,posts/reverse-chronological))) index-page - (atom-feed) - (atom-feeds-by-tag) + (atom-feed + #:file-name "feed.atom") + (atom-feeds-by-tag + #:prefix "tags") + (rss-feed + #:file-name "feed.rss") + contact-page + cv-page + license-page + se212-f19-page (static-directory "static" "")))