summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock12
-rw-r--r--html/default.nix6
-rw-r--r--html/sections.nix1
-rw-r--r--html/software/default.nix28
4 files changed, 38 insertions, 9 deletions
diff --git a/flake.lock b/flake.lock
index e125cdc..708c150 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
]
},
"locked": {
- "lastModified": 1668631291,
- "narHash": "sha256-4c4vm/qb9PP6OTgHtEJcD2NoDwlMgYg4Z9Q6natda9o=",
+ "lastModified": 1671297777,
+ "narHash": "sha256-kvCzzOupvgGyO3Q/0cpGPgDYEdj8g6MVCH4Mlt/e56k=",
"owner": "qaristote",
"repo": "info",
- "rev": "bc83aaf07a793823676d3d94c1d50b10be9b4a57",
+ "rev": "c91a58357700a466aee5135767535136c878e009",
"type": "github"
},
"original": {
@@ -39,11 +39,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1668912770,
- "narHash": "sha256-Nzt7ALUl5PrUAYIH8aRbj+njkJZVQ4VQBkWx+qQvqyM=",
+ "lastModified": 1671249438,
+ "narHash": "sha256-5e+CcnbZA3/i2BRXbnzRS52Ly67MUNdZR+Zpbb2C65k=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "862277ac9d34273cd953f42061e23d488d6b7e8b",
+ "rev": "067bfc6c90a301572cec7da48f09c447a9a8eae0",
"type": "github"
},
"original": {
diff --git a/html/default.nix b/html/default.nix
index 2d8774c..b001d91 100644
--- a/html/default.nix
+++ b/html/default.nix
@@ -47,9 +47,9 @@ html.html { lang = "en"; } [
(section: li (href "#${section.title}" section.title)))))
])
(main { role = "main"; } (for sections (section: section.body)))
- (footer "Webpage generated with the help of ${
- href "https://nixos.org/" "Nix"
- } and ${
+ (footer "Webpage ${
+ href "#Software#aristoteWebpage" "generated"
+ } with the help of ${href "https://nixos.org/" "Nix"} and ${
href "https://classless.de/" "Classless CSS"
}, and compressed with the help of ${
href "https://github.com/uncss/uncss" "uncss"
diff --git a/html/sections.nix b/html/sections.nix
index 2a571b6..4c4f0b0 100644
--- a/html/sections.nix
+++ b/html/sections.nix
@@ -15,4 +15,5 @@ in builtins.map makeSection [
./experience
# ./languages
./publications
+ ./software
]
diff --git a/html/software/default.nix b/html/software/default.nix
new file mode 100644
index 0000000..d0ed803
--- /dev/null
+++ b/html/software/default.nix
@@ -0,0 +1,28 @@
+{ html, data, lib, ... }:
+
+let
+ software = data.software;
+ format = softwarePiece:
+ with html;
+ with softwarePiece;
+ {
+ inherit id title abstract;
+ url = URL;
+ } // (let
+ authorsOther = lib.remove data.basics.name
+ (builtins.map (author: "${author.given} ${author.family}") author);
+ in lib.optionalAttrs (authorsOther != [ ]) {
+ authors = "With ${lib.concatStringsSep ", " authorsOther}";
+ });
+in {
+ title = "Software";
+ priority = 15;
+ body = with html;
+ dl (for (sort.byPath [ "title" ] software) (softwarePiece:
+ let formatted = format softwarePiece;
+ in with formatted;
+ lines [
+ (dt { id = "Software#${id}"; } (href { target = "_blank"; } url title))
+ (dd abstract)
+ ]));
+}