summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Aristote <quentin@aristote.fr>2023-02-19 22:46:36 +0100
committerQuentin Aristote <quentin@aristote.fr>2023-02-19 23:10:51 +0100
commit704a01088c83b35263475c40feff92c5d2b4b2b0 (patch)
tree0526585ce26b2dcece5a477ba01971e2f2c20afc
parentfbfd89cc0b9f4146c2b4db5d1ab829ef2411c4bc (diff)
web: quentin: Ensure text remains visible during webfont load
-rw-r--r--config/services/web/quentin/default.nix5
-rw-r--r--flake.lock12
-rw-r--r--flake.nix4
3 files changed, 13 insertions, 8 deletions
diff --git a/config/services/web/quentin/default.nix b/config/services/web/quentin/default.nix
index c4f1f44..f68e71c 100644
--- a/config/services/web/quentin/default.nix
+++ b/config/services/web/quentin/default.nix
@@ -3,7 +3,10 @@
{
services.nginx.virtualHosts.quentin = {
serverName = "quentin.${config.networking.domain}";
- locations."/".root = "${pkgs.personal.webpage}";
+ locations."/".root = "${pkgs.personal.webpage.override {
+ line-awesome-css =
+ pkgs.personal.line-awesome-css.override { fontDisplay = "swap"; };
+ }}";
forceSSL = true;
enableACME = true;
};
diff --git a/flake.lock b/flake.lock
index fdc6f17..a3f6ca0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,11 +44,11 @@
"nur": "nur"
},
"locked": {
- "lastModified": 1676822972,
- "narHash": "sha256-Duxvn4bUTG0n03KO3cxvqThtEk1e6FfLdGXJLKrOV8c=",
+ "lastModified": 1676843836,
+ "narHash": "sha256-30WfZurSQ3N/H57jMPo8oWZorDYDx5KRHvoARn7iqFQ=",
"owner": "qaristote",
"repo": "my-nixpkgs",
- "rev": "7b29378f133ed49c341d996698bb1207edc950a4",
+ "rev": "b3b7572e3655eaa6f29c4ce14aa08c08b82e1cd0",
"type": "github"
},
"original": {
@@ -91,11 +91,11 @@
},
"nur": {
"locked": {
- "lastModified": 1676820779,
- "narHash": "sha256-/EmCS02RHZbpOXLuv+iItYkice2/yjsSq2r0yAKenHE=",
+ "lastModified": 1676835938,
+ "narHash": "sha256-ZCrtBSXouMv+GfHC4hqn2lFfDkcC1/jdbTQzDcE9nTk=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "776010dc73870aa36e322411c47ede8155e1b2dd",
+ "rev": "cdcd1c22a21f63bd6e7be554b950dcde420ccd2e",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 30c5114..f01142a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,8 +17,10 @@
my-nixpkgs.nixosModules.personal
({ ... }: {
nixpkgs.overlays = [
- my-nixpkgs.overlays.personal
personal-webpage.overlays.default
+ # TODO the order shouldn't matter, yet this overlay doesn't work
+ # if it comes first
+ my-nixpkgs.overlays.default
(_: prev: {
inherit (nixpkgs-unstable.legacyPackages."${prev.system}")
filtron;