diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/common/networking.nix | 11 | ||||
| -rw-r--r-- | modules/games/lutris.nix | 4 | ||||
| -rw-r--r-- | modules/monitoring/default.nix | 3 | ||||
| -rw-r--r-- | modules/nsd.nix | 2 | ||||
| -rw-r--r-- | modules/profiles/dev/default.nix | 2 | ||||
| -rw-r--r-- | modules/wireguard.nix | 29 |
6 files changed, 22 insertions, 29 deletions
diff --git a/modules/common/networking.nix b/modules/common/networking.nix index d7baa6c..468bd8b 100644 --- a/modules/common/networking.nix +++ b/modules/common/networking.nix @@ -97,17 +97,8 @@ in } ) (lib.mkIf this.isHeadful { - interfaces.eth0.useDHCP = lib.mkDefault true; - networkmanager = { - enable = lib.mkDefault true; - unmanaged = [ - "type:amneziawg" - "type:bridge" - "type:ethernet" - "type:loopback" - "type:wireguard" - ]; + enable = true; plugins = lib.mkForce [ ]; wifi.backend = "iwd"; }; diff --git a/modules/games/lutris.nix b/modules/games/lutris.nix index 62fe521..d926971 100644 --- a/modules/games/lutris.nix +++ b/modules/games/lutris.nix @@ -22,10 +22,12 @@ in (lutris.override { extraPkgs = _: [ vkBasalt - wine + wine-staging winetricks ]; }) + wine-staging + winetricks ]; }; } diff --git a/modules/monitoring/default.nix b/modules/monitoring/default.nix index 6e5b782..a3e57d3 100644 --- a/modules/monitoring/default.nix +++ b/modules/monitoring/default.nix @@ -166,6 +166,7 @@ in promtail = { hosts = [ manwe + tulkas varda yavanna ]; @@ -182,6 +183,7 @@ in endlessh-go = { hosts = [ manwe + tulkas varda yavanna ]; @@ -197,6 +199,7 @@ in node = { hosts = [ manwe + tulkas varda yavanna ]; diff --git a/modules/nsd.nix b/modules/nsd.nix index 1399b5d..acf7e27 100644 --- a/modules/nsd.nix +++ b/modules/nsd.nix @@ -134,6 +134,8 @@ in subdomains = rec { manwe = ips "manwe"; "*.manwe" = manwe; + tulkas = ips "tulkas"; + "*.tulkas" = tulkas; varda = ips "varda"; "*.varda" = varda; yavanna = ips "yavanna"; diff --git a/modules/profiles/dev/default.nix b/modules/profiles/dev/default.nix index bc761f5..4d85168 100644 --- a/modules/profiles/dev/default.nix +++ b/modules/profiles/dev/default.nix @@ -59,6 +59,7 @@ in packages = with pkgs; [ age + dbeaver-bin distrobox google-cloud-sdk htmlq @@ -71,6 +72,7 @@ in nixpkgs-review scaleway-cli sops + sqlitebrowser toolbox vultr-cli yq diff --git a/modules/wireguard.nix b/modules/wireguard.nix index dcd7858..5138946 100644 --- a/modules/wireguard.nix +++ b/modules/wireguard.nix @@ -20,6 +20,14 @@ let ${resolvectl} dnssec ${cfg.interface} no ${resolvectl} dnsovertls ${cfg.interface} no ''; + + extraOptions = { + jc = 228; + jmin = 42; + jmax = 420; + s1 = 69; + s2 = 96; + }; in { disabledModules = [ @@ -149,13 +157,7 @@ in "${ipv4.address}/16" "${ipv6.address}/16" ]; - extraInterfaceConfig = '' - jc = 228 - jmin = 42 - jmax = 420 - s1 = 69 - s2 = 96 - ''; + inherit extraOptions; }) (with cfg.server; { peers = [ @@ -221,17 +223,8 @@ in "${ipv4.address}/16" ]; listenPort = port; - inherit peers; - postSetup = - DNSSetup - + '' - awg set ${cfg.interface} \ - jc 228 \ - jmin 42 \ - jmax 420 \ - s1 69 \ - s2 96 - ''; + inherit peers extraOptions; + postSetup = DNSSetup; allowedIPsAsRoutes = false; }; }; |