updates to kaladin after cpu change
This commit is contained in:
parent
a6454a4e0f
commit
04ff90b9a0
5 changed files with 11 additions and 5 deletions
|
|
@ -161,6 +161,7 @@
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
niri.nixosModules.niri
|
niri.nixosModules.niri
|
||||||
nixos-hardware.nixosModules.common-gpu-amd
|
nixos-hardware.nixosModules.common-gpu-amd
|
||||||
|
nixos-hardware.nixosModules.common-cpu-amd
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
|
|
|
||||||
|
|
@ -240,7 +240,7 @@ in
|
||||||
WLR_RENDERER = "vulkan";
|
WLR_RENDERER = "vulkan";
|
||||||
XDG_SESSION_TYPE = "wayland";
|
XDG_SESSION_TYPE = "wayland";
|
||||||
# Remember that this causes issues in some games use "unset SDL_VIDEODRIVER &&"
|
# Remember that this causes issues in some games use "unset SDL_VIDEODRIVER &&"
|
||||||
SDL_VIDEODRIVER = "wayland";
|
SDL_VIDEODRIVER = "wayland,x11";
|
||||||
CLUTTER_BACKEND = "wayland";
|
CLUTTER_BACKEND = "wayland";
|
||||||
WLR_NO_HARDWARE_CURSORS = "1";
|
WLR_NO_HARDWARE_CURSORS = "1";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,7 @@ with lib;
|
||||||
# Warning: GPU optimisations have the potential to damage hardware
|
# Warning: GPU optimisations have the potential to damage hardware
|
||||||
gpu = {
|
gpu = {
|
||||||
apply_gpu_optimisations = "accept-responsibility";
|
apply_gpu_optimisations = "accept-responsibility";
|
||||||
gpu_device = 0;
|
gpu_device = 1;
|
||||||
amd_performance_level = "high";
|
amd_performance_level = "high";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,16 +15,21 @@
|
||||||
|
|
||||||
networking.hostName = "kaladin"; # Define your hostname.
|
networking.hostName = "kaladin"; # Define your hostname.
|
||||||
|
|
||||||
networking.interfaces.enp0s31f6.useDHCP = true;
|
networking.interfaces.enp8s0.useDHCP = true;
|
||||||
networking.interfaces.wlp9s0.useDHCP = true;
|
networking.interfaces.wlp9s0.useDHCP = true;
|
||||||
|
|
||||||
# NVIDIA
|
# NVIDIA
|
||||||
# services.xserver.videoDrivers = [ "nvidia" ];
|
# services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
hardware = {
|
hardware = {
|
||||||
|
amdgpu = {
|
||||||
|
opencl.enable = true;
|
||||||
|
initrd.enable = true;
|
||||||
|
};
|
||||||
graphics = {
|
graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
mesa
|
mesa
|
||||||
|
vulkan-extension-layer
|
||||||
libva-vdpau-driver
|
libva-vdpau-driver
|
||||||
libvdpau-va-gl
|
libvdpau-va-gl
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -57,5 +57,5 @@
|
||||||
# networking.interfaces.wlp7s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.wlp7s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue