jsutter/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Framework 16 stability issues: disable USB autosuspend, adjust TLP settings, temporarily disable problematic packages

Browse source
This commit is contained in:
Julian Sutter 2025-07-15 20:55:30 -07:00
parent c2cf1cb0d8
commit c28af3e123
4 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop/office.nix
View file

@ -5,7 +5,7 @@
environment.systemPackages = with pkgs; [
libreoffice-qt
gimp
# gimp # Temporarily commented out to avoid build errors
# calibre
];
}

18
flake.lock generated
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1751384836,
"narHash": "sha256-7xRbl/VLXxE5DzJmk1wdKWJmPx8rAfNC/a6mXtqp5cc=",
"lastModified": 1752603129,
"narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "479f8889675770881033878a1c114fbfc6de7a4d",
"rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",
"type": "github"
},
"original": {
@ -22,11 +22,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1751393906,
"narHash": "sha256-I1x6K61ZcdFlqc07weRBy3erCAB0lVkX10i0c9eXjDI=",
"lastModified": 1752048960,
"narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "f49bb3b4107a0917ee144337bb02d311033ee1ba",
"rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
"type": "github"
},
"original": {
@ -38,11 +38,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1751271578,
"narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
"lastModified": 1752480373,
"narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
"rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
"type": "github"
},
"original": {

8
systems/common.nix
View file

@ -82,7 +82,8 @@
pulse.enable = true;
};
services.openssh.enable = true;
programs.java.enable = true;
# Temporarily disabled to avoid build cycle errors
# programs.java.enable = true;
security.polkit.enable = true;
programs.zsh.enable = true;
security.sudo.wheelNeedsPassword = false;
@ -110,8 +111,9 @@
unzip
clinfo
virt-manager
adoptopenjdk-icedtea-web
javaPackages.openjfx17
# Temporarily disabled to avoid build cycle errors
# adoptopenjdk-icedtea-web
# javaPackages.openjfx17
s-tui
stress
wget

12
systems/framework.nix
View file

@ -8,13 +8,13 @@
boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ "kvm-amd" ]; # Include kvm-amd for virtualization support
boot.extraModulePackages = [];
boot.kernelParams = [ "amdgpu.dc=1" ] ;
boot.kernelParams = [ "amdgpu.dc=1" "usbcore.autosuspend=-1" ] ;
networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
# Enable TLP for power management
# Modified TLP for power management with less aggressive settings
services.tlp = {
enable = true;
settings = {
@ -24,9 +24,11 @@
CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance";
START_CHARGE_THRESH_BAT0 = 90;
STOP_CHARGE_THRESH_BAT0 = 97;
RUNTIME_PM_ON_BAT = "auto";
RUNTIME_PM_ON_BAT = "on"; # Less aggressive power management
HANDLE_LID_SWITCH = 1; # Suspend on lid close
HANDLE_LID_SWITCH_DOCKED = 0; # Do nothing when docked
# Disable USB autosuspend
USB_AUTOSUSPEND = 0;
};
};
@ -82,10 +84,10 @@
wantedBy = [ "suspend.target" ];
};
# Custom udev rules for runtime PM
# Modified udev rules for runtime PM - disable problematic USB autosuspend
services.udev.extraRules = ''
ACTION=="add", SUBSYSTEM=="pci", ATTR{power/control}="auto"
ACTION=="add", SUBSYSTEM=="usb", ATTR{power/autosuspend}="10"
# ACTION=="add", SUBSYSTEM=="usb", ATTR{power/autosuspend}="10"
'';
# ACPI lid event handler