Compare commits

..

No commits in common. "aea7d44420b24810095d5c636aeeaf8d4e7696ef" and "1b3c8721ecda4de142f868ee990dede7a2819d74" have entirely different histories.

5 changed files with 13 additions and 20 deletions

20
flake.lock generated
View file

@ -12,11 +12,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1712079060, "lastModified": 1707830867,
"narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "1381a759b205dff7a6818733118d02253340fd5e", "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,11 +180,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712016346, "lastModified": 1711915616,
"narHash": "sha256-O2nO7pD+krq+4HgkLB4VThRtAucIPfXDs/jJqCGlK1w=", "narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4be0464472675212654dedf3e021bd5f1d58b92f", "rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +414,11 @@
"river": { "river": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1712003303, "lastModified": 1711462609,
"narHash": "sha256-RP8PxNti9MF4dIgfGCogiyyRW2+FfJu551jEGf2sbl0=", "narHash": "sha256-9+bBWOFQYJSvKkEIItRjiWkauId0NqD8wf3Gs1OFjtw=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "8b8ac27c4534f3989aa8c789bd282fa7f31597a8", "rev": "1946f284d590df1ba1261ca9303555e0197abfd8",
"revCount": 1226, "revCount": 1224,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/riverwm/river" "url": "https://github.com/riverwm/river"

View file

@ -14,7 +14,6 @@
extraConfig = '' extraConfig = ''
access_log /var/log/nginx/${name}_access.log; access_log /var/log/nginx/${name}_access.log;
error_log /var/log/nginx/${name}_error.log; error_log /var/log/nginx/${name}_error.log;
add_header Alt-Svc 'h3=":443"; ma=86400';
''; '';
}) })
); );

View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, ... }: { lib, config, ... }:
{ {
# set default options for virtualHosts # set default options for virtualHosts
options = with lib; { options = with lib; {
@ -8,13 +8,9 @@
# split up nginx access logs per vhost # split up nginx access logs per vhost
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
# enable http3 for all hosts
quic = true;
http3 = true;
extraConfig = '' extraConfig = ''
access_log /var/log/nginx/${name}_access.log; access_log /var/log/nginx/${name}_access.log;
error_log /var/log/nginx/${name}_error.log; error_log /var/log/nginx/${name}_error.log;
add_header Alt-Svc 'h3=":443"; ma=86400';
''; '';
}) })
); );
@ -22,14 +18,13 @@
}; };
config = { config = {
networking.firewall.allowedTCPPorts = [ 80 443 ]; networking.firewall.allowedTCPPorts = [ 80 443 ];
networking.firewall.allowedUDPPorts = [ 443 ];
services.nginx = { services.nginx = {
enable = true; enable = true;
package = pkgs.nginxQuic;
recommendedTlsSettings = true; recommendedTlsSettings = true;
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedGzipSettings = true; recommendedGzipSettings = true;
recommendedOptimisation = true; recommendedOptimisation = true;
# virtualHosts = lib.genAttrs v (name: { extraConfig = " lohustuff goes ith ${name}"; });
}; };
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;

View file

@ -163,7 +163,7 @@
networkConfig = { networkConfig = {
Address = "192.168.43.3/32"; Address = "192.168.43.3/32";
DNS = "192.168.43.1"; DNS = "192.168.43.1";
Domains = "~vpn.rfive.de ~43.168.192.in-addr.arpa"; Domains = "~vpn.rfive.de";
DNSSEC = false; DNSSEC = false;
BindCarrier = [ "wlp9s0" ]; BindCarrier = [ "wlp9s0" ];
}; };

View file

@ -31,7 +31,6 @@
# games # games
prismlauncher prismlauncher
superTuxKart superTuxKart
space-cadet-pinball
# cryptography # cryptography
yubikey-manager yubikey-manager