hibernation works now
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
boot.kernelParams = [ "drm.edid_firmware=DP-6:edid/edid.bin" ];
|
||||
|
||||
hardware.firmware = [
|
||||
(
|
||||
pkgs.runCommand "edid.bin" { } ''
|
||||
mkdir -p $out/lib/firmware/edid
|
||||
cp ${./firmware/KG271-edid.bin} $out/lib/firmware/edid/edid.bin
|
||||
''
|
||||
)];
|
||||
}
|
||||
BIN
systems/x86_64-linux/drivebystation-nix/hardware/firmware/KG271-edid.bin
Executable file
BIN
systems/x86_64-linux/drivebystation-nix/hardware/firmware/KG271-edid.bin
Executable file
Binary file not shown.
@@ -0,0 +1,10 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
inherit (lib.my-namespace) enabled;
|
||||
in
|
||||
{
|
||||
lib.my-namespace.hardware = {
|
||||
novidia = enabled;
|
||||
#nvidia-stable.enabled = enabled;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,115 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
|
||||
# Enable OpenGL
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [ nvidia-vaapi-driver ];
|
||||
};
|
||||
|
||||
# Load nvidia driver for Xorg and Wayland
|
||||
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11_production ];
|
||||
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
|
||||
|
||||
|
||||
boot.loader.systemd-boot.consoleMode = "max";
|
||||
|
||||
boot.kernelParams = [
|
||||
"nvidia-drm.fbdev=1"
|
||||
"nvidia-drm.modeset=1"
|
||||
# "nvidia.NVreg_PreserveVideoMemoryAllocations=0"
|
||||
"amd_iommu=on"
|
||||
"amdgpu.modeset=1"
|
||||
# "vfio-pci.ids=\"10de:2489,10de:228b\""
|
||||
# "nomodeset"
|
||||
# "nvidia_drm.modeset=1"
|
||||
];
|
||||
boot.blacklistedKernelModules = [
|
||||
"i915"
|
||||
"nouveau"
|
||||
# "nvidia"
|
||||
# "nvidia-drm"
|
||||
# "nvidia-uvm"
|
||||
# "nvidiafb"
|
||||
# "nvidia_drm"
|
||||
# "nvidia_modeset"
|
||||
];
|
||||
# boot.extraModprobeConfig = ''
|
||||
# blacklist nvidia
|
||||
# blacklist nvidia-drm
|
||||
# blacklist nvidia_drm
|
||||
# blacklist nvidia-uvm
|
||||
# blacklist nvidia_uvm
|
||||
# blacklist nvidia_modeset
|
||||
# blacklist nvidiafb
|
||||
# blacklist nouveau
|
||||
# options nouveau modeset=0
|
||||
# '';
|
||||
boot.extraModprobeConfig = ''
|
||||
blacklist nouveau
|
||||
options nouveau modeset=0
|
||||
'';
|
||||
# services.xserver.videoDrivers = [ "nvidia" ];
|
||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||
|
||||
# services.udev.extraRules = ''
|
||||
# # Remove NVIDIA USB xHCI Host Controller devices, if present
|
||||
# ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1"
|
||||
# # Remove NVIDIA USB Type-C UCSI devices, if present
|
||||
# ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1"
|
||||
# # Remove NVIDIA Audio devices, if present
|
||||
# ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1"
|
||||
# # Remove NVIDIA VGA/3D controller devices
|
||||
# ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1"
|
||||
# '';
|
||||
|
||||
boot.initrd.kernelModules = [
|
||||
"amdgpu"
|
||||
"nvidia_uvm"
|
||||
"nvidia_drm"
|
||||
"nvidia"
|
||||
"nvidia-drm"
|
||||
"nvidiafb"
|
||||
"nvidia-modeset"
|
||||
"nvidia-uvm"
|
||||
# "i2c-nvidia_gpu"
|
||||
];
|
||||
hardware.nvidia = {
|
||||
# Modesetting is required.
|
||||
modesetting.enable = false;
|
||||
|
||||
# Nvidia power management. Experimental, and can cause sleep/suspend to fail.
|
||||
# Enable this if you have graphical corruption issues or application crashes after waking
|
||||
# up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
|
||||
# of just the bare essentials.
|
||||
powerManagement.enable = true;
|
||||
|
||||
# Fine-grained power management. Turns off GPU when not in use.
|
||||
# Experimental and only works on modern Nvidia GPUs (Turing or newer).
|
||||
powerManagement.finegrained = false;
|
||||
|
||||
# Use the NVidia open source kernel module (not to be confused with the
|
||||
# independent third-party "nouveau" open source driver).
|
||||
# Support is limited to the Turing and later architectures. Full list of
|
||||
# supported GPUs is at:
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
|
||||
# Only available from driver 515.43.04+
|
||||
# Currently alpha-quality/buggy, so false is currently the recommended setting.
|
||||
open = false;
|
||||
|
||||
# Enable the Nvidia settings menu,
|
||||
# accessible via `nvidia-settings`.
|
||||
nvidiaSettings = true;
|
||||
|
||||
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
||||
# package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
# package = config.boot.kernelPackages.nvidiaPackages.none;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.production;
|
||||
|
||||
|
||||
};
|
||||
users.users.andreas = {
|
||||
extraGroups = [ "video" "render" ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
# 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, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
./graphics/nvidia-stable.nix
|
||||
./graphics/nvidia.nix
|
||||
./acer-monitor-edid.nix
|
||||
];
|
||||
#boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
|
||||
boot.kernelPackages = pkgs.linuxPackages;
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.kernelModules = [ "kvm-amd" "4vl2loopback" ];
|
||||
boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
|
||||
|
||||
boot.blacklistedKernelModules = [ ];
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/E846-D998";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
|
||||
|
||||
# Try to fix hibernation
|
||||
|
||||
# swapDevices = [ ];
|
||||
swapDevices = [ {
|
||||
device = "/var/lib/swapfile";
|
||||
size = 32*1024;
|
||||
} ]; #resume-offset = 78399488
|
||||
boot.resumeDevice = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76"; # the unlocked drive mapping
|
||||
boot.kernelParams = [
|
||||
"resume_offset=78399488" #sudo filefrag -v /var/lib/swapfile|awk 'NR==4{gsub(/\./,"");print $4;}'
|
||||
];
|
||||
security.protectKernelImage = false;
|
||||
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still po ssible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp72s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user