dns: cleanup

flake.lock

@@ -180,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711133180,
-        "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
+        "lastModified": 1711625603,
+        "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
+        "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
         "type": "github"
       },
       "original": {
@@ -296,11 +296,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711163522,
-        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
+        "lastModified": 1711523803,
+        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
+        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
         "type": "github"
       },
       "original": {
@@ -414,11 +414,11 @@
     "river": {
       "flake": false,
       "locked": {
-        "lastModified": 1711393006,
-        "narHash": "sha256-vwOJIc2gUUa8MuiEzV/phB2sAl5pWdC6mnivNimmXqk=",
+        "lastModified": 1711462609,
+        "narHash": "sha256-9+bBWOFQYJSvKkEIItRjiWkauId0NqD8wf3Gs1OFjtw=",
         "ref": "refs/heads/master",
-        "rev": "4d0315b56596868d5ae39d18fe74d8be5c4ac50d",
-        "revCount": 1220,
+        "rev": "1946f284d590df1ba1261ca9303555e0197abfd8",
+        "revCount": 1224,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/riverwm/river"

flake.nix

@@ -64,7 +64,6 @@
     , purge
     , trucksimulatorbot
     , pfersel
-    , river
     , ...
     }@attrs: {
       packages.x86_64-linux = {

hosts/falkenstein/modules/dns/default.nix

@@ -6,7 +6,7 @@ let
     $ORIGIN rfive.de.
 
     rfive.de.   86400  IN  SOA ns.rfive.de. hostmaster.rfive.de. (
-      2024031014 ; serial
+      2024032601 ; serial
       10800      ; refresh
       3600       ; retry
       604800     ; expire
@@ -42,8 +42,6 @@ let
     rspamd._domainkey TXT "v=DKIM1; k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoirUMubro4nlmY6a8JMwK9QB2agAXiJzexDU/7ba6KCggONfoSTfUHlrM/XeM1GG/9oKpngApxDPP97adJuxc8/EELyo4HjTyYD8GBFZhg0AN7V8IPaJ1o5k6dGDk8ZLh41ZCnlAVWkhVSKs5pYtzkrlJIfUSzyuoe8nuFsVe3QIDAQAB"
     _dmarc            TXT "v=DMARC1; p=none; adkim=s; fo=1; rua=mailto:dmarc@rfive.de; ruf=mailto:dmarc@rfive.de"
 
-    _discord          TXT "dh=0bcca75b0a56c304f0c23fbdb3f12009411e8c0c"
-
     cache      CNAME nuc.rfive.de.
     chat       CNAME nuc.rfive.de.
     matrix     CNAME nuc.rfive.de.

hosts/falkenstein/modules/logging/default.nix

@@ -18,9 +18,6 @@
       delaycompress
       weekly
       rotate 156
-      dateext
-      dateformat .%Y-%m-%d
-      extension log
     }
     "/var/log/nginx/*.log" {
       compress

hosts/thinkpad/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
 
   imports =

overlays/default.nix

@@ -10,13 +10,6 @@ in
   pww = callPackage ../pkgs/pww { };
   ianny = callPackage ../pkgs/ianny { };
 
-  fprintd = prev.fprintd.overrideAttrs (_: {
-    mesonCheckFlags = [
-      "--no-suite"
-      "fprintd:TestPamFprintd"
-    ];
-  });
-
   tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
   imv = prev.imv.override {
     # freeimage is broken

shared/activation.nix

@@ -9,8 +9,8 @@
     F_BOLD="\033[1m"
     C_RED="\033[38;5;9m"
     ${pkgs.diffutils}/bin/cmp --silent \
-      <(readlink /run/current-system/{initrd,kernel,kernel-modules}) \
-      <(readlink $systemConfig/{initrd,kernel,kernel-modules}) \
+      <(readlink /run/current-system/{kernel,kernel-modules}) \
+      <(readlink $systemConfig/{kernel,kernel-modules}) \
       || echo -e "''${F_BOLD}''${C_RED}Kernel version changed, reboot is advised.''${NO_FORMAT}"
   '';
 }