Revert "Another attempt at fixing nvidia"

This reverts commit 3f9072c977.
This commit is contained in:
Payas Relekar 2019-12-01 21:42:30 +05:30
parent 3f9072c977
commit fe6613b5d1

View file

@ -54,7 +54,9 @@
};
};
boot.kernelPackages = pkgs.linuxPackages_latest;
# boot.extraModulePackages = [ pkgs.linuxPackages.nvidia_x11 ];
fileSystems."/mnt/Data" =
{ device = "/dev/sda4";
fsType = "ntfs";
@ -129,46 +131,18 @@
};
# Enable the X11 windowing system.
# services.xserver.enable = true;
services.xserver.enable = true;
# services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e";
boot.kernelPackages = pkgs.linuxPackages_latest;
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11_beta ];
services.xserver.videoDrivers = [ "intel" "nvidia" ];
hardware.opengl.driSupport32Bit = true;
# hardware.nvidia.optimus_prime.enable = false;
hardware.nvidia.optimus_prime.enable = false;
# Bus ID of the NVIDIA GPU. You can find it using lspci, either under 3D or VGA
# hardware.nvidia.optimus_prime.nvidiaBusId = "PCI:1:0:0";
hardware.nvidia.optimus_prime.nvidiaBusId = "PCI:1:0:0";
# Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA
# hardware.nvidia.optimus_prime.intelBusId = "PCI:0:2:0";
# hardware.nvidia.modesetting.enable = true;
hardware = {
nvidia = {
modesetting = {
enable = true;
};
optimus_prime = {
enable = false;
# values are from lspci
# try lspci | grep -P 'VGA|3D'
intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0";
};
};
};
services = {
xserver = {
enable = true;
videoDrivers = [
"intel" "nvidiaBeta" # nvidia should work fine as well
# "modesetting"
];
};
};
hardware.nvidia.optimus_prime.intelBusId = "PCI:0:2:0";
hardware.nvidia.modesetting.enable = true;
# Enable touchpad support.
services.xserver.libinput.enable = true;
@ -310,9 +284,9 @@
environment.variables.JAVA_HOME = "${pkgs.jdk.home}/lib/jetbrains.jdk";
# virtualBox
# virtualisation.virtualbox.host.enable = true;
# users.extraGroups.vboxusers.members = [ "payas" ];
# virtualisation.virtualbox.host.enableExtensionPack = true;
virtualisation.virtualbox.host.enable = true;
users.extraGroups.vboxusers.members = [ "payas" ];
virtualisation.virtualbox.host.enableExtensionPack = true;
# services.syncthing = {
# enable = true;