From d2d9b6cd4cbf880f7b6fe57b237e9a3abd79c438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Mon, 13 Nov 2023 00:19:53 +0100 Subject: [PATCH] feat: enable website on frikandel --- flake.lock | 52 +++++++++++++--------------------- flake.nix | 1 + hosts/frikandel/email.nix | 2 +- hosts/frikandel/networking.nix | 9 +++--- hosts/frikandel/website.nix | 8 ++++-- hosts/pie/paperless.nix | 2 +- hosts/pie/unbound.nix | 8 +++--- 7 files changed, 37 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index e0fe935..2105e2b 100644 --- a/flake.lock +++ b/flake.lock @@ -158,11 +158,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1685972731, - "narHash": "sha256-VpwVUthxs3AFgvWxGTHu+KVDnS/zT3xkCtmjX2PjNQs=", + "lastModified": 1698410321, + "narHash": "sha256-MphuSlgpmKwtJncGMohryHiK55J1n6WzVQ/OAfmfoMc=", "owner": "numtide", "repo": "devshell", - "rev": "6b2554d28d46bfa6e24b941e999a145760dad0e1", + "rev": "1aed986e3c81a4f6698e85a7452cbfcc4b31a36e", "type": "github" }, "original": { @@ -259,11 +259,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -393,11 +393,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1699366904, - "narHash": "sha256-qqYGzBDz4kM7VombQ+RyagITTSSe4lj0ISdO2XH6Bfs=", + "lastModified": 1699821893, + "narHash": "sha256-YYF1RM+gqwr2VXjRGGLQQdceOZCzseDMQKG0znCHg/M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3ba49f85443cb2b6cd38353c1a66a2cd0ec5990", + "rev": "b0e3e12d6c672ed87dd5a02501cc00c5412b1181", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1699169573, - "narHash": "sha256-cvUb1xZkvOp3W2SzylStrTirhVd9zCeo5utJl9nSIhw=", + "lastModified": 1699596684, + "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aeefe2054617cae501809b82b44a8e8f7be7cc4b", + "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", "type": "github" }, "original": { @@ -455,22 +455,6 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1693158576, - "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "adblock-unbound": "adblock-unbound", @@ -494,14 +478,16 @@ "deno2nix": "deno2nix", "devshell": "devshell_2", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nixpkgs-unstable" + ] }, "locked": { - "lastModified": 1696968123, - "narHash": "sha256-rqF0d9Ms6oucPgQFIIsDpITheyq68J0eKouQ17PTH7c=", + "lastModified": 1699822578, + "narHash": "sha256-+HO37PHDfJ/pv6NSEE7Yk8b0X22bCZbdP1v2sFnEo9c=", "ref": "refs/heads/main", - "rev": "cd6e1aa84c62e6be287867d07b83322f670e2193", - "revCount": 12, + "rev": "8d2f814a0ab37e8af2abaf95c6776771603cfc88", + "revCount": 13, "type": "git", "url": "https://git.pub.solar/b12f/scan2paperless.git" }, diff --git a/flake.nix b/flake.nix index 3d02509..b3feb3b 100644 --- a/flake.nix +++ b/flake.nix @@ -31,6 +31,7 @@ mobile-nixos.flake = false; scan2paperless.url = "git+https://git.pub.solar/b12f/scan2paperless.git"; + scan2paperless.inputs.nixpkgs.follows = "nixpkgs-unstable"; musnix.url = "github:musnix/musnix"; diff --git a/hosts/frikandel/email.nix b/hosts/frikandel/email.nix index a43a99d..19e509b 100644 --- a/hosts/frikandel/email.nix +++ b/hosts/frikandel/email.nix @@ -7,7 +7,7 @@ age.secrets."mail@b12f.io-password" = { file = "${flake.self}/secrets/mail@b12f.io-password.age"; mode = "400"; - owner = "maddy"; + # owner = "maddy"; }; services.caddy.virtualHosts = { diff --git a/hosts/frikandel/networking.nix b/hosts/frikandel/networking.nix index f1d382e..3090cb0 100644 --- a/hosts/frikandel/networking.nix +++ b/hosts/frikandel/networking.nix @@ -8,10 +8,10 @@ networking.hostName = "frikandel"; networking.hostId = "44234773"; networking.nameservers = [ - "193.110.81.0#dns0.eu" - "2a0f:fc80::#dns0.eu" - "185.253.5.0#dns0.eu" - "2a0f:fc81::#dns0.eu" + "193.110.81.0" #dns0.eu + "2a0f:fc80::" #dns0.eu + "185.253.5.0" #dns0.eu + "2a0f:fc81::" #dns0.eu ]; services.openssh.openFirewall = true; @@ -35,6 +35,7 @@ # Caddy reverse proxy for local services like cups services.caddy = { + enable = true; globalConfig = '' default_bind 128.140.109.213 2a01:4f8:c2c:b60:: # auto_https off diff --git a/hosts/frikandel/website.nix b/hosts/frikandel/website.nix index 8240cf4..4fa28bc 100644 --- a/hosts/frikandel/website.nix +++ b/hosts/frikandel/website.nix @@ -5,7 +5,7 @@ }: let bbeu = pkgs.stdenv.mkDerivation { name = "benjaminbaedorf.eu"; - src = builtins.fetchgit { + src = pkgs.fetchgit { url = "https://git.pub.solar/b12f/benjaminbaedorf.eu.git"; sparseCheckout = [ "fonts" @@ -14,8 +14,12 @@ "index.html" "public-pgp-benjamin-baedorf.asc" ]; - hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + hash = "sha256-c5nU9zqrHgD+dCXdXXcS9xJIaGueyXQpuwSqv0aSLM0="; }; + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; }; in { services.caddy.virtualHosts = { diff --git a/hosts/pie/paperless.nix b/hosts/pie/paperless.nix index 5b17cdc..52eb804 100644 --- a/hosts/pie/paperless.nix +++ b/hosts/pie/paperless.nix @@ -33,7 +33,7 @@ in { }; users.users."${psCfg.user.name}".packages = with pkgs; [ - scan2paperless + # scan2paperless sane-backends python310Packages.img2pdf ]; diff --git a/hosts/pie/unbound.nix b/hosts/pie/unbound.nix index 1ac1fcd..dba6948 100644 --- a/hosts/pie/unbound.nix +++ b/hosts/pie/unbound.nix @@ -65,10 +65,10 @@ { name = "."; forward-addr = [ - "193.110.81.0#dns0.eu" - "2a0f:fc80::#dns0.eu" - "185.253.5.0#dns0.eu" - "2a0f:fc81::#dns0.eu" + "193.110.81.0" #dns0.eu + "2a0f:fc80::" #dns0.eu + "185.253.5.0" #dns0.eu + "2a0f:fc81::" #dns0.eu ]; forward-tls-upstream = "yes"; }