From e5facd6a9e91974b16b83b204c3bbbe92e8b74a2 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Sat, 6 Jul 2024 21:27:25 +0200 Subject: [PATCH] Nixos: Enable linux zen only on desktop --- system/default.nix | 3 ++- system/nixinator/default.nix | 4 ++++ system/nixtop/hardware-configuration.nix | 13 +++++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/system/default.nix b/system/default.nix index 96331310..3e2aea49 100644 --- a/system/default.nix +++ b/system/default.nix @@ -87,7 +87,8 @@ with mylib.networking; { # Bootloader/Kernel stuff boot = { - kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = pkgs.linuxPackages_latest; + # kernelPackages = pkgs.linuxPackages_zen; # NOTE: Only set for nixinator # kernelPackages = pkgs.linuxPackages_latest; # The package set that includes the kernel and modules kernelParams = ["mitigations=off"]; # I don't care about security regarding spectre/meltdown diff --git a/system/nixinator/default.nix b/system/nixinator/default.nix index cf7ccb0a..fe2cbb60 100644 --- a/system/nixinator/default.nix +++ b/system/nixinator/default.nix @@ -88,6 +88,10 @@ # # musnix.soundcardPciId = ; # }; + boot = { + kernelPackages = pkgs.linuxPackages_zen; + }; + services.xserver = { # Configure keymap in X11 xkb.layout = "us"; diff --git a/system/nixtop/hardware-configuration.nix b/system/nixtop/hardware-configuration.nix index 173ca1fd..8a2a5e58 100644 --- a/system/nixtop/hardware-configuration.nix +++ b/system/nixtop/hardware-configuration.nix @@ -16,8 +16,17 @@ initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; initrd.kernelModules = []; kernelModules = ["kvm-intel"]; - extraModulePackages = with config.boot.kernelPackages; [ - ]; + extraModulePackages = with config.boot.kernelPackages; []; + # NOTE: Didn't work with Zen, switched to regular kernel instead + # kernelPatches = [ + # { + # name = "ipeth"; + # patch = null; + # extraConfig = '' + # USB_IPHETH y + # ''; + # } + # ]; }; fileSystems."/" = {