diff --git a/flake.lock b/flake.lock index c033a61..402ce88 100644 --- a/flake.lock +++ b/flake.lock @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1711625603, - "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", + "lastModified": 1711133180, + "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", + "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -414,11 +414,11 @@ "river": { "flake": false, "locked": { - "lastModified": 1711462609, - "narHash": "sha256-9+bBWOFQYJSvKkEIItRjiWkauId0NqD8wf3Gs1OFjtw=", + "lastModified": 1711393006, + "narHash": "sha256-vwOJIc2gUUa8MuiEzV/phB2sAl5pWdC6mnivNimmXqk=", "ref": "refs/heads/master", - "rev": "1946f284d590df1ba1261ca9303555e0197abfd8", - "revCount": 1224, + "rev": "4d0315b56596868d5ae39d18fe74d8be5c4ac50d", + "revCount": 1220, "submodules": true, "type": "git", "url": "https://github.com/riverwm/river" diff --git a/flake.nix b/flake.nix index 638246f..45d3cef 100644 --- a/flake.nix +++ b/flake.nix @@ -64,6 +64,7 @@ , purge , trucksimulatorbot , pfersel + , river , ... }@attrs: { packages.x86_64-linux = { diff --git a/hosts/falkenstein/modules/dns/default.nix b/hosts/falkenstein/modules/dns/default.nix index eb4e333..d39e6ad 100644 --- a/hosts/falkenstein/modules/dns/default.nix +++ b/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. ( - 2024032601 ; serial + 2024031014 ; serial 10800 ; refresh 3600 ; retry 604800 ; expire @@ -42,6 +42,8 @@ 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. diff --git a/hosts/falkenstein/modules/logging/default.nix b/hosts/falkenstein/modules/logging/default.nix index c242396..fc5d53a 100644 --- a/hosts/falkenstein/modules/logging/default.nix +++ b/hosts/falkenstein/modules/logging/default.nix @@ -18,6 +18,9 @@ delaycompress weekly rotate 156 + dateext + dateformat .%Y-%m-%d + extension log } "/var/log/nginx/*.log" { compress diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 1b76984..9ddc15f 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: { imports = diff --git a/overlays/default.nix b/overlays/default.nix index 10286f4..d572f2d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -10,6 +10,13 @@ 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 diff --git a/shared/activation.nix b/shared/activation.nix index 46c545d..3971674 100644 --- a/shared/activation.nix +++ b/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/{kernel,kernel-modules}) \ - <(readlink $systemConfig/{kernel,kernel-modules}) \ + <(readlink /run/current-system/{initrd,kernel,kernel-modules}) \ + <(readlink $systemConfig/{initrd,kernel,kernel-modules}) \ || echo -e "''${F_BOLD}''${C_RED}Kernel version changed, reboot is advised.''${NO_FORMAT}" ''; }