nix/10.nixos-hardware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

framework: 6.11 remove bluetooth workaround

Browse source 
6.11 is EOL, see: https://kernel.org/

The workaround, is no longer needed, see:
ff5c08e826

Signed-off-by: Daniel Schaefer <dhs@frame.work>
This commit is contained in:
Daniel Schaefer 2026-05-16 17:20:40 +08:00
parent 9bd7c80d43
commit 8db5dd4f10
4 changed files with 0 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

1
framework/12-inch/common/default.nix
View file

@ -3,7 +3,6 @@
imports = [
../../../common/pc/laptop
../../../common/pc/ssd
../../bluetooth.nix
../../kmod.nix
../../framework-tool.nix
];

1
framework/13-inch/common/default.nix
View file

@ -3,7 +3,6 @@
imports = [
../../../common/pc/laptop
../../../common/pc/ssd
../../bluetooth.nix
../../kmod.nix
../../framework-tool.nix
./audio.nix

1
framework/16-inch/common/default.nix
View file

@ -3,7 +3,6 @@
imports = [
../../../common/pc/laptop
../../../common/pc/ssd
../../bluetooth.nix
../../kmod.nix
../../framework-tool.nix
];

55
framework/bluetooth.nix
View file

@ -1,55 +0,0 @@
# There is apparently a bug that affects Framework computers that causes black
# screen on resume from sleep or hibernate with kernel version 6.11. Framework
# have published a workaround; this applies that workaround.
#
# https://fosstodon.org/@frameworkcomputer/113406887743149089
# https://github.com/FrameworkComputer/linux-docs/blob/main/hibernation/kernel-6-11-workarounds/suspend-hibernate-bluetooth-workaround.md#workaround-for-suspendhibernate-black-screen-on-resume-kernel-611
{
config,
lib,
pkgs,
...
# TODO: drop this if linux 6.11 goes EOL
}:
lib.mkIf
(
(config.boot.kernelPackages.kernelAtLeast "6.11") && (config.boot.kernelPackages.kernelOlder "6.12")
)
{
systemd.services = {
bluetooth-rfkill-suspend = {
description = "Soft block Bluetooth on suspend/hibernate";
before = [ "sleep.target" ];
unitConfig.StopWhenUnneeded = true;
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.util-linux}/bin/rfkill block bluetooth";
ExecStartPost = "${pkgs.coreutils}/bin/sleep 3";
RemainAfterExit = true;
};
wantedBy = [
"suspend.target"
"hibernate.target"
"suspend-then-hibernate.target"
];
};
bluetooth-rfkill-resume = {
description = "Unblock Bluetooth on resume";
after = [
"suspend.target"
"hibernate.target"
"suspend-then-hibernate.target"
];
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.util-linux}/bin/rfkill unblock bluetooth";
};
wantedBy = [
"suspend.target"
"hibernate.target"
"suspend-then-hibernate.target"
];
};
};
}