diff --git a/common/cpu/intel/braswell/default.nix b/common/cpu/intel/braswell/default.nix index f295a57..567f579 100644 --- a/common/cpu/intel/braswell/default.nix +++ b/common/cpu/intel/braswell/default.nix @@ -1,6 +1,6 @@ { imports = [ - ../cpu-only.nix + ./cpu-only.nix ../../../gpu/intel/braswell ]; } diff --git a/common/cpu/intel/broadwell/default.nix b/common/cpu/intel/broadwell/default.nix index 2716ddc..415cc6f 100644 --- a/common/cpu/intel/broadwell/default.nix +++ b/common/cpu/intel/broadwell/default.nix @@ -1,6 +1,6 @@ { imports = [ - ../cpu-only.nix + ./cpu-only.nix ../../../gpu/intel/broadwell ]; } diff --git a/common/cpu/intel/comet-lake/default.nix b/common/cpu/intel/comet-lake/default.nix index 325fb1b..3c688f5 100644 --- a/common/cpu/intel/comet-lake/default.nix +++ b/common/cpu/intel/comet-lake/default.nix @@ -1,6 +1,6 @@ { imports = [ - ../cpu-only.nix + ./cpu-only.nix ../../../gpu/intel/comet-lake ]; } diff --git a/common/cpu/intel/elkhart-lake/default.nix b/common/cpu/intel/elkhart-lake/default.nix index 352e009..e4a42af 100644 --- a/common/cpu/intel/elkhart-lake/default.nix +++ b/common/cpu/intel/elkhart-lake/default.nix @@ -1,6 +1,6 @@ { imports = [ - ../cpu-only.nix + ./cpu-only.nix ../../../gpu/intel/elkhart-lake ]; } diff --git a/common/cpu/intel/haswell/default.nix b/common/cpu/intel/haswell/default.nix index 14cb62e..c8b3b8e 100644 --- a/common/cpu/intel/haswell/default.nix +++ b/common/cpu/intel/haswell/default.nix @@ -1,6 +1,6 @@ { imports = [ - ../cpu-only.nix + ./cpu-only.nix ../../../gpu/intel/haswell ]; } diff --git a/common/cpu/intel/jasper-lake/default.nix b/common/cpu/intel/jasper-lake/default.nix index 53c26c5..27e93a4 100644 --- a/common/cpu/intel/jasper-lake/default.nix +++ b/common/cpu/intel/jasper-lake/default.nix @@ -1,6 +1,6 @@ { imports = [ - ../cpu-only.nix + ./cpu-only.nix ../../../gpu/intel/jasper-lake ]; } diff --git a/common/cpu/intel/kaby-lake/default.nix b/common/cpu/intel/kaby-lake/default.nix index eec1e1b..f6cc8cc 100644 --- a/common/cpu/intel/kaby-lake/default.nix +++ b/common/cpu/intel/kaby-lake/default.nix @@ -1,6 +1,6 @@ { imports = [ - ../cpu-only.nix + ./cpu-only.nix ../../../gpu/intel/kaby-lake ]; } diff --git a/common/cpu/intel/lunar-lake/cpu-only.nix b/common/cpu/intel/lunar-lake/cpu-only.nix new file mode 100644 index 0000000..8289261 --- /dev/null +++ b/common/cpu/intel/lunar-lake/cpu-only.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ../cpu-only.nix + ]; +} diff --git a/common/cpu/intel/lunar-lake/default.nix b/common/cpu/intel/lunar-lake/default.nix new file mode 100644 index 0000000..0f92ca5 --- /dev/null +++ b/common/cpu/intel/lunar-lake/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./cpu-only.nix + ../../../gpu/intel/lunar-lake + ]; +} diff --git a/common/cpu/intel/sandy-bridge/default.nix b/common/cpu/intel/sandy-bridge/default.nix index cb7d777..9aeff58 100644 --- a/common/cpu/intel/sandy-bridge/default.nix +++ b/common/cpu/intel/sandy-bridge/default.nix @@ -1,6 +1,6 @@ { imports = [ - ../cpu-only.nix + ./cpu-only.nix ../../../gpu/intel/sandy-bridge ]; } diff --git a/common/cpu/intel/tiger-lake/default.nix b/common/cpu/intel/tiger-lake/default.nix index 270b07a..10ad86e 100644 --- a/common/cpu/intel/tiger-lake/default.nix +++ b/common/cpu/intel/tiger-lake/default.nix @@ -1,6 +1,6 @@ { imports = [ - ../cpu-only.nix + ./cpu-only.nix ../../../gpu/intel/tiger-lake ]; } diff --git a/common/gpu/intel/lunar-lake/default.nix b/common/gpu/intel/lunar-lake/default.nix new file mode 100644 index 0000000..b232719 --- /dev/null +++ b/common/gpu/intel/lunar-lake/default.nix @@ -0,0 +1,8 @@ +{ config, lib, ... }: +{ + imports = [ ../. ]; + hardware.intelgpu = { + driver = lib.mkIf (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.8") "xe"; + vaapiDriver = "intel-media-driver"; + }; +} diff --git a/tests/flake.lock b/tests/flake.lock index ac0ed66..aadb052 100644 --- a/tests/flake.lock +++ b/tests/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726905744, - "narHash": "sha256-xyNtG5C+xvfsnOVEamFe9zCCnuNwk93K/TlFC/4DmCI=", + "lastModified": 1729455275, + "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b493dfd4a8cf9552932179e56ff3b5819a9b8381", + "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1726838390, - "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", + "lastModified": 1729307008, + "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", + "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3", "type": "github" }, "original": { @@ -53,11 +53,11 @@ }, "nixos-unstable-small": { "locked": { - "lastModified": 1726885390, - "narHash": "sha256-NPoqPAA2z9o/Syyx4M4v3/e6ROkK21enXx4+29Q45uc=", + "lastModified": 1729493358, + "narHash": "sha256-Ti+Y9nWt5Fcs3JlarxLPgIOVlbqQo7jobz/qOwOaziM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f7bfe794a79c69c01f2dce20fb7b287ae98a96eb", + "rev": "a5e6a9e979367ee14f65d9c38119c30272f8455f", "type": "github" }, "original": {