diff options
| author | Max Audron <audron@cocaine.farm> | 2025-10-23 18:53:46 +0200 |
|---|---|---|
| committer | Max Audron <audron@cocaine.farm> | 2025-10-23 18:53:46 +0200 |
| commit | 62e2633b5a9e39abeafb2b8bdfd42f09dfe3ec6d (patch) | |
| tree | fd3cdbeaba5eca976e8d8bc7ede10fd9741e3c36 | |
| parent | deploy soulseek and fix tlmp VPN (diff) | |
uh
| -rw-r--r-- | flake.nix | 3 | ||||
| -rw-r--r-- | modules/common/default.nix | 32 | ||||
| -rw-r--r-- | modules/powerdns/default.nix | 2 | ||||
| -rw-r--r-- | modules/tlmp/proxy.rules | 3 |
4 files changed, 31 insertions, 9 deletions
@@ -113,6 +113,9 @@ monitoring monitoring-node homepage + { + services.nginx.virtualHosts."musicbrainz.vapor.systems" = (self.lib.nginx.proxyDomain "vapor.systems" "http://127.0.0.1:5000/"); + } ]; phaenn = mkSystem [ (import ./machines/phaenn) diff --git a/modules/common/default.nix b/modules/common/default.nix index 5a6497a..cfd9502 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -1,7 +1,15 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { - imports = [ ./nix-settings.nix ./networking.nix ]; + imports = [ + ./nix-settings.nix + ./networking.nix + ]; # Time and Locale time.timeZone = "UTC"; @@ -15,7 +23,19 @@ systemd.enableEmergencyMode = false; # Default Packages Set - environment.systemPackages = with pkgs; [ git vim htop wget nftables wireguard-tools tmux fd ripgrep ]; + environment.systemPackages = with pkgs; [ + git + vim + htop + wget + nftables + wireguard-tools + tmux + fd + ripgrep + + docker-compose + ]; programs.vim = { enable = true; @@ -39,10 +59,8 @@ # CPU powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; - hardware.cpu.amd.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; # System state version system.stateVersion = lib.mkDefault "23.05"; diff --git a/modules/powerdns/default.nix b/modules/powerdns/default.nix index cce4abb..ae2f31e 100644 --- a/modules/powerdns/default.nix +++ b/modules/powerdns/default.nix @@ -16,7 +16,7 @@ let launch = gpgsql api = yes - local-address = 0.0.0.0 [::] + local-address = 10.10.0.1 [2a0f:9400:8020:beef::1] primary = yes webserver = yes webserver-address = 0.0.0.0 diff --git a/modules/tlmp/proxy.rules b/modules/tlmp/proxy.rules index e776387..06c7632 100644 --- a/modules/tlmp/proxy.rules +++ b/modules/tlmp/proxy.rules @@ -1,7 +1,8 @@ table ip wg { chain prerouting { type nat hook prerouting priority -100; policy accept; - tcp dport { 6881, 50300 } counter dnat to 10.10.10.2 + ip daddr 45.152.210.73 tcp dport { 6881, 50300 } counter dnat to 10.10.10.2 + ip daddr 45.152.210.73 udp dport { 6881, 50300 } counter dnat to 10.10.10.2 } chain outbound { |