andreas/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: andreas:72cac1e8c63ec7c06e6921555bdcff0f676b20dc
Branches Tags
andreas:trunk
andreas:divergence
..
compare: andreas:9ca20b8e24b7f6615581eac6d5349b8ef7a58067
Branches Tags
andreas:trunk
andreas:divergence

No commits in common. "72cac1e8c63ec7c06e6921555bdcff0f676b20dc" and "9ca20b8e24b7f6615581eac6d5349b8ef7a58067" have entirely different histories.
72cac1e8c6 ... 9ca20b8e24

2 changed files with 17 additions and 23 deletions
Show Stats Expand all files Collapse all files

32
modules/nixos/hardware/graphics-nvidia-prime-amd-testing/default.nix
View File

@ -19,8 +19,8 @@ in
# without modesetting, x server will be run by nvidia # without modesetting, x server will be run by nvidia
services.xserver.videoDrivers = [ services.xserver.videoDrivers = [
"amdgpu" "amdgpu"
# "modesetting" "modesetting"
"nvidia" "nvidia"
]; ];
# Enable OpenGL # Enable OpenGL
@ -39,21 +39,20 @@ in
# Enable required Kernel Modules # Enable required Kernel Modules
boot.initrd.kernelModules = [ boot.initrd.kernelModules = [
"amdgpu" "amdgpu"
# "modesetting" "nvidia"
# "nvidia"
# "nvidia-drm" # "nvidia-drm"
# "nvidiafb" "nvidiafb"
# # "nvidia-uvm" # "nvidia-uvm"
# "nvidia-modeset" # "nvidia-modeset"
# "i2c-nvidia_gpu" # "i2c-nvidia_gpu"
]; ];
boot.kernelParams = [ boot.kernelParams = [
# "amdgpu.modeset=1" "amdgpu.modeset=1"
# "nvidia-drm.fbdev=1" "nvidia-drm.fbdev=1"
# "nvidia-drm.modeset=0" "nvidia-drm.modeset=1"
# # "nvidia.NVreg_PreserveVideoMemoryAllocations=0" # "nvidia.NVreg_PreserveVideoMemoryAllocations=0"
"amd_iommu=on" "amd_iommu=on"
# "vfio-pci.ids=\"10de:2489,10de:228b\"" # "vfio-pci.ids=\"10de:2489,10de:228b\""
# "nomodeset" # "nomodeset"
@ -63,7 +62,7 @@ in
# Blacklist intel and nouveau # Blacklist intel and nouveau
boot.blacklistedKernelModules = [ boot.blacklistedKernelModules = [
# "i915" "i915"
"nouveau" "nouveau"
# "nvidia" # "nvidia"
# "nvidia-drm" # "nvidia-drm"
@ -74,10 +73,10 @@ in
]; ];
# Extra blacklist nouveau # Extra blacklist nouveau
# boot.extraModprobeConfig = '' boot.extraModprobeConfig = ''
# blacklist nouveau blacklist nouveau
# options nouveau modeset=0 options nouveau modeset=0
# ''; '';
# Configure NVIDIA driver # Configure NVIDIA driver
hardware.nvidia = { hardware.nvidia = {
@ -119,8 +118,7 @@ in
enable = true; enable = true;
enableOffloadCmd = true; enableOffloadCmd = true;
}; };
# sync.enable=true; reverseSync.enable = false;
# reverseSync.enable = false;
# Make sure to use the correct Bus ID values for your system! # Make sure to use the correct Bus ID values for your system!
# intelBusId = "PCI:0:2:0"; # intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:01:0:0"; nvidiaBusId = "PCI:01:0:0";

8
systems/x86_64-linux/drivebystation-nix/configuration.nix
View File

@ -118,12 +118,8 @@
# services.openssh.enable = true; # services.openssh.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ # networking.firewall.allowedTCPPorts = [ ... ];
24800 #Synergy # networking.firewall.allowedUDPPorts = [ ... ];
];
networking.firewall.allowedUDPPorts = [
24800 #Synergy
];
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;