diff --git a/common/hardware/laptop.nix b/common/hardware/laptop.nix index beb2b3a..a2dddac 100644 --- a/common/hardware/laptop.nix +++ b/common/hardware/laptop.nix @@ -44,13 +44,13 @@ in boot = { kernelParams = [ - "splash" - "quiet" - "intel_iommu=on" - "iommu=force" - "pcie_acs_override=downstream" - "mmio_stale_data=full,nosmt" - "pcie_aspm=off" +# "splash" +# "quiet" +# "intel_iommu=on" +# "iommu=force" +# "pcie_acs_override=downstream" +# "mmio_stale_data=full,nosmt" +# "pcie_aspm=off" ]; # "vfio-pci.ids=10de:1aeb,10de:2191,10de:1aed,10de:1aec" ]; initrd.availableKernelModules = [ "xhci_pci" @@ -73,10 +73,10 @@ in })) ]; kernelModules = [ - "kvm-intel" - "vfio_pci" - "vfio_iommu_type1" - "vfio" + # "kvm-intel" + # "vfio_pci" + # "vfio_iommu_type1" + # "vfio" "ddcci_backlight" "i2c-dev" ]; diff --git a/specific/grimm-nixos-laptop/configuration.nix b/specific/grimm-nixos-laptop/configuration.nix index 1be5f1b..e1bdb5a 100644 --- a/specific/grimm-nixos-laptop/configuration.nix +++ b/specific/grimm-nixos-laptop/configuration.nix @@ -8,10 +8,6 @@ networking.hostName = "grimmauld-nixos"; - environment.sessionVariables = { - OMP_NUM_THREADS = "12"; - }; - system.stateVersion = "23.05"; grimmShared.gaming = true; diff --git a/specific/grimm-nixos-laptop/hardware-configuration.nix b/specific/grimm-nixos-laptop/hardware-configuration.nix index 224cdb5..6dab044 100644 --- a/specific/grimm-nixos-laptop/hardware-configuration.nix +++ b/specific/grimm-nixos-laptop/hardware-configuration.nix @@ -1,9 +1,9 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ +{ config, lib, pkgs, modulesPath, ... }: let + cpus = "12"; +in { imports = [ (modulesPath + "/installer/scan/not-detected.nix") @@ -12,6 +12,7 @@ boot.initrd.kernelModules = [ ]; boot.extraModulePackages = [ ]; + boot.kernelParams = [ "possible_cpus=${cpus}" ]; fileSystems."/" = { @@ -32,6 +33,10 @@ size = 48 * 1024; }]; + environment.sessionVariables = { + OMP_NUM_THREADS = cpus; + }; + grimmShared = { screens = { external = {