From b848860acee5dd5308612e41b0af916c9379e0e6 Mon Sep 17 00:00:00 2001 From: Julio Gutierrez <413330+bubuntux@users.noreply.github.com> Date: Tue, 17 Jun 2025 12:37:07 -0500 Subject: [PATCH 1/6] add precision-5680 --- README.md | 1 + dell/precision/5680/default.nix | 75 +++++++++++++++++++++++++++++++++ flake.nix | 1 + 3 files changed, 77 insertions(+) create mode 100644 dell/precision/5680/default.nix diff --git a/README.md b/README.md index 758c2ab27..56c691c6d 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,7 @@ See code for all available configurations. | [Dell Precision 3541](dell/precision/3541) | `` | | [Dell Precision 5490](dell/precision/5490) | `` | | [Dell Precision 5530](dell/precision/5530) | `` | +| [Dell Precision 5680](dell/precision/5680) | `` | | [Dell Precision 7520](dell/precision/7520) | `` | | [Dell XPS 13 7390](dell/xps/13-7390) | `` | | [Dell XPS 13 9300](dell/xps/13-9300) | `` | diff --git a/dell/precision/5680/default.nix b/dell/precision/5680/default.nix new file mode 100644 index 000000000..de363e68b --- /dev/null +++ b/dell/precision/5680/default.nix @@ -0,0 +1,75 @@ +{ + lib, + ... +}: +{ + imports = [ + ../../../common/pc/laptop + ../../../common/pc/ssd + ../../../common/cpu/intel + ../../../common/gpu/nvidia/prime.nix + ]; + + boot = { + kernelModules = [ "kvm-intel" ]; + initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "thunderbolt" + "nvme" + "usb_storage" + "sd_mod" + "rtsx_pci_sdmmc" + ]; + }; + + hardware = { + # Audio + enableRedistributableFirmware = lib.mkDefault true; + + # Webcam + ipu6 = { + enable = lib.mkDefault true; + platform = lib.mkDefault "ipu6ep"; + }; + + bluetooth = { + enable = lib.mkDefault true; + powerOnBoot = lib.mkDefault true; + }; + + graphics = { + enable = lib.mkDefault true; + enable32Bit = lib.mkDefault true; + }; + + intel-gpu-tools.enable = lib.mkDefault true; + intelgpu = { + driver = lib.mkDefault "xe"; + }; + + nvidia = { + modesetting.enable = lib.mkDefault true; + nvidiaSettings = lib.mkDefault true; + open = lib.mkDefault false; + + powerManagement = { + enable = lib.mkDefault true; + finegrained = lib.mkDefault true; + }; + + prime = { + intelBusId = lib.mkDefault "PCI:00:02:0"; + nvidiaBusId = lib.mkDefault "PCI:01:00:0"; + }; + }; + }; + + services = { + fwupd.enable = lib.mkDefault true; # update firmware + hardware.bolt.enable = lib.mkDefault true; # use thunderbolt + pcscd.enable = lib.mkDefault true; # card reader + thermald.enable = lib.mkDefault true; # fans + }; + +} diff --git a/flake.nix b/flake.nix index 389be1536..4387ec415 100644 --- a/flake.nix +++ b/flake.nix @@ -93,6 +93,7 @@ dell-precision-5490 = import ./dell/precision/5490; dell-precision-5530 = import ./dell/precision/5530; dell-precision-5560 = import ./dell/precision/5560; + dell-precision-5680 = import ./dell/precision/5680; dell-precision-7520 = import ./dell/precision/7520; dell-xps-13-7390 = import ./dell/xps/13-7390; dell-xps-13-9300 = import ./dell/xps/13-9300; From 001df09b53505875b7e3b998afefb0c510ba916b Mon Sep 17 00:00:00 2001 From: Julio Gutierrez <413330+bubuntux@users.noreply.github.com> Date: Mon, 23 Jun 2025 21:57:10 -0500 Subject: [PATCH 2/6] add more common modules --- dell/precision/5680/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dell/precision/5680/default.nix b/dell/precision/5680/default.nix index de363e68b..4ad463870 100644 --- a/dell/precision/5680/default.nix +++ b/dell/precision/5680/default.nix @@ -4,9 +4,11 @@ }: { imports = [ + ../../../common/hidpi.nix ../../../common/pc/laptop ../../../common/pc/ssd - ../../../common/cpu/intel + ../../../common/cpu/intel/raptor-lake + ../../../common/gpu/nvidia/ada-lovelace ../../../common/gpu/nvidia/prime.nix ]; @@ -51,7 +53,6 @@ nvidia = { modesetting.enable = lib.mkDefault true; nvidiaSettings = lib.mkDefault true; - open = lib.mkDefault false; powerManagement = { enable = lib.mkDefault true; From a23a25b6d74b9e26f1994f30121c3611c904b5cb Mon Sep 17 00:00:00 2001 From: Julio Gutierrez <413330+bubuntux@users.noreply.github.com> Date: Wed, 2 Jul 2025 08:46:34 -0500 Subject: [PATCH 3/6] fix merge --- flake.lock | 22 +--------------------- flake.nix | 3 +++ 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 8f2f2e35d..5999137c9 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,6 @@ { "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1751290770, - "narHash": "sha256-u4s8yKAqTzPGY3vTcDyAIet11uXaNCM//93/0O0NlbA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0620a50e9a847851bf802c59a4202552ed79b821", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } + "root": {} }, "root": "root", "version": 7 diff --git a/flake.nix b/flake.nix index 97f0c667f..88ff22449 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,9 @@ { description = "nixos-hardware"; + outputs = + { ... }: + { nixosModules = let From 35047b17167487811f4f47d12def5d98667a9379 Mon Sep 17 00:00:00 2001 From: Julio Gutierrez <413330+bubuntux@users.noreply.github.com> Date: Wed, 2 Jul 2025 08:47:09 -0500 Subject: [PATCH 4/6] remove lock --- flake.lock | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 flake.lock diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 5999137c9..000000000 --- a/flake.lock +++ /dev/null @@ -1,7 +0,0 @@ -{ - "nodes": { - "root": {} - }, - "root": "root", - "version": 7 -} From 30da6e94a5e6c4ee373f980b63fe651b0e48a259 Mon Sep 17 00:00:00 2001 From: Julio Gutierrez <413330+bubuntux@users.noreply.github.com> Date: Wed, 2 Jul 2025 08:48:28 -0500 Subject: [PATCH 5/6] revert --- flake.lock | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..8f2f2e35d --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1751290770, + "narHash": "sha256-u4s8yKAqTzPGY3vTcDyAIet11uXaNCM//93/0O0NlbA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0620a50e9a847851bf802c59a4202552ed79b821", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} From 29b4d4ae33320c7180d7a05b0778f2cc36ce28db Mon Sep 17 00:00:00 2001 From: Julio Gutierrez <413330+bubuntux@users.noreply.github.com> Date: Wed, 2 Jul 2025 08:59:57 -0500 Subject: [PATCH 6/6] address comments --- dell/precision/5680/default.nix | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/dell/precision/5680/default.nix b/dell/precision/5680/default.nix index 4ad463870..555fba2f0 100644 --- a/dell/precision/5680/default.nix +++ b/dell/precision/5680/default.nix @@ -12,19 +12,6 @@ ../../../common/gpu/nvidia/prime.nix ]; - boot = { - kernelModules = [ "kvm-intel" ]; - initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "thunderbolt" - "nvme" - "usb_storage" - "sd_mod" - "rtsx_pci_sdmmc" - ]; - }; - hardware = { # Audio enableRedistributableFirmware = lib.mkDefault true; @@ -40,15 +27,7 @@ powerOnBoot = lib.mkDefault true; }; - graphics = { - enable = lib.mkDefault true; - enable32Bit = lib.mkDefault true; - }; - - intel-gpu-tools.enable = lib.mkDefault true; - intelgpu = { - driver = lib.mkDefault "xe"; - }; + graphics.enable = lib.mkDefault true; nvidia = { modesetting.enable = lib.mkDefault true;