diff --git a/flake.lock b/flake.lock index 084e519..6aa56cf 100644 --- a/flake.lock +++ b/flake.lock @@ -528,11 +528,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1669293824, - "narHash": "sha256-LKKlmFM+B4B2Mzn4nXNOTnaHMAzGeHVAPvA5dFhboh0=", + "lastModified": 1669553481, + "narHash": "sha256-wdOiCpzYaFhUjkIo9mYcCvlO3kX0mknrqRp04788cHI=", "owner": "mrVanDalo", "repo": "landingpage", - "rev": "fd81a841fd1f8a57b8800fff260eed5e2ea96a0b", + "rev": "81d1e854cc3c86890218d18f043dd1427fbcfa13", "type": "github" }, "original": { diff --git a/nixos/machines/robi/nginx.nix b/nixos/machines/robi/nginx.nix index 347f7b1..eb3619d 100644 --- a/nixos/machines/robi/nginx.nix +++ b/nixos/machines/robi/nginx.nix @@ -43,19 +43,69 @@ in forceSSL = true; enableACME = true; extraConfig = error.extraConfig; - root = "/srv/www/ingolf-wagner.de"; locations = { - "/" = { }; + "/" = { + root = pkgs.landingpage.override { + jsonConfig = [ + { + title = "Ingolf Wagner"; + text = '' + I'm a freelancing mathematician, musician and programmer. + + My PGP fingerprint is 42AC 51C9 482D 0834 CF48 8AF1 389E C2D6 4AC7 1EAC + ''; + } + { + text = '' + Here are some of my projects you might enjoy: + ''; + items = [ + { + label = "terranix"; + href = "https://terranix.org"; + image = "https://raw.githubusercontent.com/terranix/terranix-artwork/main/terranix-logo.svg"; + } + { + label = "Sononym"; + href = "https://www.sononym.net/"; + image = "https://www.sononym.net/press/logos/sononym-logo-symbol-black.png"; + } + { + label = "LandingPage"; + href = "https://github.com/mrVanDalo/landingpage"; + image = "https://media.giphy.com/media/2vNGq1w3nsJri/giphy.gif"; + } + { + label = "My Blog"; + href = "https://tech.ingolf-wagner.de/"; + image = "https://media.giphy.com/media/11I8v5lE8uq79C/giphy.gif"; + } + ]; + } + ]; + title = "Ingolf Wagner"; + max-width = "1010px"; + background-color = "#FEFAE0"; + title-color = "black"; + title-background-color = "#E9EDC9"; + text-color = "black"; + text-background-color = "#FAEDCD"; + item-color = "black"; + item-background-color = "#E9EDC9"; + image-width = "250px"; + image-height = "200px"; + }; + }; "= /palo.pgp" = { - alias = pkgs.writeText "key" (lib.fileContents ../../assets/pgp.key); + root = pkgs.writeText "key" (lib.fileContents ../../assets/pgp.key); }; "= /palo.gpg" = { - alias = pkgs.writeText "key" (lib.fileContents ../../assets/pgp.key); + root = pkgs.writeText "key" (lib.fileContents ../../assets/pgp.key); }; "= /palo_rsa.pub" = { - alias = pkgs.writeText "key" (lib.fileContents ../../assets/ssh/palo_rsa.pub); + root = pkgs.writeText "key" (lib.fileContents ../../assets/ssh/palo_rsa.pub); }; - } // error.locations; + }; }; # "stable-diffusion.ingolf-wagner.de" = { diff --git a/nixos/system/all/nginx-landingpage.nix b/nixos/system/all/nginx-landingpage.nix index 2eb6a43..8131d04 100644 --- a/nixos/system/all/nginx-landingpage.nix +++ b/nixos/system/all/nginx-landingpage.nix @@ -5,6 +5,7 @@ locations."/" = { root = pkgs.landingpage.override { jsonConfig = [ + { title = "System Links"; } { text = "Syncthings"; items = map @@ -30,7 +31,7 @@ ]); } { - text = "Various Links"; + title = "Various Links"; items = [ { label = "NeverSSL"; @@ -64,7 +65,7 @@ ]; } { - text = "NixOS"; + text = "NixOS Links"; items = [ { label = "NixOS Manual"; @@ -118,6 +119,7 @@ } ]; } + { urlEncode = true; } ]; }; };