diff options
| -rw-r--r-- | .envrc | 6 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| l--------- | .pre-commit-config.yaml | 2 | ||||
| -rw-r--r-- | flake.lock | 291 | ||||
| -rw-r--r-- | html/publications/default.nix | 84 |
5 files changed, 93 insertions, 292 deletions
@@ -2,9 +2,9 @@ if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs=" fi -nix_direnv_watch_file devenv.nix -nix_direnv_watch_file devenv.lock -nix_direnv_watch_file devenv.yaml +watch_file devenv.nix +watch_file devenv.lock +watch_file devenv.yaml if ! use flake . --impure then echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2 @@ -1,3 +1,5 @@ ### devenv .devenv/ +.devenv.flake.nix +devenv.local.nix diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d312996..cfe6789 120000 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1 +1 @@ -/nix/store/9f1qv9x0ckx5lg3khx1rp8x603yzz3ns-pre-commit-config.json
\ No newline at end of file +/nix/store/8i64kwdav8v34wsi2lnilr9yjd2z7v84-pre-commit-config.json
\ No newline at end of file @@ -8,11 +8,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1696101277, - "narHash": "sha256-CEdj5dVMwAoncLBdolWZWtIPqcviAv/QrgXRftGgbrY=", + "lastModified": 1709132863, + "narHash": "sha256-YcMynPpFJ+OsF1+P3D/grcciownvw9hixcHCENqHK8g=", "owner": "qaristote", "repo": "info", - "rev": "a82702e4402c756d2f7363155ee011fbeb7e5f79", + "rev": "1297a6c7b341608cea3388e1fd2b39877a45efc3", "type": "github" }, "original": { @@ -71,32 +71,11 @@ "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { - "lastModified": 1695635472, - "narHash": "sha256-+0lqQZmbzdglPh8JoMAZzP1XXanhBg9BcbjVXnwEC5E=", + "lastModified": 1708701802, + "narHash": "sha256-OvpkuB5Lx8eomwUgUT4s10fzbrDnPCtCsxOlZ63hYFI=", "owner": "cachix", "repo": "devenv", - "rev": "42a26aa1b2265cf505df056e040e2b1ef8073b76", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_4": { - "inputs": { - "flake-compat": "flake-compat_4", - "nix": "nix_4", - "nixpkgs": "nixpkgs_6", - "pre-commit-hooks": "pre-commit-hooks_4" - }, - "locked": { - "lastModified": 1694422554, - "narHash": "sha256-s5NTPzT66yIMmau+ZGP7q9z4NjgceDETL4xZ6HJ/TBg=", - "owner": "cachix", - "repo": "devenv", - "rev": "63d20fe09aa09060ea9ec9bb6d582c025402ba15", + "rev": "fa9a708e240c6174f9fc4c6eefbc6a89ce01c350", "type": "github" }, "original": { @@ -153,22 +132,6 @@ "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -208,11 +171,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -225,11 +188,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -304,24 +267,6 @@ "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { "id": "flake-utils", "type": "indirect" } @@ -395,29 +340,6 @@ "type": "github" } }, - "gitignore_4": { - "inputs": { - "nixpkgs": [ - "my-nixpkgs", - "devenv", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "lowdown-src": { "flake": false, "locked": { @@ -466,22 +388,6 @@ "type": "github" } }, - "lowdown-src_4": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, "my-nixpkgs": { "inputs": { "devenv": "devenv_2", @@ -505,17 +411,16 @@ }, "my-nixpkgs_2": { "inputs": { - "devenv": "devenv_4", "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nur": "nur_2" }, "locked": { - "lastModified": 1695144247, - "narHash": "sha256-nhvt7l8+xE41XLaWUbqkf/AoqZ+HWW7FjIKEYoo68zM=", + "lastModified": 1708078123, + "narHash": "sha256-yt/bHp6j0aQIT9AK2t8Ky0cgtxYsPyyHlJdu+z6jLts=", "owner": "qaristote", "repo": "my-nixpkgs", - "rev": "d67e818223a6965d76362dd0407a17caf2c3fe4c", + "rev": "e89e97fbac60a463632efd5cbb662d9319cc7737", "type": "github" }, "original": { @@ -599,31 +504,6 @@ "type": "github" } }, - "nix_4": { - "inputs": { - "lowdown-src": "lowdown-src_4", - "nixpkgs": [ - "my-nixpkgs", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression_4" - }, - "locked": { - "lastModified": 1676545802, - "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=", - "owner": "domenkozar", - "repo": "nix", - "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "relaxed-flakes", - "repo": "nix", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1678875422, @@ -679,11 +559,11 @@ "nixpkgs-lib_3": { "locked": { "dir": "lib", - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "type": "github" }, "original": { @@ -697,11 +577,11 @@ "nixpkgs-lib_4": { "locked": { "dir": "lib", - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -760,22 +640,6 @@ "type": "github" } }, - "nixpkgs-regression_4": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1685801374, @@ -824,22 +688,6 @@ "type": "github" } }, - "nixpkgs-stable_4": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1695978539, @@ -902,27 +750,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1695978539, - "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1694948089, - "narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=", + "lastModified": 1702938738, + "narHash": "sha256-O7Vb0xC9s4Dmgxj8APEpuuMj7HsLgPbpy1UKvNVJp7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db", + "rev": "dd8e82f3b4017b8faa52c2b1897a38d53c3c26cb", "type": "github" }, "original": { @@ -930,14 +762,12 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1695978539, - "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8", - "type": "github" + "lastModified": 0, + "narHash": "sha256-TsySgcWm/GlbYdL3AEva49ceeI2BdPQ7muwfYNr1fwo=", + "path": "/nix/store/yjx2075p6xz76l6ldx1lzm1qk22li2ps-source", + "type": "path" }, "original": { "id": "nixpkgs", @@ -960,11 +790,11 @@ }, "nur_2": { "locked": { - "lastModified": 1694954496, - "narHash": "sha256-l9xsmZxZ0ISgbH6RRZdNbFfi3hKDdA8rHdSn2zJElJ0=", + "lastModified": 1703076631, + "narHash": "sha256-4QnntZP+6xaCkKGvSg57mRN3RtCzdR2i67C7R3AXld8=", "owner": "nix-community", "repo": "NUR", - "rev": "926dfdc88dd64c4ec4ed1ba1c29bc198e9713bbb", + "rev": "1367f14eadcb8a4fa6d15f773ff05f9dbd6065eb", "type": "github" }, "original": { @@ -1049,41 +879,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1688056373, - "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_4": { - "inputs": { - "flake-compat": [ - "my-nixpkgs", - "devenv", - "flake-compat" - ], - "flake-utils": "flake-utils_4", - "gitignore": "gitignore_4", - "nixpkgs": [ - "my-nixpkgs", - "devenv", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_4" - }, - "locked": { - "lastModified": 1688056373, - "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=", + "lastModified": 1704725188, + "narHash": "sha256-qq8NbkhRZF1vVYQFt1s8Mbgo8knj+83+QlL5LBnYGpI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7", + "rev": "ea96f0c05924341c551a797aaba8126334c505d2", "type": "github" }, "original": { @@ -1098,7 +898,7 @@ "devenv": "devenv_3", "flake-parts": "flake-parts_3", "my-nixpkgs": "my-nixpkgs_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "uncss": "uncss" } }, @@ -1162,24 +962,9 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "uncss": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] diff --git a/html/publications/default.nix b/html/publications/default.nix index 800d3aa..87dfb37 100644 --- a/html/publications/default.nix +++ b/html/publications/default.nix @@ -4,7 +4,6 @@ lib, ... }: let - publications = data.publications; attrValsOpt = attrs: attrSet: lib.attrVals (builtins.filter (attr: lib.hasAttr attr attrSet) attrs) attrSet; @@ -26,12 +25,18 @@ lib.optionalAttrs (authorsOther != []) { authors = "With ${lib.concatStringsSep ", " authorsOther}"; }) + // lib.optionalAttrs (publication ? note) { + note = publication.note; + } // lib.optionalAttrs (publication ? container-title) { published = "In ${em container-title}" + concatStringsPrefix ", " (attrValsOpt ["volume" "issue" "publisher"] publication); } + // lib.optionalAttrs (publication ? event-title) { + published = "At ${em event-title}"; + } // lib.optionalAttrs (publication ? ISBN) { isbn = "${small "ISBN"}: ${ISBN}"; } @@ -41,42 +46,51 @@ // lib.optionalAttrs (publication ? DOI) { doi = "${small "DOI"}: ${href "https://doi.org/${DOI}" (code DOI)}"; }; + listPublications = collection: collectionTitle: + with html; + section {id = "Publications#${collectionTitle}";} [ + (h2 collectionTitle) + (dl (for (sort.reverse.byPath ["issued" "date-parts"] collection) + (publication: let + formatted = format publication; + in + with formatted; + lines [ + (dt {id = "Publications#${id}";} + "${href {target = "_blank";} url title} (${year})") + (dd [ + (concatStringsSuffix ". " + (attrValsOpt ["authors" "note" "published" "isbn" "issn" "doi"] + formatted)) + (details [ + (summary "More") + (dl [ + (dt "Abstract.") + (dd (blockquote abstract)) + (dt "Cite.") + (let + citeWith = title: attr: + details [ + (summary title) + (pre (code (lib.getAttr attr cite))) + ]; + in + dd [ + (citeWith "BibLaTeX" "biblatex") + (citeWith "BibTeX" "bibtex") + (citeWith "CSL JSON" "csljson") + ]) + ]) + ]) + ]) + ]))) + ]; in { title = "Publications"; priority = 10; body = with html; - dl (for (sort.reverse.byPath ["issued" "date-parts"] publications) - (publication: let - formatted = format publication; - in - with formatted; - lines [ - (dt {id = "Publications#${id}";} - "${href {target = "_blank";} url title} (${year})") - (dd [ - (concatStringsSuffix ". " - (attrValsOpt ["authors" "published" "isbn" "issn" "doi"] - formatted)) - (details [ - (summary "More") - (dl [ - (dt "Abstract.") - (dd (blockquote abstract)) - (dt "Cite.") - (let - citeWith = title: attr: - details [ - (summary title) - (pre (code (lib.getAttr attr cite))) - ]; - in - dd [ - (citeWith "BibLaTeX" "biblatex") - (citeWith "BibTeX" "bibtex") - (citeWith "CSL JSON" "csljson") - ]) - ]) - ]) - ]) - ])); + lines [ + (listPublications data.publications.selected "Selected works") + (listPublications (with data.publications; lib.subtractLists selected all) "Other works") + ]; } |