From 6d6022faac1c3d2995c3ca47fac0b5a29b2380ed Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Tue, 3 Sep 2024 12:15:39 -0600 Subject: [PATCH 1/8] tests: Update flake.lock --- tests/flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/flake.lock b/tests/flake.lock index 4fdd2f9..bde17cc 100644 --- a/tests/flake.lock +++ b/tests/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1723310128, - "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", + "lastModified": 1725384549, + "narHash": "sha256-A9TMja7Ly70BOGcbcqJ0EUusQSFEQaKbrHJxNXfSFYY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", + "rev": "366ddc33ff1b93d95ef3809d12ce0fba74c8d316", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1723938990, - "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", + "lastModified": 1725001927, + "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", + "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", "type": "github" }, "original": { @@ -53,11 +53,11 @@ }, "nixos-unstable-small": { "locked": { - "lastModified": 1723999580, - "narHash": "sha256-mVAwJQkqcVS+BU9i2YqDz61YQt/q0KRPz8vetezs7ZE=", + "lastModified": 1725361206, + "narHash": "sha256-/HTUg+kMaqBPGrcQBYboAMsQHIWIkuKRDldss/035Hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bae0943064987c775f857b698522ff2db2df292", + "rev": "2830c7c930311397d94c0b86a359c865c081c875", "type": "github" }, "original": { From b1ee64a4eae363724f064a1e1536dd27a80c9e9b Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Tue, 3 Sep 2024 12:16:12 -0600 Subject: [PATCH 2/8] dell-g3-3779: Add nvidia architecture --- dell/g3/3779/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/dell/g3/3779/default.nix b/dell/g3/3779/default.nix index 83216eb..c9afd48 100644 --- a/dell/g3/3779/default.nix +++ b/dell/g3/3779/default.nix @@ -4,6 +4,7 @@ imports = [ ../../../common/cpu/intel ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/pascal ../../../common/pc/laptop ../../../common/pc/laptop/ssd ]; From 32979d223a3747f4a2683774db0d6cdfe6d1bf1a Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Tue, 3 Sep 2024 12:16:31 -0600 Subject: [PATCH 3/8] dell-xps-15-9500: Add nvidia architecture --- dell/xps/15-9500/nvidia/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/dell/xps/15-9500/nvidia/default.nix b/dell/xps/15-9500/nvidia/default.nix index 257462a..56d05cd 100644 --- a/dell/xps/15-9500/nvidia/default.nix +++ b/dell/xps/15-9500/nvidia/default.nix @@ -3,6 +3,7 @@ imports = [ ../default.nix ../../../../common/gpu/nvidia/prime.nix + ../../../../common/gpu/nvidia/turing ]; hardware.nvidia.prime = { From c75b52ace8305b2d64b16ec45335545a15062031 Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Tue, 3 Sep 2024 12:16:41 -0600 Subject: [PATCH 4/8] dell-xps-15-9510: Add nvidia architecture --- dell/xps/15-9510/nvidia/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dell/xps/15-9510/nvidia/default.nix b/dell/xps/15-9510/nvidia/default.nix index 990aea7..6ca0fd5 100644 --- a/dell/xps/15-9510/nvidia/default.nix +++ b/dell/xps/15-9510/nvidia/default.nix @@ -1,5 +1,8 @@ { lib, pkgs, ... }: { - imports = [ ../../../../common/gpu/nvidia/prime.nix ]; + imports = [ + ../../../../common/gpu/nvidia/prime.nix + ../../../../common/gpu/nvidia/ampere + ]; #D-Bus service to check the availability of dual-GPU services.switcherooControl.enable = lib.mkDefault true; From 30584336012b279813bf842ad27acf77fef33ae9 Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Tue, 3 Sep 2024 12:16:52 -0600 Subject: [PATCH 5/8] dell-xps-15-9520: Add nvidia architecture --- dell/xps/15-9520/nvidia/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/dell/xps/15-9520/nvidia/default.nix b/dell/xps/15-9520/nvidia/default.nix index 257462a..8db739d 100644 --- a/dell/xps/15-9520/nvidia/default.nix +++ b/dell/xps/15-9520/nvidia/default.nix @@ -3,6 +3,7 @@ imports = [ ../default.nix ../../../../common/gpu/nvidia/prime.nix + ../../../../common/gpu/nvidia/ampere ]; hardware.nvidia.prime = { From 9f9cf89d3370df3ffc307e77ca881b9a4dd76095 Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Tue, 3 Sep 2024 12:17:02 -0600 Subject: [PATCH 6/8] dell-xps-15-9550: Add nvidia architecture --- dell/xps/15-9550/nvidia/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/dell/xps/15-9550/nvidia/default.nix b/dell/xps/15-9550/nvidia/default.nix index 257462a..520e6ad 100644 --- a/dell/xps/15-9550/nvidia/default.nix +++ b/dell/xps/15-9550/nvidia/default.nix @@ -3,6 +3,7 @@ imports = [ ../default.nix ../../../../common/gpu/nvidia/prime.nix + ../../../../common/gpu/nvidia/maxwell ]; hardware.nvidia.prime = { From dec757bf4ebd310df00b19e54daa6ef1b241ec21 Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Tue, 3 Sep 2024 12:17:17 -0600 Subject: [PATCH 7/8] dell-xps-15-9560: Add nvidia architecture --- dell/xps/15-9560/default.nix | 1 + dell/xps/15-9560/nvidia/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/dell/xps/15-9560/default.nix b/dell/xps/15-9560/default.nix index 510feab..84c300a 100644 --- a/dell/xps/15-9560/default.nix +++ b/dell/xps/15-9560/default.nix @@ -5,6 +5,7 @@ ../../../common/pc/laptop ./xps-common.nix ../../../common/gpu/nvidia + ../../../common/gpu/nvidia/pascal ]; hardware.graphics.enable = true; diff --git a/dell/xps/15-9560/nvidia/default.nix b/dell/xps/15-9560/nvidia/default.nix index e58fa58..8026a22 100644 --- a/dell/xps/15-9560/nvidia/default.nix +++ b/dell/xps/15-9560/nvidia/default.nix @@ -6,6 +6,7 @@ ../../../../common/gpu/nvidia/prime.nix ../../../../common/pc/laptop ../xps-common.nix + ../../../../common/gpu/nvidia/pascal ]; From 12acfdefc1d352a382f5e875fc9a6c48ab989e08 Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Tue, 3 Sep 2024 12:17:32 -0600 Subject: [PATCH 8/8] dell-xps-17-9700: Add nvidia architecture --- dell/xps/17-9700/nvidia/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/dell/xps/17-9700/nvidia/default.nix b/dell/xps/17-9700/nvidia/default.nix index 446a0b7..16f9366 100644 --- a/dell/xps/17-9700/nvidia/default.nix +++ b/dell/xps/17-9700/nvidia/default.nix @@ -5,6 +5,7 @@ ../../../../common/cpu/intel ../../../../common/pc/laptop ../../../../common/gpu/nvidia/prime.nix + ../../../../common/gpu/nvidia/turing ../common.nix ];