flake: update cachyos

This reverts commit 3e3e62838b.

devices/wlin/default.nix

@@ -17,7 +17,7 @@ let
     paths = with pkgs;
     [
       gnuplot localPackages.vaspkit pv python localPackages.vasp.intel chn-bsub hwloc
-      lsd
+      lsd prrte.dev
     ];
     postBuild = "echo ${inputs.self.rev or "dirty"} > $out/.version";
     passthru = { inherit pkgs chn-bsub; archive = pkgs.closureInfo { rootPaths = [ wlin.drvPath ]; }; };

flake.lock

@@ -100,11 +100,11 @@
     "cachyos-kernel": {
       "flake": false,
       "locked": {
-        "lastModified": 1766083376,
-        "narHash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c=",
+        "lastModified": 1767371066,
+        "narHash": "sha256-ztxcryN0uX2WhFYoOZLXClqaFwfC8EAVCKaA2M++ROU=",
         "owner": "CachyOS",
         "repo": "linux-cachyos",
-        "rev": "9d369789361623b8a3b842a71adccb19b24ba16f",
+        "rev": "f280ea9c30ca7a39cf8f6995efb553ff9b8cb384",
         "type": "github"
       },
       "original": {
@@ -116,11 +116,11 @@
     "cachyos-kernel-patches": {
       "flake": false,
       "locked": {
-        "lastModified": 1766080842,
-        "narHash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w=",
+        "lastModified": 1767369270,
+        "narHash": "sha256-Jne9XlgFlyuJIf9F6QoAObLo2/AXYbaGqNFqCdRdDmY=",
         "owner": "CachyOS",
         "repo": "kernel-patches",
-        "rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c",
+        "rev": "15a034b093aee9b935f7c6c08ea5312e187c9ac7",
         "type": "github"
       },
       "original": {
@@ -364,11 +364,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1765121682,
-        "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
         "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
@@ -665,6 +665,23 @@
         "type": "github"
       }
     },
+    "linux-asus": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767457777,
+        "narHash": "sha256-DCKTOfkJ0d1IkSwcSq0r/j45BvkBDcqXVmJAVYRFHSU=",
+        "owner": "CHN-beta",
+        "repo": "linux-g14",
+        "rev": "c02087ae1c3f9d24bdcf2b4b277ce0b4c9fd767c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CHN-beta",
+        "ref": "6.18",
+        "repo": "linux-g14",
+        "type": "github"
+      }
+    },
     "mac-style": {
       "flake": false,
       "locked": {
@@ -865,11 +882,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766317927,
-        "narHash": "sha256-8bpmKA1+G8r8uB8YesjmvSS8w+0dhB+SYdmpGWYlXAE=",
+        "lastModified": 1767529782,
+        "narHash": "sha256-Wz8j5qfkxX+QQa/arHqWGYZuBfLTq/cJVDCEIBzEV9o=",
         "owner": "CHN-beta",
         "repo": "nix-cachyos-kernel",
-        "rev": "ae6243bbaac9c0eff212bfb45eff5620dfe383a5",
+        "rev": "7d65b67594d1422ecd2a9f4cbfcce8fca67067f4",
         "type": "github"
       },
       "original": {
@@ -1144,11 +1161,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1767223621,
-        "narHash": "sha256-Q0vXLCj8m9i87XfoyhKkHNIq8hjoNKEoysxU6uS+6o4=",
+        "lastModified": 1767530756,
+        "narHash": "sha256-8Li3OLnzc406/gOe+Sgu0bHoedzibvIJ77bk3/EOMqw=",
         "owner": "CHN-beta",
         "repo": "nixpkgs",
-        "rev": "1768cfa9daffab526e6573114c4c94353ee49d80",
+        "rev": "d7f3d87456d890459fac2f3e3723340d60de10bb",
         "type": "github"
       },
       "original": {
@@ -1442,6 +1459,7 @@
         "home-manager": "home-manager",
         "impermanence": "impermanence",
         "lepton": "lepton",
+        "linux-asus": "linux-asus",
         "mac-style": "mac-style",
         "matplotplusplus": "matplotplusplus",
         "mirism-old": "mirism-old",

flake.nix

@@ -65,6 +65,7 @@
     mirism-old = { url = "github:CHN-beta/mirism-old-public"; flake = false; };
     sqlgen = { url = "git+https://github.com/getml/sqlgen?submodules=1"; flake = false; };
     reflectcpp = { url = "git+https://github.com/getml/reflect-cpp?submodules=1"; flake = false; };
+    linux-asus = { url = "github:CHN-beta/linux-g14/6.18"; flake = false; };
   };
 
   outputs = inputs: let localLib = import ./flake/lib inputs.nixpkgs.lib; in

modules/packages/zsh/p10k-config/p10k.zsh

@@ -473,7 +473,7 @@
   # Don't show Git status in prompt for repositories whose workdir matches this pattern.
   # For example, if set to '~', the Git repository at $HOME/.git will be ignored.
   # Multiple patterns can be combined with '|': '~(|/foo)|/bar/baz/*'.
-  typeset -g POWERLEVEL9K_VCS_DISABLED_WORKDIR_PATTERN='~'
+  typeset -g POWERLEVEL9K_VCS_DISABLED_WORKDIR_PATTERN='~|/nix/remote/*'
 
   # Disable the default Git status formatting.
   typeset -g POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING=true

modules/system/gui.nix

@@ -97,7 +97,7 @@ inputs:
             touchpad.dwt = true;
             keyboard.numlock = true;
             power-key-handling.enable = false;
-            focus-follows-mouse.enable = true;
+            focus-follows-mouse = { enable = true; max-scroll-amount="10%"; };
           };
           layout =
           {

modules/system/kernel.nix

@@ -67,6 +67,41 @@ inputs:
           patches =
           {
             btrfs = [(inputs.topInputs.self.src.btrfs.${version} // { name = "btrfs"; })];
+            asus = builtins.map
+              (file:
+              {
+                name = "asus-${file}";
+                patch = "${inputs.topInputs.linux-asus}/${file}";
+              })
+              [
+                # copy from PKGBUILD
+                "0001-platform-x86-asus-wmi-export-symbols-used-for-read-w.patch"
+                "0002-platform-x86-asus-armoury-move-existing-tunings-to-a.patch"
+                "0003-platform-x86-asus-armoury-add-panel_hd_mode-attribut.patch"
+                "0004-platform-x86-asus-armoury-add-apu-mem-control-suppor.patch"
+                "0005-platform-x86-asus-armoury-add-screen-auto-brightness.patch"
+                "0006-platform-x86-asus-wmi-deprecate-bios-features.patch"
+                "0007-platform-x86-asus-wmi-rename-ASUS_WMI_DEVID_PPT_FPPT.patch"
+                "0008-platform-x86-asus-armoury-add-ppt_-and-nv_-tuning-kn.patch"
+                "0001-platform-x86-asus-armoury-Fix-error-code-in-mini_led.patch"
+                "0002-platform-x86-asus-armoury-fix-mini-led-mode-show.patch"
+                "0003-platform-x86-asus-armoury-add-support-for-FA507UV.patch"
+                "0001-platform-x86-asus-armoury-fix-only-DC-tunables-being.patch"
+                "PATCH-v10-00-11-HID-asus-Fix-ASUS-ROG-Laptop-s-Keyboard-backlight-handling.patch"
+                "PATCH-v10-00-11-HID-asus-Fix-ASUS-ROG-Laptop-s-Keyboard-backlight-handling-id1-id2-pr_err.patch"
+                "0001-platform-x86-asus-wmi-fix-initializing-TUFs-keyboard.patch"
+                "0002-platform-x86-asus-armoury-add-keyboard-control-firmw.patch"
+                "0001-acpi-proc-idle-skip-dummy-wait.patch"
+                "PATCH-v5-00-11-Improvements-to-S5-power-consumption.patch"
+                "PATCH-asus-wmi-fixup-screenpad-brightness.patch"
+                "asus-patch-series.patch"
+                "0070-acpi-x86-s2idle-Add-ability-to-configure-wakeup-by-A.patch"
+                "0040-workaround_hardware_decoding_amdgpu.patch"
+                "0081-amdgpu-adjust_plane_init_off_by_one.patch"
+                "0084-enable-steam-deck-hdr.patch"
+                "sys-kernel_arch-sources-g14_files-0047-asus-nb-wmi-Add-tablet_mode_sw-lid-flip.patch"
+                "sys-kernel_arch-sources-g14_files-0048-asus-nb-wmi-fix-tablet_mode_sw_int.patch"
+              ];
           };
         in builtins.concatLists (builtins.map (name: patches.${name}) kernel.patches);
     };