diff --git a/modules/kernel/default.nix b/modules/kernel/default.nix index c191ea8a..35d7c520 100644 --- a/modules/kernel/default.nix +++ b/modules/kernel/default.nix @@ -10,7 +10,21 @@ inputs: boot = { kernelParams = [ "delayacct" "acpi_osi=Linux" ]; - kernelPackages = inputs.pkgs.linuxPackages_xanmod_latest; + kernelPackages = inputs.pkgs.linuxPackagesFor (inputs.pkgs.linuxPackages_xanmod.kernel.override + { + argsOverride = rec + { + src = inputs.pkgs.fetchFromGitHub + { + owner = "xanmod"; + repo = "linux"; + rev = modDirVersion; + sha256sum = inputs.lib.fakeSha256; + }; + version = "6.3.12"; + modDirVersion = "6.3.12-xanmod1"; + }; + }); kernelPatches = ( let @@ -21,8 +35,8 @@ inputs: { patch = inputs.pkgs.fetchurl { - url = "https://raw.githubusercontent.com/zhmars/cjktty-patches/master/v6.x/cjktty-6.4.patch"; - sha256 = "sha256-oGZxvg6ldpPAn5+W+r/e/WkVO92iv0XVFoJfFF5rdc8="; + url = "https://raw.githubusercontent.com/zhmars/cjktty-patches/master/v6.x/cjktty-6.3.patch"; + sha256 = "sha256-QnsWruzhtiZnqzTUXkPk9Hb19Iddr4VTWXyV4r+iLvE="; }; extraStructuredConfig = { FONT_CJK_16x16 = inputs.lib.kernel.yes; FONT_CJK_32x32 = inputs.lib.kernel.yes; }; diff --git a/modules/packages/gui.nix b/modules/packages/gui.nix index dd42bc02..a85f5713 100644 --- a/modules/packages/gui.nix +++ b/modules/packages/gui.nix @@ -92,7 +92,7 @@ inputs: wl-clipboard-x11 parallel lsof duperemove mlocate kmscon hdparm bat gnuplot whois zoom traceroute tcping-go tcpdump nmap mtr-gui simplescreenrecorder obs-studio signal-desktop dbeaver ftxui yaml-cpp wl-mirror poppler_utils imagemagick gimp - playonlinux bottles davinci-resolve + playonlinux bottles # davinci-resolve ] ++ (with inputs.lib; filter isDerivation (attrValues inputs.pkgs.plasma5Packages.kdeGear)); programs.wireshark = { enable = true; package = inputs.pkgs.wireshark; };