luftschleuse: updates

flake.lock

@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1645867939,
-        "narHash": "sha256-p3vHHMM5W6ojmStJqKpLvdnzxxKGG015U7OK6PJE8lo=",
+        "lastModified": 1645905972,
+        "narHash": "sha256-wP5R/s7JOQ8DWByflZreLfGwBTY6pzjEAT+Mrhd74U8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c7a13f76a78bb5c225ca5e08e9a109347d130792",
+        "rev": "ccd00e3c93b89b26ca86749cfe64b371e2dd7910",
         "type": "github"
       },
       "original": {
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1645883623,
-        "narHash": "sha256-qEVHqsxF0wMcaWfJFGEASWLcuYXMXE6LMdGoYW5KmcA=",
+        "lastModified": 1645914979,
+        "narHash": "sha256-YwWpN5+tC5hCzTWeJ2fxq90iPx9tbFczP6lBomBHH2k=",
         "owner": "muccc",
         "repo": "luftschleuse2",
-        "rev": "7aec79221fb6e388e9d946fca56bea2ff56e5349",
+        "rev": "2c763e5c5666e6611a83045130e3c44e1f9ae8cc",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1645883541,
-        "narHash": "sha256-rEyWMCwPKz/gOE3cchfgybcG/dDMKaV6jdG/hPtTiv0=",
+        "lastModified": 1645913264,
+        "narHash": "sha256-YLGXGxnRkr2ek51urTcJtH/xtH9vKOMYAW6lRXqpsxY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "064765b8ebaa6d894cdc1603fb7d2f35f297a2dd",
+        "rev": "a178e05ae83c1be86a12287c4a695ef2b76c32b0",
         "type": "github"
       },
       "original": {

luftschleuse.nix

@@ -54,8 +54,6 @@ in
     firewall.trustedInterfaces = [ "wlan0" "eth0" ];
   };
 
-  services.resolved.enable = false;
-
   systemd.network.networks."40-wlan0" = {
     linkConfig.RequiredForOnline = false;
   };
@@ -84,6 +82,13 @@ in
     users.root.openssh.authorizedKeys.keys = [
       # FIXME
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFJY+/tAXZFm9U+nJt0kKo6e/TrYiH7E49n0ktbuF5I6 fpletz@fpine"
+      # derchris
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLpCPJqrNGzWTtFGAox18Jyk13xfvd0ZlMRfyI5maBxRF+aSS9prX6l8OrXc+CLPGXlpwodi5tniAE7pfIqPQ6UnZDFuN/JKyaJ5I7ppMOqdkCbvxAOc/kLSsNAYXpOb1G9neE74JAHCa/z1lUyHTu/b4eyFzAdA8YmIeoN8HInQDUMgQ0OR6rRGAbDhi6oBi3I1gttBlLOFXCuSi9+sxWbRmT6pmtwzcxjlTIBVachh90sSY9tNir9QuPx4lrqrNnZgBOOFAjqYXCfjSZ9+Hkv9NFxa+r4aQ7uaTnqebqekvgCF37c1MKNEeuVsHVbDKEcJ3m5XttjoC/iV2A16CV"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP3VMGqSKqxQYbCTc1QPwTc3m8eHPSMqwUgE4D1k9Z95"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICsalcfDzctz5VN+BTYciykEsEOv0TfGYHAvkiPivVNC"
+      # schneider
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkQjXVf4bW5tqE9j3bh5buCVQeLVTJm3tpr0cvsPB5hxLjGhrCzD//7a4REwXp3QzWIzv2sKSl98IC6jOsD8zx1e8sHddgh3l+FltfLs+G7f1GOc5VjpKUlo+v5kZBdNyjbhzww/lQ7WKotvf/Kn1TpsuUdFjGfg384CfFKdr6/VuRybceLrzVMYcInM0mXYZViGvBn3Z66Oaaainc+DYN8v4cNpRbVj+IoCf+d03HReUbxqhl4t0Os9wTz9lC4uPXKzF+HVhixSOXVOd7qlWpHrZ2rK8JbOuCc2k8jAvOm5TfWIxhSUQAdlczETVTOhNvy1hyC67Al/sHvM9WHWJD"
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDe/Udd8U/ZBgGRfGT6nMYEs1aZ4NYjl55QeIrpHg3fb9xFHhJ6bFZyM6BVTeYroyvYRv1rXQLSYv7uzE7xa9WIznkjwyZUBH0WavWMlFds3YBER2UvFzJqu7989g1EWFTeEJM0tegkWFFwKtonVmnTdWVeWTdDWyIUlSLgpss/wxzStf22AmCXPH9AbQ3uWKRBqzSKeHq4mt9rcPXrhAbuY6g8/1yMBd2S25zm7jWFeQCXMOetniw2ugCF5TsUJEVBSxB4MGvUotUyugbEOzgIqOoBmUZ62x5FmqIZD9vcinbFlCX/grDtEbMQ60Re5LBU/95TVLiHH49fMdTo0jXF"
     ];
     users.open = {
       isNormalUser = true;
@@ -130,7 +135,15 @@ in
     wpa = false;
   };
 
-  systemd.services.lockd = let lockdCfg = pkgs.writeText "lockd.cfg" ''
+  services.nginx = {
+    enable = true;
+    virtualHosts."_" = {
+      root = "/nonexisting";
+      locations."/generate_204".extraConfig = "return 204;";
+    };
+  };
+
+  environment.etc."lockd.cfg".text = ''
     [Front Door]
     type = door
     address = A
@@ -176,11 +189,13 @@ in
     [Status Receiver]
     host = 127.0.0.1
     port = 2080
-  ''; in {
+  '';
+
+  systemd.services.lockd = {
     wantedBy = [ "multi-user.target" ];
     serviceConfig = {
       Restart = "always";
-      ExecStart = "${pkgs.luftschleuse2-lockd}/bin/lockd ${lockdCfg}";
+      ExecStart = "${pkgs.luftschleuse2-lockd}/bin/lockd /etc/lockd.cfg";
     };
   };
 }