fabian/nix
1
0
Fork 2
Code Issues 20 Pull requests Projects Releases Packages Wiki Activity

trivionomicon: thinkpad: move thinkpad config into laptop module

Browse source
This commit is contained in:
Fabian Montero 2025-09-15 12:52:50 -06:00
parent c54f9c4207
commit acada9b054
Signed by: fabian
GPG key ID: 3EDA9AE3937CCDE3
6 changed files with 49 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trivionomicon/modules/laptop/default.nix
View file

@ -7,4 +7,5 @@ doctrine.lib.mkModule {
inherit config;
name = "laptop";
sys = ./sys.nix;
options = ./options.nix;
}

10
trivionomicon/modules/laptop/options.nix Normal file
View file

@ -0,0 +1,10 @@
{lib, ...}:
with lib.types; {
sys = {
thinkpad = lib.mkOption {
type = boolean;
default = false;
description = "set to true if your laptop is a thinkpad";
};
};
}

5
trivionomicon/modules/laptop/sys.nix
View file

@ -2,10 +2,15 @@
config,
lib,
pkgs,
cfg,
...
}: {
services = {
tlp.enable = lib.mkDefault true;
upower.enable = lib.mkDefault true;
};
imports = [
./thinkpad.nix
];
}

33
trivionomicon/modules/laptop/thinkpad.nix Normal file
View file

@ -0,0 +1,33 @@
{
config,
pkgs,
lib,
cfg,
...
}: {
config = lib.mkIf cfg.thinkpad {
# For suspending to RAM to work, set Config -> Power -> Sleep State to "Linux" in EFI.
# See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Suspend_issues
# Fingerprint sensor requires a firmware-update to work.
boot = {
extraModulePackages = with config.boot.kernelPackages; [acpi_call];
extraModprobeConfig = "options iwlwifi 11n_disable=1 wd_disable=1";
# acpi_call makes tlp work for newer thinkpads
kernelModules = ["acpi_call"];
# Force use of the thinkpad_acpi driver for backlight control.
# This allows the backlight save/load systemd service to work.
kernelParams = ["acpi_backlight=native"];
};
hardware.firmware = [pkgs.sof-firmware];
services = {
fprintd.enable = lib.mkDefault true;
thinkfan.enable = lib.mkDefault true;
tp-auto-kbbl.enable = lib.mkDefault true;
};
};
}

11
trivionomicon/modules/thinkpad/default.nix
View file

@ -1,11 +0,0 @@
{
config,
doctrine,
...
}:
doctrine.lib.mkModule {
inherit config;
name = "thinkpad";
sys = ./sys.nix;
requires = ["laptop"];
}

30
trivionomicon/modules/thinkpad/sys.nix
View file

@ -1,30 +0,0 @@
{
config,
pkgs,
lib,
...
}: {
# For suspending to RAM to work, set Config -> Power -> Sleep State to "Linux" in EFI.
# See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Suspend_issues
# Fingerprint sensor requires a firmware-update to work.
boot = {
extraModulePackages = with config.boot.kernelPackages; [acpi_call];
extraModprobeConfig = "options iwlwifi 11n_disable=1 wd_disable=1";
# acpi_call makes tlp work for newer thinkpads
kernelModules = ["acpi_call"];
# Force use of the thinkpad_acpi driver for backlight control.
# This allows the backlight save/load systemd service to work.
kernelParams = ["acpi_backlight=native"];
};
hardware.firmware = [pkgs.sof-firmware];
services = {
fprintd.enable = lib.mkDefault true;
thinkfan.enable = lib.mkDefault true;
tp-auto-kbbl.enable = lib.mkDefault true;
};
}