From d622f72fcc1e7ad9af71cb8c709bcff853f8a242 Mon Sep 17 00:00:00 2001 From: Matt Carrier Date: Mon, 4 Nov 2024 23:33:57 -0800 Subject: [PATCH 1/4] fix: pin to current version --- hosts/nixos/gaming/configuration.nix | 34 +++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/hosts/nixos/gaming/configuration.nix b/hosts/nixos/gaming/configuration.nix index ee6788f..f5868cc 100644 --- a/hosts/nixos/gaming/configuration.nix +++ b/hosts/nixos/gaming/configuration.nix @@ -81,7 +81,39 @@ in { nvidia = { nvidiaPersistenced = true; modesetting.enable = true; - open = true; # use nvidia driver switch this to true to use nouveau open source driver + open = true; # use nvidia open driver (not same as nouveau) + + # Custom driver version + # Set all values to "" and set desired version + # Keep building and replace "" each time build fails as got is specified swapping empty string for latest sha going down list + + # package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + # version = "565.57.01"; + # sha256_64bit = "sha256-hdszsACWNqkCh8G4VBNitDT85gk9gJe1BlQ8LdrYIkg="; + # sha256_aarch64 = "sha256-hdszsACWNqkCh8G4VBNitDT85gk9gJe1BlQ8LdrYIkg="; + # openSha256 = "sha256-hdszsACWNqkCh8G4VBNitDT85gk9gJe1BlQ8LdrYIkg="; + # settingsSha256 = ""; + # persistencedSha256 = ""; + # }; + + # This version is tested with factorio but not gamescope or anything demanding + package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + version = "560.35.03"; + sha256_64bit = "sha256-8pMskvrdQ8WyNBvkU/xPc/CtcYXCa7ekP73oGuKfH+M="; + sha256_aarch64 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg="; + openSha256 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg="; + settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk="; + persistencedSha256 = "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs="; + }; + + # package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + # version = "565.57.01"; + # sha256_64bit = "sha256-buvpTlheOF6IBPWnQVLfQUiHv4GcwhvZW3Ks0PsYLHo="; + # sha256_aarch64 = lib.fakeSha256; + # openSha256 = lib.fakeSha256; + # settingsSha256 = "sha256-H7uEe34LdmUFcMcS6bz7sbpYhg9zPCb/5AmZZFTx1QA="; + # persistencedSha256 = lib.fakeSha256; + # }; # persistencedSha256 = lib.fakeSha256; From d12c96cb3ad69795f4463d3a20d1fc317402813b Mon Sep 17 00:00:00 2001 From: Matt Carrier Date: Mon, 4 Nov 2024 23:38:00 -0800 Subject: [PATCH 2/4] Revert "fix: pin to current version" This reverts commit d622f72fcc1e7ad9af71cb8c709bcff853f8a242. --- hosts/nixos/gaming/configuration.nix | 34 +--------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/hosts/nixos/gaming/configuration.nix b/hosts/nixos/gaming/configuration.nix index f5868cc..ee6788f 100644 --- a/hosts/nixos/gaming/configuration.nix +++ b/hosts/nixos/gaming/configuration.nix @@ -81,39 +81,7 @@ in { nvidia = { nvidiaPersistenced = true; modesetting.enable = true; - open = true; # use nvidia open driver (not same as nouveau) - - # Custom driver version - # Set all values to "" and set desired version - # Keep building and replace "" each time build fails as got is specified swapping empty string for latest sha going down list - - # package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - # version = "565.57.01"; - # sha256_64bit = "sha256-hdszsACWNqkCh8G4VBNitDT85gk9gJe1BlQ8LdrYIkg="; - # sha256_aarch64 = "sha256-hdszsACWNqkCh8G4VBNitDT85gk9gJe1BlQ8LdrYIkg="; - # openSha256 = "sha256-hdszsACWNqkCh8G4VBNitDT85gk9gJe1BlQ8LdrYIkg="; - # settingsSha256 = ""; - # persistencedSha256 = ""; - # }; - - # This version is tested with factorio but not gamescope or anything demanding - package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "560.35.03"; - sha256_64bit = "sha256-8pMskvrdQ8WyNBvkU/xPc/CtcYXCa7ekP73oGuKfH+M="; - sha256_aarch64 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg="; - openSha256 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg="; - settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk="; - persistencedSha256 = "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs="; - }; - - # package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - # version = "565.57.01"; - # sha256_64bit = "sha256-buvpTlheOF6IBPWnQVLfQUiHv4GcwhvZW3Ks0PsYLHo="; - # sha256_aarch64 = lib.fakeSha256; - # openSha256 = lib.fakeSha256; - # settingsSha256 = "sha256-H7uEe34LdmUFcMcS6bz7sbpYhg9zPCb/5AmZZFTx1QA="; - # persistencedSha256 = lib.fakeSha256; - # }; + open = true; # use nvidia driver switch this to true to use nouveau open source driver # persistencedSha256 = lib.fakeSha256; From b3596b43c602564e72bf76e29e19859d1b13e4f1 Mon Sep 17 00:00:00 2001 From: Matt Carrier Date: Sat, 7 Dec 2024 14:21:15 -0800 Subject: [PATCH 3/4] feat: add factorio ports to nebula --- hosts/nixos/gaming/configuration.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hosts/nixos/gaming/configuration.nix b/hosts/nixos/gaming/configuration.nix index ee6788f..ea752d3 100644 --- a/hosts/nixos/gaming/configuration.nix +++ b/hosts/nixos/gaming/configuration.nix @@ -442,6 +442,16 @@ in { 127.0.0.1 rewind.dev.c4er.com ''; + # Firewall ports only for Nebula VPN users + firewall.interfaces."nebula1".allowedTCPPorts = [ + 34197 # Factorio + ]; + + # Firewall ports only for Nebula VPN users + firewall.interfaces."nebula1".allowedUDPPorts = [ + 34197 # Factorio + ]; + # Open ports in the firewall. firewall.allowedTCPPorts = [ # sunshine From 12cc41da62c4f7a1bb6060d8250f4fe3d1c72cb6 Mon Sep 17 00:00:00 2001 From: Matt Carrier Date: Sat, 7 Dec 2024 14:58:35 -0800 Subject: [PATCH 4/4] feat: use nvidia 565.57.01 driver & update flake.lock --- flake.lock | 49 +++++++++------------------- hosts/nixos/gaming/configuration.nix | 3 ++ modules/common-linux-gui.nix | 2 +- 3 files changed, 20 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index de65749..f1609ed 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1730448474, - "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -238,11 +238,11 @@ ] }, "locked": { - "lastModified": 1730490306, - "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1743615b61c7285976f85b303a36cdf88a556503", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -465,11 +465,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730520317, - "narHash": "sha256-IH+vuP/F4zdOwmbCNXtszaCbzAiqx5O72NwtlTv+Nco=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d3986e78856a70d0b38d9e88dc39390556c2e962", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -506,29 +506,13 @@ "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -669,15 +653,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1729999681, - "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", + "lastModified": 1733128155, + "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", + "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "type": "github" }, "original": { diff --git a/hosts/nixos/gaming/configuration.nix b/hosts/nixos/gaming/configuration.nix index ea752d3..d9bb432 100644 --- a/hosts/nixos/gaming/configuration.nix +++ b/hosts/nixos/gaming/configuration.nix @@ -83,6 +83,9 @@ in { modesetting.enable = true; open = true; # use nvidia driver switch this to true to use nouveau open source driver + # https://github.com/NixOS/nixpkgs/blob/d0797a04b81caeae77bcff10a9dde78bc17f5661/pkgs/os-specific/linux/nvidia-x11/default.nix#L48-L77 + package = config.boot.kernelPackages.nvidiaPackages.beta; + # persistencedSha256 = lib.fakeSha256; # Doesn't boot with kde plasma6 on 6.11.5 kernel version diff --git a/modules/common-linux-gui.nix b/modules/common-linux-gui.nix index f724c58..262bc5e 100644 --- a/modules/common-linux-gui.nix +++ b/modules/common-linux-gui.nix @@ -12,7 +12,7 @@ krita lm_sensors mission-center # task manager - nerdfonts + # nerdfonts oculante peek vscode