From 30fc0dc8003e02356db4dd60514cf3f88684c4b2 Mon Sep 17 00:00:00 2001 From: Bun Date: Tue, 18 Mar 2025 04:43:14 -0400 Subject: [PATCH] Other small formatting changes --- hosts/midas/firewall/default.nix | 4 +--- hosts/tower/default.nix | 2 +- hosts/tower/firewall/default.nix | 7 +------ modules/system/settings/nix/default.nix | 17 ++++++++++------- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/hosts/midas/firewall/default.nix b/hosts/midas/firewall/default.nix index 4fd177ca..860c0ab9 100644 --- a/hosts/midas/firewall/default.nix +++ b/hosts/midas/firewall/default.nix @@ -7,15 +7,13 @@ type nat hook prerouting priority dstnat; policy accept; tcp dport 2211 dnat ip to ${config.ips.pc}:22 comment "SSH to PC" - udp dport { 27005, 27015, 7777 } dnat ip to ${config.ips.pc} comment "PC Hosted Games" + udp dport { 27005, 27015 } dnat ip to ${config.ips.pc} comment "PC Hosted Games" tcp dport { 48010, 47989, 47984 } dnat ip to ${config.ips.pc} comment "PC Sunshine TCP" udp dport { 47998, 47999, 48000 } dnat ip to ${config.ips.pc} comment "PC Sunshine UDP" tcp dport { 38010, 37989, 37984 } dnat ip to ${config.ips.vm} comment "VM Sunshine TCP" udp dport { 37998, 37999, 38000 } dnat ip to ${config.ips.vm} comment "VM Sunshine UDP" - - udp dport { 7790, 7791, 7792 } dnat ip to ${config.ips.hx} comment "Deus Ex" } chain POSTROUTING { diff --git a/hosts/tower/default.nix b/hosts/tower/default.nix index 6c89ba80..981d19dd 100644 --- a/hosts/tower/default.nix +++ b/hosts/tower/default.nix @@ -25,8 +25,8 @@ system = { desktop.enable = true; lanzaboote.enable = true; - video.nvidia.enable = true; libvirtd.enable = true; + video.nvidia.enable = true; stateVersion = "24.05"; }; } diff --git a/hosts/tower/firewall/default.nix b/hosts/tower/firewall/default.nix index 1eab0b40..00705bd4 100644 --- a/hosts/tower/firewall/default.nix +++ b/hosts/tower/firewall/default.nix @@ -1,9 +1,4 @@ { ... }: { - networking.firewall = { - allowedUDPPorts = [ - 27015 # Half-Life - 7777 # Lethal Company - ]; - }; + networking.firewall.allowedUDPPorts = [ 27015 ]; } diff --git a/modules/system/settings/nix/default.nix b/modules/system/settings/nix/default.nix index 8419670f..885127ce 100644 --- a/modules/system/settings/nix/default.nix +++ b/modules/system/settings/nix/default.nix @@ -7,13 +7,16 @@ }; config = { - nix.settings = { - experimental-features = [ - "nix-command" - "flakes" - ]; - auto-optimise-store = true; - trusted-users = [ "@wheel" ]; + nix = { + package = pkgs.lix; + settings = { + experimental-features = [ + "nix-command" + "flakes" + ]; + auto-optimise-store = true; + trusted-users = [ "@wheel" ]; + }; }; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowUnfreePackages;