Compare commits

...

5 commits

7 changed files with 34 additions and 19 deletions

18
flake.lock generated
View file

@ -180,11 +180,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705879479, "lastModified": 1706134977,
"narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=", "narHash": "sha256-KwNb1Li3K6vuVwZ77tFjZ89AWBo7AiCs9t0Cens4BsM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913", "rev": "6359d40f6ec0b72a38e02b333f343c3d4929ec10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -296,11 +296,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1705677747, "lastModified": 1705856552,
"narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -488,11 +488,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705882164, "lastModified": 1705882231,
"narHash": "sha256-HAjEar8nN4HtOTEeA6LRjq40SPS84YWrfXMBBh7jCF8=", "narHash": "sha256-OyWYOsl876tAJ443p9lKSDIrBtq80JZ/OlmrVVdIHF4=",
"owner": "therealr5", "owner": "therealr5",
"repo": "TruckSimulatorBot", "repo": "TruckSimulatorBot",
"rev": "b59e230bdec747dbff7e15447cf68791a31c323f", "rev": "9ae3c21b72b1f49f0b15808eb61b10600e00a845",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -12,6 +12,10 @@ let
/^\s*X-Originating-IP/ IGNORE /^\s*X-Originating-IP/ IGNORE
/^\s*Mime-Version/ IGNORE /^\s*Mime-Version/ IGNORE
''; '';
login_maps = pkgs.writeText "login_maps.pcre" ''
# basic username => username@rfive.de
/^([^@+]*)(\+[^@]*)?@rfive\.de$/ ''${1}
'';
in in
{ {
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
@ -93,6 +97,10 @@ in
"permit_mynetworks" "permit_mynetworks"
"reject_unauth_destination" "reject_unauth_destination"
]; ];
smtpd_sender_restrictions = [
"reject_authenticated_sender_login_mismatch"
];
smtpd_sender_login_maps = [ "pcre:${login_maps}" ];
smtp_header_checks = "pcre:${header_cleanup}"; smtp_header_checks = "pcre:${header_cleanup}";
alias_maps = [ "hash:/etc/aliases" ]; alias_maps = [ "hash:/etc/aliases" ];

View file

@ -27,6 +27,9 @@ in
enable = true; enable = true;
configureRedisLocally = true; configureRedisLocally = true;
extraConfigFiles = [ config.age.secrets."matrix/shared".path ]; extraConfigFiles = [ config.age.secrets."matrix/shared".path ];
log = {
root.level = "WARNING";
};
settings = { settings = {
server_name = config.networking.domain; server_name = config.networking.domain;

View file

@ -14,7 +14,8 @@
}; };
services.resolved = { services.resolved = {
enable = true; enable = true;
dnssec = "true"; # dnssec is broken
# dnssec = "true";
fallbackDns = [ fallbackDns = [
"9.9.9.9" "9.9.9.9"
"149.112.112.112" "149.112.112.112"

View file

@ -10,7 +10,7 @@ in
enable = true; enable = true;
enabledCollectors = [ "systemd" ]; enabledCollectors = [ "systemd" ];
}; };
postgres.enable = true; # postgres.enable = true;
}; };
scrapeConfigs = [ scrapeConfigs = [
{ {
@ -21,14 +21,14 @@ in
} }
]; ];
} }
{ # {
job_name = "postgres"; # job_name = "postgres";
static_configs = [ # static_configs = [
{ # {
targets = [ "127.0.0.1:${toString exportersConfig.postgres.port}" ]; # targets = [ "127.0.0.1:${toString exportersConfig.postgres.port}" ];
} # }
]; # ];
} # }
]; ];
}; };

View file

@ -5,6 +5,7 @@
lldb lldb
rust-analyzer rust-analyzer
rnix-lsp rnix-lsp
typst-lsp
(python3.withPackages (ps: with ps; [ (python3.withPackages (ps: with ps; [
pyls-isort pyls-isort
pylsp-mypy pylsp-mypy

View file

@ -53,6 +53,7 @@
mosh mosh
ansible ansible
plover.dev plover.dev
typst
# programming languages # programming languages
cargo cargo
@ -63,6 +64,7 @@
nodejs_20 nodejs_20
gnumake gnumake
go go
just
]; ];