diff --git a/README.md b/README.md index 7f084e64..7a774cf0 100644 --- a/README.md +++ b/README.md @@ -223,6 +223,7 @@ See code for all available configurations. | [HP Probook 440G5](hp/probook/440g5) | `` | `hp-probook-440G5` | | [Huawei Matebook X Pro (2020)](huawei/machc-wa) | `` | `huawei-machc-wa` | | [i.MX8QuadMax Multisensory Enablement Kit](nxp/imx8qm-mek/) | `` | `nxp-imx8qm-mek` | +| [Intel NUC 5i5RYB](intel/nuc/5i5ryb/) | `` | `intel-nuc-5i5ryb` | | [Intel NUC 8i7BEH](intel/nuc/8i7beh/) | `` | `intel-nuc-8i7beh` | | [Lenovo IdeaCentre K330](lenovo/ideacentre/k330) | `` | `lenovo-ideacentre-k330` | | [Lenovo IdeaPad 3 15alc6](lenovo/ideapad/15alc6) | `` | `lenovo-ideapad-15alc6` | @@ -406,6 +407,7 @@ See code for all available configurations. | [System76 Darter Pro 6](system76/darp6) | `` | `system76-darp6`| | [System76 Gazelle 18](system76/gaze18) | `` | `system76-gaze18`| | [System76 Galago Pro 5](system76/galp5-1650) | `` | `system76-galp5-1650`| +| [System76 Thelio Mega](system76/thelio-mega) | `` | `system76-thelio-mega`| | [Toshiba Chromebook 2 `swanky`](toshiba/swanky) | `` | `toshiba-swanky`| | [Tuxedo InfinityBook v4](tuxedo/infinitybook/v4) | `` | `tuxedo-infinitybook-v4`| | [TUXEDO Aura 15 - Gen1](tuxedo/aura/15/gen1) | `` | `tuxedo-aura-15-gen1`| diff --git a/asus/battery.nix b/asus/battery.nix index 4bdf6b64..4639baa4 100644 --- a/asus/battery.nix +++ b/asus/battery.nix @@ -6,7 +6,8 @@ }: let p = pkgs.writeScriptBin "charge-upto" '' - echo ''${0:-100} > /sys/class/power_supply/BAT?/charge_control_end_threshold + #!${pkgs.bash}/bin/bash + echo ''${1:-100} > /sys/class/power_supply/BAT?/charge_control_end_threshold ''; cfg = config.hardware.asus.battery; in diff --git a/flake.nix b/flake.nix index 299017fb..4b868c2b 100644 --- a/flake.nix +++ b/flake.nix @@ -65,6 +65,7 @@ dell-e7240 = deprecated "1326" "dell-e7240" (import ./dell/e7240); dell-g3-3779 = import ./dell/g3/3779; dell-g3-3579 = import ./dell/g3/3579; + dell-inspiron-3442 = import ./dell/inspiron/3442; dell-inspiron-14-5420 = import ./dell/inspiron/14-5420; dell-inspiron-5509 = import ./dell/inspiron/5509; dell-inspiron-5515 = import ./dell/inspiron/5515; @@ -156,6 +157,7 @@ hp-laptop-14s-dq2024nf = import ./hp/laptop/14s-dq2024nf; huawei-machc-wa = import ./huawei/machc-wa; hp-notebook-14-df0023 = import ./hp/notebook/14-df0023; + intel-nuc-5i5ryb = import ./intel/nuc/5i5ryb; intel-nuc-8i7beh = import ./intel/nuc/8i7beh; lenovo-ideacentre-k330 = import ./lenovo/ideacentre/k330; lenovo-ideapad-14imh9 = import ./lenovo/ideapad/14imh9; @@ -349,6 +351,7 @@ system76-gaze18 = import ./system76/gaze18; system76-galp5-1650 = import ./system76/galp5-1650; system76-darp6 = import ./system76/darp6; + system76-thelio-mega = import ./system76/thelio-mega; toshiba-swanky = import ./toshiba/swanky; tuxedo-aura-15-gen1 = import ./tuxedo/aura/15/gen1; tuxedo-infinitybook-v4 = import ./tuxedo/infinitybook/v4; @@ -356,6 +359,7 @@ tuxedo-infinitybook-pro14-gen9-intel = import ./tuxedo/infinitybook/pro14/gen9/intel; tuxedo-pulse-14-gen3 = import ./tuxedo/pulse/14/gen3; tuxedo-pulse-15-gen2 = import ./tuxedo/pulse/15/gen2; + xiaomi-redmibook-15-pro-2021 = import ./xiaomi/redmibook/15-pro-2021; xiaomi-redmibook-16-pro-2024 = import ./xiaomi/redmibook/16-pro-2024; common-cpu-amd = import ./common/cpu/amd; diff --git a/framework/13-inch/intel-core-ultra-series1/default.nix b/framework/13-inch/intel-core-ultra-series1/default.nix index 4851d54f..b2828ff1 100644 --- a/framework/13-inch/intel-core-ultra-series1/default.nix +++ b/framework/13-inch/intel-core-ultra-series1/default.nix @@ -41,4 +41,6 @@ ''For Intel NPU support, set the option: hardware.enableRedistributableFirmware = true;'' ]; + hardware.framework.laptop13.audioEnhancement.rawDeviceName = + lib.mkDefault "alsa_output.pci-0000_00_1f.3.analog-stereo"; } diff --git a/intel/nuc/5i5ryb/default.nix b/intel/nuc/5i5ryb/default.nix new file mode 100644 index 00000000..7ff80dd2 --- /dev/null +++ b/intel/nuc/5i5ryb/default.nix @@ -0,0 +1,11 @@ +{ lib, ... }: + +{ + imports = [ + ../../../common/cpu/intel/broadwell + ../../../common/pc + ../../../common/pc/ssd + ]; + + services.thermald.enable = lib.mkDefault true; +} diff --git a/lenovo/ideapad/14imh9/default.nix b/lenovo/ideapad/14imh9/default.nix index f2bb0f52..c8bb71c9 100644 --- a/lenovo/ideapad/14imh9/default.nix +++ b/lenovo/ideapad/14imh9/default.nix @@ -26,6 +26,10 @@ # See https://wiki.archlinux.org/title/Dell_XPS_16_(9640)#Random_freezes "iommu.strict=1" "iommu.passthrough=1" + + # Workaround: i915 0000:00:02.0: [drm] *ERROR* [CRTC:82:pipe A] flip_done timed out + # See https://github.com/pop-os/pop/issues/3130 + "i915.dmc_firmware_path=\"\"" ]; }; diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix index a4defb61..442d7e17 100644 --- a/microsoft/surface/common/default.nix +++ b/microsoft/surface/common/default.nix @@ -19,7 +19,7 @@ let if kernelVersion == "longterm" then "6.12.19" else if kernelVersion == "stable" then - "6.15.3" + "6.15.6" else abort "Invalid kernel version: ${kernelVersion}"; @@ -28,7 +28,7 @@ let if kernelVersion == "longterm" then "sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE=" else if kernelVersion == "stable" then - "sha256-ErUMiZJUONnNc4WgyvycQz5lYqxd8AohiJ/On1SNZbA=" + "sha256-K7WGyVQnfQcMj99tcnX6qTtIB9m/M1O0kdgUnMoCtPw=" else abort "Invalid kernel version: ${kernelVersion}"; diff --git a/system76/thelio-mega/default.nix b/system76/thelio-mega/default.nix new file mode 100644 index 00000000..b88f1366 --- /dev/null +++ b/system76/thelio-mega/default.nix @@ -0,0 +1,16 @@ +# Hardware profile for the Thelio Mega desktop workstation by System76. +# +# https://system76.com/desktops/thelio-mega-r4-n3/configure +{ + config, + lib, + ... +}: +{ + imports = [ + ../../common/cpu/amd + ../../common/gpu/nvidia + ]; + + hardware.nvidia.open = true; +}