diff options
| -rw-r--r-- | default.nix | 3 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | html/basics/default.nix | 132 |
3 files changed, 79 insertions, 62 deletions
diff --git a/default.nix b/default.nix index 00cd9e7..7753a76 100644 --- a/default.nix +++ b/default.nix @@ -117,6 +117,7 @@ stdenvNoCC.mkDerivation { ${mkPushDir "css"} # $out/static/css/ ${nixEvalExpr} " ${make} $src/css/classless.nix ({ + width = \"51rem\"; big-first-letter = true; details-cards = true; grid = true; @@ -132,7 +133,7 @@ stdenvNoCC.mkDerivation { | ${compress} --type css >classless.min.css rm classless.css ${mkPushDir "fonts/line-awesome"} # $out/static/css/fonts/lineawesome - ln -s ${line-awesome}/share/fonts/woff2 webfonts + ln -s ${line-awesome.webfont or line-awesome}/share/fonts/woff2 webfonts ${clean} $out/index.html --stylesheets file://${line-awesome-css} \ | ${compress} --type css >line-awesome.min.css @@ -7,10 +7,10 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1791129080, - "narHash": "sha256-YCms4iXe7rUJQszZ0V+b/HJzgVnRBLtpl40jmZGMW+I=", + "lastModified": 1791130418, + "narHash": "sha256-QqJnYOg+jNiGb5wtgiNa3wP2sEyVC63N9RRF+H4w1wA=", "ref": "refs/heads/master", - "rev": "89493b0c98df1de4ed74d7e51f26df615f3e268b", + "rev": "0842beec0fc2c9955361e0d3b5d7711b3875c4c7", "revCount": 131, "type": "git", "url": "https://git.aristote.fr/about-me/info" diff --git a/html/basics/default.nix b/html/basics/default.nix index 55517f4..9909053 100644 --- a/html/basics/default.nix +++ b/html/basics/default.nix @@ -3,74 +3,90 @@ data, lib, ... -}: let - basics = - data.basics - // { - fullname = with data.basics.name; "${first} ${last}"; - }; +}: +let + basics = data.basics // { + fullname = with data.basics.name; "${first} ${last}"; + }; col = html.div { class = "col"; style = "align-self: center"; }; - center = container: content: - container {style = "text-align: center";} content; + center = container: content: container { style = "text-align: center"; } content; icon-lab = name: html.icon "lab la-${name}"; -in { +in +{ title = "About me"; priority = 0; - body = with html; - with basics; [ - br - (div {class = "row";} [ - (col [ - (imgWith { - src = avatar; - srcset = - lib.concatStringsSep ", " - (builtins.map (size: "${avatar}.${size} ${size}w") [ + body = + with html; + with basics; + [ + br + (div { class = "row"; } [ + (col [ + (imgWith { + src = avatar; + srcset = lib.concatStringsSep ", " ( + builtins.map (size: "${avatar}.${size} ${size}w") [ "128" "256" "512" ] - ++ ["${avatar} 934w"]); - sizes = "(max-width: 480px) 60vw, 30vw"; - alt = fullname; - style = '' - aspect-ratio: 1 / 1; - border-radius: 50%; - margin: auto; - display: block; - ''; - }) - (center h3 fullname) - (center p (with institution; [position wbr "@ ${href url name}"])) + ++ [ "${avatar} 934w" ] + ); + sizes = "(max-width: 480px) 60vw, 30vw"; + alt = fullname; + style = '' + aspect-ratio: 1 / 1; + border-radius: 50%; + margin: auto; + display: block; + ''; + }) + (center h3 fullname) + (center p ( + with institution; + [ + field + br + position + "@ ${href url name}" + ] + )) + ]) + (col (dl [ + (dt "${icon "las la-at"} e-mail") + (dd (lib.mapAttrsToList (name: value: "${mailto value} (${name}) ${br}") email)) + (dt "${icon "las la-key"} keys") + (dd (for keys.pgp (name: path: href path name))) + (dt "${icon "las la-map-marker"} address") + (dd ( + with location; + '' + Office ${office}${br} + ${number} ${street}${br} + ${postalCode} ${city} + '' + )) + (dt "${icon "las la-globe"} online") + (dd ( + for profiles ( + name: value: + with value; + "${icon-lab icon} ${ + if value ? url then + href url name + else + "${name}: ${ + lines (for profiles (name: value: with value; "${icon-lab icon} ${href url name}")) + } ${br}" + }" + ) + )) + (dt "") + ])) ]) - (col (dl [ - (dt "${icon "las la-at"} e-mail") - (dd - (lib.mapAttrsToList (name: value: "${mailto value} (${name}) ${br}") - email)) - (dt "${icon "las la-key"} keys") - (dd (for keys.pgp (name: path: href path name))) - (dt "${icon "las la-map-marker"} address") - (dd (with location; '' - Office ${office}${br} - ${number} ${street}${br} - ${postalCode} ${city} - '')) - (dt "${icon "las la-globe"} online") - (dd (for profiles (name: value: - with value; "${icon-lab icon} ${ - if value ? url - then href url name - else "${name}: ${ - lines (for profiles (name: value: - with value; "${icon-lab icon} ${href url name}")) - } ${br}" - }"))) - ])) - ]) - description - ]; + (p { style = "text-align: justify"; } description) + ]; } |