kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

k

Browse Source
This commit is contained in:
Kopatz
2025-08-03 14:13:20 +02:00
parent d5707f5e65
commit fc096a8b24
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
modules/misc/kernel-testing.nix
View File

@@ -73,14 +73,19 @@ let
}; };
}; };
linux_6_15 = pkgs.buildLinux { linux_6_16 = pkgs.buildLinux {
version = "6.15.0"; version = "6.16.0";
extraMeta.branch = "6.15"; extraMeta.branch = "6.16";
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.15.tar.gz"; url = "mirror://kernel/linux/kernel/v6.x/linux-6.16.tar.xz";
hash = "sha256-PQjXBWJV+i2O0Xxbg76HqbHyzu7C0RWkvHJ8UywJSCw="; 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 in
{ {
#boot.extraModulePackages = [ amdgpu_module ]; #boot.extraModulePackages = [ amdgpu_module ];
@@ -97,11 +102,13 @@ in
# }; # };
#}); #});
boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (linux_6_15.override { #boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (linux_6_15.override {
structuredExtraConfig = with lib.kernel; { # structuredExtraConfig = with lib.kernel; {
SCHED_DEBUG = lib.mkForce unset; # SCHED_DEBUG = lib.mkForce unset;
}; # };
})); #}));
boot.kernelPackages = pkgs.linuxPackagesFor linux_6_16;
#boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (linux_amd_drm_next.override { #boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (linux_amd_drm_next.override {
# structuredExtraConfig = with lib.kernel; { # structuredExtraConfig = with lib.kernel; {

11
systems/pc/configuration.nix
View File

@@ -179,13 +179,14 @@
# Enable CUPS to print documents. # Enable CUPS to print documents.
# disable until CVE-2024-47176, CVE-2024-47076, CVE-2024-47175, and CVE-2024-47177 is fixed # 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.enable = false;
services.printing.drivers = [ pkgs.brlaser ]; services.printing.drivers = [ pkgs.brlaser ];
#services.avahi = { services.avahi = {
# enable = false; enable = false;
# nssmdns4 = true; nssmdns4 = true;
# openFirewall = true; openFirewall = true;
#}; };
# Enable automatic login for the user. # Enable automatic login for the user.
#services.xserver.displayManager.autoLogin.enable = true; #services.xserver.displayManager.autoLogin.enable = true;