Skip to content

Commit 47730dd

Browse files
pshirshovpshirshov
committed
autosave (pavel-fw / Linux)
1 parent a29753b commit 47730dd

File tree

10 files changed

+4
-373
lines changed

10 files changed

+4
-373
lines changed

‎config.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
cfg-packages = { inputs, pkgs, arch }: {
3232
jdk-main = pkgs.graalvmPackages.graalvm-ce;
33-
linux-kernel = pkgs.linuxKernel.packages.linux_6_18;
33+
linux-kernel = pkgs.linuxKernel.packages.linux_6_19;
3434
};
3535

3636

‎hosts/pavel-am5/cfg-pavel-am5.nix‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -207,25 +207,6 @@
207207
desktop.plymouth.enable = true;
208208
};
209209

210-
# boot.kernelPatches = [
211-
# {
212-
# name = "mediatek-mt7927-bluetooth";
213-
# patch = pkgs.writeText "mt7927-bt.patch" ''
214-
# --- a/drivers/bluetooth/btusb.c
215-
# +++ b/drivers/bluetooth/btusb.c
216-
# @@ -672,6 +672,8 @@ static const struct usb_device_id quirks_table[] = {
217-
# { USB_DEVICE(0x0489, 0xe0e4), .driver_info = BTUSB_MEDIATEK |
218-
# BTUSB_WIDEBAND_SPEECH },
219-
# { USB_DEVICE(0x0489, 0xe0f1), .driver_info = BTUSB_MEDIATEK |
220-
# + BTUSB_WIDEBAND_SPEECH },
221-
# + { USB_DEVICE(0x0489, 0xe13a), .driver_info = BTUSB_MEDIATEK |
222-
# BTUSB_WIDEBAND_SPEECH },
223-
# { USB_DEVICE(0x0489, 0xe0f2), .driver_info = BTUSB_MEDIATEK |
224-
# BTUSB_WIDEBAND_SPEECH },
225-
# '';
226-
# }
227-
# ];
228-
229210
networking.hostId = "8a9c7614";
230211
networking.hostName = cfg-meta.hostname;
231212
networking.useDHCP = false;

‎hosts/pavel-fw/cfg-pavel-fw.nix‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ in
2727

2828
# --- Framework 16 AMD (Strix Point) specific configuration ---
2929

30-
# Keep Framework host on 6.19 kernel line.
31-
boot.kernelPackages = lib.mkForce pkgs.linuxKernel.packages.linux_6_19;
32-
3330
boot.kernelParams = [
3431
#"usbcore.autosuspend=-1"
3532
# s2idle quirks for kernel 6.18+ are in smind.power-management.framework-quirks
@@ -136,7 +133,6 @@ in
136133

137134
desktop.plymouth.enable = true;
138135
hw.framework-laptop.enable = true;
139-
hw.framework-laptop.kernelPatches.vpe-dpm0.enable = false;
140136
hw.bluetooth.enable = true;
141137
hw.fingerprint.enable = true;
142138
hw.nvidia = {
@@ -216,9 +212,6 @@ in
216212
allowedUDPPorts = [ ];
217213
};
218214

219-
# OpenSnitch application firewall (disabled - adds ~80 wakeups/s overhead)
220-
smind.net.opensnitch.enable = false;
221-
222215
users = {
223216
users.root.initialPassword = "nixos";
224217
users.root.openssh.authorizedKeys.keys = cfg-const.ssh-keys-pavel;

‎modules/nixos/_imports.nix‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
./trezor.nix
6868
./uhk-keyboard.nix
6969
./virt-manager.nix
70-
./wifi-roaming-quirks.nix
7170
./zfs-ssh-initrd.nix
7271
./zfs.nix
7372
./xkb.nix

‎modules/nixos/framework-laptop.nix‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
let
44
cfg = config.smind.hw.framework-laptop;
5-
kernelVersion = config.boot.kernelPackages.kernel.version;
6-
isKernel612 = lib.versionAtLeast kernelVersion "6.12" && lib.versionOlder kernelVersion "6.13";
75
frameworkToolExecutable = lib.getExe' pkgs.framework-tool "framework_tool";
86
macLikeModifiersRemapCommands = ''
97
# Framework Laptop 13 keyboard table and scan code examples:
@@ -40,19 +38,6 @@ in
4038
Framework Laptop 13 initrd key remap for mac-like modifiers.
4139
Applies an EC-level swap so Command/Option/Control behave like macOS-style modifiers before userspace starts
4240
'';
43-
44-
kernelPatches = {
45-
vpe-dpm0.enable = lib.mkEnableOption ''
46-
amdgpu VPE Strix Point DPM0 fix.
47-
Adds IP_VERSION(6, 1, 0) to the DPM0 power-down check in amdgpu_vpe.c
48-
'' // { default = cfg.enable; };
49-
50-
ath12k-pairwise-key.enable = lib.mkEnableOption ''
51-
ath12k WCN7850 pairwise key ordering fix (kernel 6.12 only).
52-
Backport of upstream commit 66e865f9dc78 — WCN7850 firmware requires PTK before GTK.
53-
https://bugzilla.kernel.org/show_bug.cgi?id=218733
54-
'' // { default = cfg.enable && isKernel612; };
55-
};
5641
};
5742

5843
config = lib.mkIf cfg.enable (lib.mkMerge [
@@ -133,38 +118,5 @@ in
133118
};
134119
})
135120

