fix cjktty

flake.lock

@@ -125,6 +125,22 @@
         "url": "https://github.com/zepinglee/citeproc-lua"
       }
     },
+    "cjktty": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1704026380,
+        "narHash": "sha256-2PifENv3HD9a1q+uPsMnFp5RHdGcV4qOyX4e5dmDHK4=",
+        "owner": "zhmars",
+        "repo": "cjktty-patches",
+        "rev": "0d0015730edd2190dee7233f87dd72c423bb75e9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zhmars",
+        "repo": "cjktty-patches",
+        "type": "github"
+      }
+    },
     "compare-to": {
       "locked": {
         "lastModified": 1695341185,
@@ -1994,6 +2010,7 @@
         "blurred-wallpaper": "blurred-wallpaper",
         "chaotic": "chaotic",
         "citation-style-language": "citation-style-language",
+        "cjktty": "cjktty",
         "concurrencpp": "concurrencpp",
         "cppcoro": "cppcoro",
         "date": "date",

flake.nix

@@ -68,6 +68,7 @@
     lmod = { url = "github:TACC/Lmod"; flake = false; };
     mumax = { url = "github:CHN-beta/mumax"; flake = false; };
     kylin-virtual-keyboard = { url = "git+https://gitee.com/openkylin/kylin-virtual-keyboard.git"; flake = false; };
+    cjktty = { url = "github:zhmars/cjktty-patches"; flake = false; };
   };
 
   outputs = inputs:

modules/system/kernel/default.nix

@@ -56,23 +56,10 @@ inputs:
                 name = "cjktty";
                 patch =
                   let
-                    version = builtins.splitVersion inputs.config.boot.kernelPackages.kernel.version;
-                    major = builtins.elemAt version 0;
-                    minor = builtins.elemAt version 1;
-                  in inputs.pkgs.fetchurl
-                  {
-                    url = "https://raw.githubusercontent.com/zhmars/cjktty-patches/master/"
-                      + "v${major}.x/cjktty-${major}.${minor}.patch";
-                    sha256 =
-                      let
-                        hashes =
-                        {
-                          "6.1" = "11ddiammvjxx2m9v32p25l1ai759a1d6xhdpszgnihv7g2fzigf5";
-                          "6.6" = "19ib0syj3207ifr315gdrnpv6nhh435fmgl05c7k715nng40i827";
-                          "6.7" = "1yfsmc0873xiwlirir0xfp9zyrpd09q1srgr3z4rl7i7lxzaqls8";
-                        };
-                      in hashes."${major}.${minor}";
-                  };
+                    version = builtins.concatStringsSep "." (inputs.lib.lists.take 2
+                      (builtins.splitVersion inputs.config.boot.kernelPackages.kernel.version));
+                    fileVersion = { "6.8" = "6.7"; }.${version} or version;
+                  in "${inputs.topInputs.cjktty}/v6.x/cjktty-${fileVersion}.patch";
                 extraStructuredConfig =
                   { FONT_CJK_16x16 = inputs.lib.kernel.yes; FONT_CJK_32x32 = inputs.lib.kernel.yes; };
               }];