diff --git a/hosts/falkenstein/modules/dns/default.nix b/hosts/falkenstein/modules/dns/default.nix index e9dfcda..9ce1dd3 100644 --- a/hosts/falkenstein/modules/dns/default.nix +++ b/hosts/falkenstein/modules/dns/default.nix @@ -33,6 +33,7 @@ let (spf.soft [ "mx" ]) ]; + subdomains = let getVirtualHosts = hostname: map (name: builtins.substring 0 (builtins.stringLength name - (builtins.stringLength domain + 1)) name) (builtins.attrNames self.nixosConfigurations."${hostname}".config.services.caddy.virtualHosts); @@ -54,6 +55,7 @@ let mail = falkenstein; _dmarc.TXT = [ "v=DMARC1; p=none; adkim=s; fo=1; rua=mailto:dmarc@rfive.de; ruf=mailto:dmarc@rfive.de" ]; _domainkey.subdomains.rspamd.TXT = [ "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoirUMubro4nlmY6a8JMwK9QB2agAXiJzexDU/7ba6KCggONfoSTfUHlrM/XeM1GG/9oKpngApxDPP97adJuxc8/EELyo4HjTyYD8GBFZhg0AN7V8IPaJ1o5k6dGDk8ZLh41ZCnlAVWkhVSKs5pYtzkrlJIfUSzyuoe8nuFsVe3QIDAQAB" ]; + "_acme-challenge.*".CNAME = [ "challenge.acme.rfive.de" ]; } (builtins.removeAttrs (genCNAMEs "nuc") [ ":2018" ]) (builtins.removeAttrs (genCNAMEs "falkenstein") [ "mail" ":2018" ]) diff --git a/overlays/default.nix b/overlays/default.nix index 51143f3..871c5cb 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,6 @@ _final: prev: let inherit (prev) callPackage; - inherit (prev) fetchFromGitHub; inherit (prev) fetchpatch; in { @@ -12,6 +11,7 @@ in rm $out/share/applications/pcmanfm-desktop-pref.desktop ''; }); + # fix slow escape key zsh-vi-mode = prev.zsh-vi-mode.overrideAttrs (_: { patches = [ (fetchpatch { @@ -24,31 +24,7 @@ in ianny = callPackage ../pkgs/ianny { }; tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; }; - zsh-fzf-tab = prev.zsh-fzf-tab.overrideAttrs (_: rec { - version = "1.1.1"; - src = fetchFromGitHub { - owner = "Aloxaf"; - repo = "fzf-tab"; - rev = "v${version}"; - sha256 = "sha256-0/YOL1/G2SWncbLNaclSYUz7VyfWu+OB8TYJYm4NYkM="; - }; - - }); - gnome-break-timer = callPackage ../pkgs/gnome-break-timer { }; jmri = callPackage ../pkgs/jmri { }; adguardian-term = callPackage ../pkgs/adguardian-term { }; - python312 = prev.python312.override { - packageOverrides = _final: prev: { - pysaml2 = prev.pysaml2.overridePythonAttrs (orig: { - disabledTests = - orig.disabledTests - ++ [ - "test_encrypted_response_6" - "test_validate_cert_chains" - "test_validate_with_root_cert" - ]; - }); - }; - }; }