From 25158bedf1f11b238d1f47f72b63e5dcfb50136f Mon Sep 17 00:00:00 2001
From: worble <worble@worble.xyz>
Date: Fri, 10 Oct 2025 14:15:24 +0100
Subject: [PATCH] move more networking stuff to networking module; add ntsync
 to kernel for tuxedo; use unstable for wine

---
 configuration/base/networking.nix | 28 +++++++++++++++++++++------
 configuration/default.nix         | 11 -----------
 devices/tuxedo/configuration.nix  | 12 +++++++++++-
 home-manager/gaming.nix           | 32 +++++++++++++++++--------------
 4 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/configuration/base/networking.nix b/configuration/base/networking.nix
index 5afe702..acaa9ba 100644
--- a/configuration/base/networking.nix
+++ b/configuration/base/networking.nix
@@ -4,10 +4,15 @@
   # networking.hostName = "nixos"; # Define your hostname.
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager = {
-    # Easiest to use and most distros use this by default.
-    enable = true;
-    wifi.powersave = false;
+  networking = {
+    nftables = {
+      enable = true;
+    };
+    networkmanager = {
+      # Easiest to use and most distros use this by default.
+      enable = true;
+      wifi.powersave = false;
+    };
   };
 
   # Configure network proxy if necessary
@@ -17,10 +22,21 @@
   # Enable CUPS to print documents.
   # services.printing.enable = true;
 
+  # Open ports in the firewall.
+  networking.firewall.enable = true;
+  # 443 Helldivers crashes internet otherwise
+  # networking.firewall.allowedTCPPorts = [ 443 ];
+  # networking.firewall.allowedUDPPorts = [ 443 ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # Block list
+  # networking.stevenblack.enable = true;
+
+  # services.resolved.enable = true;
+
   services.mullvad-vpn = {
     enable = true;
     package = pkgs.mullvad-vpn;
   };
-
-  # services.resolved.enable = true;
 }
diff --git a/configuration/default.nix b/configuration/default.nix
index 0c04f4a..c08d27b 100644
--- a/configuration/default.nix
+++ b/configuration/default.nix
@@ -37,16 +37,6 @@
   # Enable the OpenSSH daemon.
   # services.openssh.enable = true;
 
-  # Open ports in the firewall.
-  # 443 Helldivers crashes internet otherwise
-  # networking.firewall.allowedTCPPorts = [ 443 ];
-  # networking.firewall.allowedUDPPorts = [ 443 ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # Block list
-  # networking.stevenblack.enable = true;
-
   # Copy the NixOS configuration file and link it from the resulting system
   # (/run/current-system/configuration.nix). This is useful in case you
   # accidentally delete configuration.nix.
@@ -70,5 +60,4 @@
   #
   # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
   system.stateVersion = "24.05"; # Did you read the comment?
-
 }
diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix
index e018bad..5093a0f 100644
--- a/devices/tuxedo/configuration.nix
+++ b/devices/tuxedo/configuration.nix
@@ -20,9 +20,19 @@
 
   networking.hostName = "tuxedo"; # Define your hostname.
 
+  # fairly sure this isnt needed anymore
+  # boot.extraModprobeConfig = ''
+  #   options iwlwifi 11n_disable=8 power_save=0
+  #   options iwlmvm power_scheme=1
+  # '';
+
+  # TODO remove ntsync if this becomes stable
+  # options iwlmvm power_scheme=1 https://wireless.docs.kernel.org/en/latest/en/users/drivers/iwlwifi.html#features
+  # options iwlwifi 11n_disable=4 https://wiki.gentoo.org/wiki/Iwlwifi#Network_crashes_under_heavy_load
   boot.extraModprobeConfig = ''
-    options iwlwifi 11n_disable=8 power_save=0
+    ntsync 
     options iwlmvm power_scheme=1
+    options iwlwifi 11n_disable=4
   '';
 
   services.hardware.openrgb.enable = true;
diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix
index b7554f7..0aab890 100644
--- a/home-manager/gaming.nix
+++ b/home-manager/gaming.nix
@@ -1,27 +1,31 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 
 {
   home.packages = with pkgs;[
     # Wine / Proton
-    wineWowPackages.staging
-    winetricks
+    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".wineWowPackages.stagingFull
+    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".winetricks
+    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".umu-launcher
+
+    # I'm not sure this actually accomplishes anything, even with PROTON_MEDIA_USE_GST=1
+    # (umu-launcher.override {
+    #   extraPkgs = pkgs: with pkgs.gst_all_1; [
+    #     gstreamer
+    #     gst-plugins-base
+    #     gst-plugins-good
+    #     gst-plugins-bad
+    #     gst-plugins-ugly
+    #     gst-libav
+    #     gst-vaapi
+    #   ];
+    # })
+
     bottles
     (heroic.override {
       extraPkgs = pkgs: [
         pkgs.gamescope
       ];
     })
-    (umu-launcher.override {
-      extraPkgs = pkgs: with pkgs.gst_all_1; [
-        gstreamer
-        gst-plugins-base
-        gst-plugins-good
-        gst-plugins-bad
-        gst-plugins-ugly
-        gst-libav
-        gst-vaapi
-      ];
-    })
 
     # Steam
     steamguard-cli