From d5dd9ae25cd1f43b504afde1a1da2e573ad969e5 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Sun, 3 Nov 2024 23:42:12 +0100
Subject: [PATCH 1/4] linux_xanmod: apply nixfmt

(cherry picked from commit daa7d3d93fb919a1716475a8ca60de999fcc0c95)
---
 .../linux/kernel/xanmod-kernels.nix           | 100 +++++++++++-------
 1 file changed, 61 insertions(+), 39 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 921144faba42..38c666c900e6 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildLinux,
+  ...
+}@args:
 
 let
   # These names are how they are designated in https://xanmod.org.
@@ -17,51 +23,67 @@ let
     };
   };
 
-  xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec {
-    inherit version;
-    modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
+  xanmodKernelFor =
+    {
+      version,
+      suffix ? "xanmod1",
+      hash,
+    }:
+    buildLinux (
+      args
+      // rec {
+        inherit version;
+        modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
 
-    src = fetchFromGitHub {
-      owner = "xanmod";
-      repo = "linux";
-      rev = modDirVersion;
-      inherit hash;
-    };
+        src = fetchFromGitHub {
+          owner = "xanmod";
+          repo = "linux";
+          rev = modDirVersion;
+          inherit hash;
+        };
 
-    structuredExtraConfig = with lib.kernel; {
-      # CPUFreq governor Performance
-      CPU_FREQ_DEFAULT_GOV_PERFORMANCE = lib.mkOverride 60 yes;
-      CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkOverride 60 no;
+        structuredExtraConfig = with lib.kernel; {
+          # CPUFreq governor Performance
+          CPU_FREQ_DEFAULT_GOV_PERFORMANCE = lib.mkOverride 60 yes;
+          CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkOverride 60 no;
 
-      # Full preemption
-      PREEMPT = lib.mkOverride 60 yes;
-      PREEMPT_VOLUNTARY = lib.mkOverride 60 no;
+          # Full preemption
+          PREEMPT = lib.mkOverride 60 yes;
+          PREEMPT_VOLUNTARY = lib.mkOverride 60 no;
 
-      # Google's BBRv3 TCP congestion Control
-      TCP_CONG_BBR = yes;
-      DEFAULT_BBR = yes;
+          # Google's BBRv3 TCP congestion Control
+          TCP_CONG_BBR = yes;
+          DEFAULT_BBR = yes;
 
-      # Preemptive Full Tickless Kernel at 250Hz
-      HZ = freeform "250";
-      HZ_250 = yes;
-      HZ_1000 = no;
+          # Preemptive Full Tickless Kernel at 250Hz
+          HZ = freeform "250";
+          HZ_250 = yes;
+          HZ_1000 = no;
 
-      # RCU_BOOST and RCU_EXP_KTHREAD
-      RCU_EXPERT = yes;
-      RCU_FANOUT = freeform "64";
-      RCU_FANOUT_LEAF = freeform "16";
-      RCU_BOOST = yes;
-      RCU_BOOST_DELAY = freeform "0";
-      RCU_EXP_KTHREAD = yes;
-    };
+          # RCU_BOOST and RCU_EXP_KTHREAD
+          RCU_EXPERT = yes;
+          RCU_FANOUT = freeform "64";
+          RCU_FANOUT_LEAF = freeform "16";
+          RCU_BOOST = yes;
+          RCU_BOOST_DELAY = freeform "0";
+          RCU_EXP_KTHREAD = yes;
+        };
 
-    extraMeta = {
-      branch = lib.versions.majorMinor version;
-      maintainers = with lib.maintainers; [ moni lovesegfault atemu shawn8901 zzzsy ];
-      description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";
-      broken = stdenv.isAarch64;
-    };
-  } // (args.argsOverride or { }));
+        extraMeta = {
+          branch = lib.versions.majorMinor version;
+          maintainers = with lib.maintainers; [
+            moni
+            lovesegfault
+            atemu
+            shawn8901
+            zzzsy
+          ];
+          description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";
+          broken = stdenv.isAarch64;
+        };
+      }
+      // (args.argsOverride or { })
+    );
 in
 {
   lts = xanmodKernelFor variants.lts;

From 42c96f8c78b24be146955873b722082bca77bd92 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Sun, 3 Nov 2024 23:42:56 +0100
Subject: [PATCH 2/4] linux_xanmod: switch from GitHub to GitLab

Upstreams  Github Repo was archived at 31st Oct 2024

(cherry picked from commit 9907a40a5796e17e65e344510ff9f2bcb9625290)
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 38c666c900e6..2e8af6bb5040 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
+  fetchFromGitLab,
   buildLinux,
   ...
 }@args:
@@ -35,7 +35,7 @@ let
         inherit version;
         modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
 
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "xanmod";
           repo = "linux";
           rev = modDirVersion;

From 16b11aa3414f9e58c089c3e482a4a14e81b9f36f Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Sun, 3 Nov 2024 22:38:03 +0100
Subject: [PATCH 3/4] linux_xanmod: 6.6.58 -> 6.6.59

(cherry picked from commit 1cb34222f9c425544494ed38408ee6db7c6a990a)
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 2e8af6bb5040..4105f9c00e8b 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -13,8 +13,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.6.58";
-      hash = "sha256-PjF3PIGCHWGIGHupu+vkdiyrL4h4KG2X5WmQUlz8Zww=";
+      version = "6.6.59";
+      hash = "sha256-VImhbdU+WAP0QRnYjHBNKYw5NlMDCBy8HJyP2NQBNHY=";
     };
 
     main = {

From 17f1f5ca890148cfc3d67a8e7efb80566c3969c9 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Sun, 3 Nov 2024 22:38:14 +0100
Subject: [PATCH 4/4] linux_xanmod_latest: 6.11.5 -> 6.11.6

(cherry picked from commit 8fe9056838242e1e5bdeb5d817e0208b72877cdf)
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 4105f9c00e8b..2f2c04fba2c6 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
     };
 
     main = {
-      version = "6.11.5";
-      hash = "sha256-G4u0LQtIeJ0dNAmjNH0OKihmbkivYVbrbXDB9vPw2xI=";
+      version = "6.11.6";
+      hash = "sha256-t0kuKK2f8D1vxoX5dJnodTu3aBmzCc8F7tHwVAUHP1M=";
     };
   };