From fc096a8b244cb92a7d5fc2a2045815d58d01e194 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Sun, 3 Aug 2025 14:13:20 +0200 Subject: [PATCH] k --- modules/misc/kernel-testing.nix | 27 +++++++++++++++++---------- systems/pc/configuration.nix | 11 ++++++----- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/modules/misc/kernel-testing.nix b/modules/misc/kernel-testing.nix index d08e215..1543dfd 100644 --- a/modules/misc/kernel-testing.nix +++ b/modules/misc/kernel-testing.nix @@ -73,14 +73,19 @@ let }; }; - linux_6_15 = pkgs.buildLinux { - version = "6.15.0"; - extraMeta.branch = "6.15"; + linux_6_16 = pkgs.buildLinux { + version = "6.16.0"; + extraMeta.branch = "6.16"; src = pkgs.fetchzip { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.15.tar.gz"; - hash = "sha256-PQjXBWJV+i2O0Xxbg76HqbHyzu7C0RWkvHJ8UywJSCw="; + url = "mirror://kernel/linux/kernel/v6.x/linux-6.16.tar.xz"; + hash = "sha256:10ydzfzc3g0nhns6md08gpfshhjcyd58lylqr15alijjdgzf4jqs"; }; + #src = pkgs.fetchzip { + # url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.15.tar.gz"; + # hash = "sha256:10ydzfzc3g0nhns6md08gpfshhjcyd58lylqr15alijjdgzf4jqs"; + #}; }; + in { #boot.extraModulePackages = [ amdgpu_module ]; @@ -97,11 +102,13 @@ in # }; #}); - boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (linux_6_15.override { - structuredExtraConfig = with lib.kernel; { - SCHED_DEBUG = lib.mkForce unset; - }; - })); + #boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (linux_6_15.override { + # structuredExtraConfig = with lib.kernel; { + # SCHED_DEBUG = lib.mkForce unset; + # }; + #})); + + boot.kernelPackages = pkgs.linuxPackagesFor linux_6_16; #boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (linux_amd_drm_next.override { # structuredExtraConfig = with lib.kernel; { diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index e505132..dcd9eba 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -179,13 +179,14 @@ # Enable CUPS to print documents. # disable until CVE-2024-47176, CVE-2024-47076, CVE-2024-47175, and CVE-2024-47177 is fixed + # http://localhost:631 services.printing.enable = false; services.printing.drivers = [ pkgs.brlaser ]; - #services.avahi = { - # enable = false; - # nssmdns4 = true; - # openFirewall = true; - #}; + services.avahi = { + enable = false; + nssmdns4 = true; + openFirewall = true; + }; # Enable automatic login for the user. #services.xserver.displayManager.autoLogin.enable = true;