136-
# --- Kernel patches ---
137-
138-
(lib.mkIf cfg.kernelPatches.vpe-dpm0.enable {
139-
boot.kernelPatches = [
140-
{
141-
name = "amdgpu-vpe-strix-point-dpm0-fix";
142-
patch = pkgs.writeText "vpe-strix-point.patch" ''
143-
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
144-
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
145-
@@ -325,6 +325,8 @@ static bool vpe_need_dpm0_at_power_down(struct amdgpu_device *adev)
146-
{
147-
switch (amdgpu_ip_version(adev, VPE_HWIP, 0)) {
148-
+ case IP_VERSION(6, 1, 0):
149-
+ return true; /* Strix Point needs DPM0 check regardless of PMFW version */
150-
case IP_VERSION(6, 1, 1):
151-
return adev->pm.fw_version < 0x0a640500;
152-
default:
153-
'';
154-
}
155-
];
156-
})
157-
158-
(lib.mkIf cfg.kernelPatches.ath12k-pairwise-key.enable {
159-
boot.kernelPatches = [
160-
{
161-
# Backport of upstream commit 66e865f9dc78 ("wifi: ath12k: install pairwise key first")
162-
# WCN7850 firmware requires PTK before GTK; without this fix the EAPOL handshake
163-
# fails in a loop (PREV_AUTH_NOT_VALID deauth). Not backported to 6.12 LTS upstream.
164-
name = "ath12k-wcn7850-install-pairwise-key-first";
165-
patch = ./patches/ath12k-pairwise-key-6.12.patch;
166-
}
167-
];
168-
})
169121
]);
170122
}

‎modules/nixos/networking-desktop.nix‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66
description = "Enable NetworkManager with iwd for desktop systems";
77
};
88

9-
smind.net.opensnitch.enable = lib.mkEnableOption "OpenSnitch application firewall";
109
};
1110

12-
config = lib.mkMerge [
13-
(lib.mkIf config.smind.net.desktop.enable {
11+
config = lib.mkIf config.smind.net.desktop.enable {
1412
networking = {
1513
networkmanager = {
1614
enable = true;
@@ -53,21 +51,5 @@
5351
];
5452

5553
systemd.services.NetworkManager-wait-online.enable = false;
56-
})
57-
58-
(lib.mkIf config.smind.net.opensnitch.enable {
59-
services.opensnitch = {
60-
enable = true;
61-
settings = {
62-
DefaultAction = "allow";
63-
Firewall = "nftables";
64-
ProcMonitorMethod = "ebpf";
65-
};
66-
};
67-
68-
environment.systemPackages = with pkgs; [
69-
opensnitch-ui
70-
];
71-
})
72-
];
54+
};
7355
}

‎modules/nixos/patches/ath12k-pairwise-key-6.12.patch‎

Lines changed: 0 additions & 142 deletions
This file was deleted.

‎modules/nixos/power-quirks-framework.nix‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ in
1313
Needed on kernel 6.18+
1414
'';
1515

16-
psr.enable = lib.mkEnableOption ''
17-
amdgpu PSR/PSR-SU/PSR2 disable (amdgpu.dcdebugmask=0x610).
18-
Panel Self Refresh causes s2idle failures on Strix Point.
19-
Needed on kernel 6.18+
20-
'';
21-
2216
iommu-fullflush.enable = lib.mkEnableOption ''
2317
AMD IOMMU full flush (amd_iommu=fullflush).
2418
Prevents IOMMU-related suspend failures with NVMe on AMD platforms.
@@ -57,10 +51,6 @@ in
5751
boot.kernelParams = [ "amdgpu.cwsr_enable=0" ];
5852
})
5953

60-
(lib.mkIf cfg.psr.enable {
61-
boot.kernelParams = [ "amdgpu.dcdebugmask=0x610" ];
62-
})
63-
6454
(lib.mkIf cfg.iommu-fullflush.enable {
6555
boot.kernelParams = [ "amd_iommu=fullflush" ];
6656
})

0 commit comments

Comments
 (0)