From cf9b2a0cdb78b8c0b2ee93611591494aa4c336f4 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 27 Sep 2025 01:03:16 +0100 Subject: [PATCH 01/12] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 52b5161..84f9fd4 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758678836, - "narHash": "sha256-ewDKEXcKYF7L+EGVa+8E1nxK1pdwVrCHcj5UhuGA8V0=", + "lastModified": 1758851752, + "narHash": "sha256-OrJRuaQCs913zFuhylKmxYRw9DZ0cq58hJwO3tempt8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "5007786714b3573b37cf3b8c4a33e2ddce86960d", + "rev": "bc962fe29193fa4b851dfaac2bfb968e33287211", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758589230, - "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", + "lastModified": 1758791193, + "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", + "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", "type": "github" }, "original": { From 12cab79679a36502d9446f5c819054c940f5ef53 Mon Sep 17 00:00:00 2001 From: worble Date: Sun, 28 Sep 2025 00:52:59 +0100 Subject: [PATCH 02/12] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 84f9fd4..a07e9f4 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758851752, - "narHash": "sha256-OrJRuaQCs913zFuhylKmxYRw9DZ0cq58hJwO3tempt8=", + "lastModified": 1758937884, + "narHash": "sha256-vwLF3vCIJS0UU3/SKij7xvyaR/ZWr1ynmNWRZtk8dsY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "bc962fe29193fa4b851dfaac2bfb968e33287211", + "rev": "6117b8feb7acbe702a48e562940fd8ab208bf63e", "type": "github" }, "original": { From 704937338421b71c985d91ed89391777d303d136 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 29 Sep 2025 23:49:31 +0100 Subject: [PATCH 03/12] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a07e9f4..2778928 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1758427679, - "narHash": "sha256-xwjWRJTKDCjQ0iwfh7WhDhgcS0Wt3d1Yscg83mKBCn4=", + "lastModified": 1759032422, + "narHash": "sha256-WZf+FhebP2/1pK2np5xj/NuDjD6fXK2BHnq/tPUN18o=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "fd2569ca2ef7d69f244cd9ffcb66a0540772ff85", + "rev": "ec7a78cb0e098832d8acac091a4df393259c4839", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758937884, - "narHash": "sha256-vwLF3vCIJS0UU3/SKij7xvyaR/ZWr1ynmNWRZtk8dsY=", + "lastModified": 1759110961, + "narHash": "sha256-2UEHpwRdIbGGr5To8K+P1ouJYzFRn3wGeXje2q4HKjI=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6117b8feb7acbe702a48e562940fd8ab208bf63e", + "rev": "c0394cf617c3a602caa22a0bb6de8753b07d023d", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { From 80c13f0ee3d8ec0345e55979dbf0443a6c85cd69 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 30 Sep 2025 22:27:46 +0100 Subject: [PATCH 04/12] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 2778928..f0a4a49 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759110961, - "narHash": "sha256-2UEHpwRdIbGGr5To8K+P1ouJYzFRn3wGeXje2q4HKjI=", + "lastModified": 1759197050, + "narHash": "sha256-j1fhS3+RaFRokiJyVu7NeXAX2YdU16nDjDGpzTXowAY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "c0394cf617c3a602caa22a0bb6de8753b07d023d", + "rev": "645f200c7e725bc8002d25f18e71673807287820", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1758663926, - "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", + "lastModified": 1759261527, + "narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", + "rev": "e087756cf4abbe1a34f3544c480fc1034d68742f", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", + "lastModified": 1759143472, + "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", + "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", "type": "github" }, "original": { From 499900014efba19e42c076c21dedfca5123d0afc Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 2 Oct 2025 00:20:16 +0100 Subject: [PATCH 05/12] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index f0a4a49..b434108 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759197050, - "narHash": "sha256-j1fhS3+RaFRokiJyVu7NeXAX2YdU16nDjDGpzTXowAY=", + "lastModified": 1759284197, + "narHash": "sha256-NbaOzcxsUxNm+Dday5DlV6P9CzRAonY2DNcp056oWWc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "645f200c7e725bc8002d25f18e71673807287820", + "rev": "a87f796f1ed4b0a8babe9370791a66aac4864887", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759143472, - "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", + "lastModified": 1759281824, + "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", + "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", "type": "github" }, "original": { From 730b115bf81e17d52f863084d654f9f7338040ff Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 2 Oct 2025 23:08:15 +0100 Subject: [PATCH 06/12] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index b434108..b65a776 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759284197, - "narHash": "sha256-NbaOzcxsUxNm+Dday5DlV6P9CzRAonY2DNcp056oWWc=", + "lastModified": 1759369908, + "narHash": "sha256-IIhaE6jAge64z+fIyi/8Vtu0JdTtapbp4CvwiuIkZ1E=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "a87f796f1ed4b0a8babe9370791a66aac4864887", + "rev": "a66ad2141b1440a838ead278c6edfe8a4ce75e6c", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { From 249afa0b6541820ed1a51d20ce2adf00b5fc9527 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 4 Oct 2025 00:20:42 +0100 Subject: [PATCH 07/12] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b65a776..a334830 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759369908, - "narHash": "sha256-IIhaE6jAge64z+fIyi/8Vtu0JdTtapbp4CvwiuIkZ1E=", + "lastModified": 1759456736, + "narHash": "sha256-ex3cyTe8G8im2LwxWzb6894MKsQ/Eh48zIoWSm90bhM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "a66ad2141b1440a838ead278c6edfe8a4ce75e6c", + "rev": "7a5ffd8bfce663427169220ea020c8046964dd31", "type": "github" }, "original": { From 9ef91f7ab505bd7343969d3ce8d283e86d718fac Mon Sep 17 00:00:00 2001 From: worble Date: Sun, 5 Oct 2025 16:56:04 +0100 Subject: [PATCH 08/12] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index a334830..6353260 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1759032422, - "narHash": "sha256-WZf+FhebP2/1pK2np5xj/NuDjD6fXK2BHnq/tPUN18o=", + "lastModified": 1759637156, + "narHash": "sha256-8NI1SqntLfKl6Q0Luemc3aIboezSJElofUrqipF5g78=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec7a78cb0e098832d8acac091a4df393259c4839", + "rev": "0ca69684091aa3a6b1fe994c4afeff305b15e915", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759456736, - "narHash": "sha256-ex3cyTe8G8im2LwxWzb6894MKsQ/Eh48zIoWSm90bhM=", + "lastModified": 1759661755, + "narHash": "sha256-WlT72IpSg7vV/Dc2Ahvn64i1aPHzMJzc+bYA1D2Mss8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "7a5ffd8bfce663427169220ea020c8046964dd31", + "rev": "0c2e7fd23f0bdcd9f4b431b3d729dd44a73f49d9", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1759261527, - "narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=", + "lastModified": 1759582739, + "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e087756cf4abbe1a34f3544c480fc1034d68742f", + "rev": "3441b5242af7577230a78ffb03542add264179ab", "type": "github" }, "original": { @@ -136,17 +136,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", - "owner": "NixOS", + "lastModified": 1758446476, + "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", "type": "github" } }, @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759281824, - "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", + "lastModified": 1759580034, + "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", + "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", "type": "github" }, "original": { From 300c36245e3fff7f073ccd2f902d46ede65eb0c2 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 7 Oct 2025 22:03:10 +0100 Subject: [PATCH 09/12] update flake.lock --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 6353260..f1b6555 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759661755, - "narHash": "sha256-WlT72IpSg7vV/Dc2Ahvn64i1aPHzMJzc+bYA1D2Mss8=", + "lastModified": 1759861528, + "narHash": "sha256-H+zi70PiVWxT1q4+weBaOMjYHRRAdKBr3m5fTyGu+i4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "0c2e7fd23f0bdcd9f4b431b3d729dd44a73f49d9", + "rev": "8f21ae372da2071b4f6cbca7008d909de920f230", "type": "github" }, "original": { @@ -136,27 +136,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758446476, - "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", + "lastModified": 1759770925, + "narHash": "sha256-CZwkCtzTNclqlhuwDsVtGoRumTpqCUK0xSnFIMgd8ls=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", + "rev": "674c2b09c59a220204350ced584cadaacee30038", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", + "rev": "674c2b09c59a220204350ced584cadaacee30038", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1759733170, + "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "8913c168d1c56dc49a7718685968f38752171c3b", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", + "lastModified": 1759735786, + "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", + "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", "type": "github" }, "original": { From 6378246c2cd6a2396e49d839daa00f5fd9f33c8d Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 8 Oct 2025 22:00:33 +0100 Subject: [PATCH 10/12] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index f1b6555..a73106d 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759861528, - "narHash": "sha256-H+zi70PiVWxT1q4+weBaOMjYHRRAdKBr3m5fTyGu+i4=", + "lastModified": 1759946307, + "narHash": "sha256-fETPYtDOEChraiRrbH1BxtVvQ0zHqW6shis7OJC4avQ=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "8f21ae372da2071b4f6cbca7008d909de920f230", + "rev": "43bb3cc3e35c8499951dd92a3863fda2141e1a54", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1759733170, - "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", + "lastModified": 1759831965, + "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8913c168d1c56dc49a7718685968f38752171c3b", + "rev": "c9b6fb798541223bbb396d287d16f43520250518", "type": "github" }, "original": { From 38f691cacd86f838348baa23ede80c9809f80a39 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 9 Oct 2025 23:29:34 +0100 Subject: [PATCH 11/12] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a73106d..f832e20 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759946307, - "narHash": "sha256-fETPYtDOEChraiRrbH1BxtVvQ0zHqW6shis7OJC4avQ=", + "lastModified": 1759974692, + "narHash": "sha256-8AN/Ps23Wx6CBEj7s5SKp8pVSA63BHlsAQICYF6Ac6E=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "43bb3cc3e35c8499951dd92a3863fda2141e1a54", + "rev": "6c39663c00cb3041d9567cfc103c29b46d0b3c98", "type": "github" }, "original": { From 25158bedf1f11b238d1f47f72b63e5dcfb50136f Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 10 Oct 2025 14:15:24 +0100 Subject: [PATCH 12/12] 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