chayleaf/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

phone: update to 6.11

Browse source
This commit is contained in:
chayleaf 2024-09-17 08:33:17 +07:00
parent dccb67d5e5
commit 11d178c34d
Signed by: chayleaf
GPG key ID: 78171AD46227E68E
2 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
system/devices/oneplus-6-phone.nix
View file

@ -5,7 +5,7 @@
let let
uuids.enc = "e2abdea5-71dc-4a9e-aff3-242117342d60"; uuids.enc = "e2abdea5-71dc-4a9e-aff3-242117342d60";
uuids.boot = "9DA3-28AC"; uuids.boot = "9DA3-28AC";
uuids.bch = "ac343ffb-407c-4966-87bf-a0ef1075e93d"; uuids.root = "ac343ffb-407c-4966-87bf-a0ef1075e93d";
parts = builtins.mapAttrs (k: v: "/dev/disk/by-uuid/${v}") uuids; parts = builtins.mapAttrs (k: v: "/dev/disk/by-uuid/${v}") uuids;
in in
@ -32,16 +32,14 @@ in
}; };
}; };
boot.supportedFilesystems = [ "bcachefs" ];
fileSystems = let fileSystems = let
neededForBoot = true; neededForBoot = true;
in { in {
"/" = { device = "none"; fsType = "tmpfs"; inherit neededForBoot; "/" = { device = "none"; fsType = "tmpfs"; inherit neededForBoot;
options = [ "defaults" "size=2G" "mode=755" ]; }; options = [ "defaults" "size=2G" "mode=755" ]; };
"/persist" = "/persist" =
{ device = "UUID=${uuids.bch}"; fsType = "bcachefs"; inherit neededForBoot; { device = parts.root; fsType = "btrfs"; inherit neededForBoot;
options = [ "errors=ro" ]; }; options = [ "discard=async" "compress=zstd:15" ]; };
"/boot" = { device = parts.boot; fsType = "vfat"; inherit neededForBoot; }; "/boot" = { device = parts.boot; fsType = "vfat"; inherit neededForBoot; };
}; };

30
system/hardware/oneplus-enchilada/pkgs.nix
View file

@ -119,28 +119,28 @@ in {
meta.license = lib.licenses.unfreeRedistributableFirmware; meta.license = lib.licenses.unfreeRedistributableFirmware;
}; };
linux = pkgs.linux_6_9.override { linux = pkgs.linux_testing.override {
# TODO: uncomment # TODO: uncomment
# ignoreConfigErrors = false; # ignoreConfigErrors = false;
kernelPatches = [ kernelPatches = [
{
name = "linux_6_11";
patch = pkgs.fetchpatch {
url = "https://github.com/chayleaf/linux-sdm845/compare/v6.11-rc2...7223c2b9c8917c0e315ee7ec53cee27cc1054b16.diff";
hash = "sha256-BxRBmB89wxXXD09FP6dZi1bsn7/fCihQRbnAUOJwEvc=";
};
}
# { # {
# name = "linux_6_11"; # name = "linux_6_9";
# patch = pkgs.fetchpatch { # patch = pkgs.fetchpatch {
# url = "https://github.com/chayleaf/linux-sdm845/compare/v6.11-rc2...8914f1483d0784bf1133577f3c161a3f83a12653.diff"; # url = "https://github.com/chayleaf/linux-sdm845/compare/v6.9.12...1ffe541f384cdfee347bf92773a740677de1b824.diff";
# hash = "sha256-orBQDGHAXOAy1PVLwNIBk3FgiMslziW1xddQyIwbnCs="; # hash = "sha256-6TMiXaZy8YEB2vmrpXwAKklHYhvlA/TklCQv95iyMNY=";
# }; # };
# } # }
{
name = "linux_6_9";
patch = pkgs.fetchpatch {
url = "https://github.com/chayleaf/linux-sdm845/compare/v6.9.12...1ffe541f384cdfee347bf92773a740677de1b824.diff";
hash = "sha256-6TMiXaZy8YEB2vmrpXwAKklHYhvlA/TklCQv95iyMNY=";
};
}
{ {
name = "config_fixes"; name = "config_fixes";
patch = ./config_fixes.patch; # patch = ./config_fixes.patch;
# patch = ./config_fixes_611.patch; patch = ./config_fixes_611.patch;
} }
]; ];
@ -152,8 +152,8 @@ in {
# fix build # fix build
LENOVO_YOGA_C630_EC = no; LENOVO_YOGA_C630_EC = no;
RPMSG_QCOM_GLINK_SMEM = yes; RPMSG_QCOM_GLINK_SMEM = yes;
# TOUCHSCREEN_STM_FTS_DOWNSTREAM = no; TOUCHSCREEN_STM_FTS_DOWNSTREAM = no;
# TOUCHSCREEN_FTM4 = no; TOUCHSCREEN_FTM4 = no;
# for adb and stuff (doesn't have to be built-in, but it's easier that way) # for adb and stuff (doesn't have to be built-in, but it's easier that way)
USB_FUNCTIONFS = yes; USB_FUNCTIONFS = yes;
USB_LIBCOMPOSITE = yes; USB_LIBCOMPOSITE = yes;