diff options
| author | Alan Pearce | 2019-10-22 13:21:06 +0200 |
|---|---|---|
| committer | Alan Pearce | 2019-10-22 13:21:06 +0200 |
| commit | 29ad3be5d41963493ab36341cb6a058099757535 (patch) | |
| tree | 388e14200e501267ce5be98033dab8ded7ac5fd1 | |
| parent | df9e2d5331a863e285bcfe66391728ce884a61bc (diff) | |
| download | nixfiles-29ad3be5d41963493ab36341cb6a058099757535.tar.lz nixfiles-29ad3be5d41963493ab36341cb6a058099757535.tar.zst nixfiles-29ad3be5d41963493ab36341cb6a058099757535.zip | |
intel-gpu: switch back to intel driver
| -rw-r--r-- | system/autorandr/docked-close/config | 16 | ||||
| -rw-r--r-- | system/autorandr/docked-open/config | 16 | ||||
| -rw-r--r-- | system/autorandr/laptop/config | 16 | ||||
| -rw-r--r-- | system/autorandr/work-1/config | 16 | ||||
| -rw-r--r-- | system/settings/hardware/intel-gpu.nix | 8 |
5 files changed, 40 insertions, 32 deletions
diff --git a/system/autorandr/docked-close/config b/system/autorandr/docked-close/config index 1f4ebdb1..1da7d06c 100644 --- a/system/autorandr/docked-close/config +++ b/system/autorandr/docked-close/config @@ -1,20 +1,20 @@ -output DP-1 +output DP1 off -output HDMI-1 +output HDMI1 off -output DP-2 +output DP2 off -output HDMI-2 +output HDMI2 off -output DP-2-3 +output DP2-3 off -output eDP-1 +output eDP1 off -output DP-2-1 +output DP2-1 mode 2560x1440 pos 1920x0 rate 59.95 -output DP-2-2 +output DP2-2 mode 2560x1440 pos 4480x0 rate 59.95 diff --git a/system/autorandr/docked-open/config b/system/autorandr/docked-open/config index 84771820..42437216 100644 --- a/system/autorandr/docked-open/config +++ b/system/autorandr/docked-open/config @@ -1,23 +1,23 @@ -output DP-1 +output DP1 off -output HDMI-1 +output HDMI1 off -output DP-2 +output DP2 off -output HDMI-2 +output HDMI2 off -output DP-2-3 +output DP2-3 off -output eDP-1 +output eDP1 mode 1920x1080 pos 0x0 primary rate 60.03 -output DP-2-1 +output DP2-1 mode 2560x1440 pos 1920x0 rate 59.95 -output DP-2-2 +output DP2-2 mode 2560x1440 pos 4480x0 rate 59.95 diff --git a/system/autorandr/laptop/config b/system/autorandr/laptop/config index 0048c8b9..94f4e43d 100644 --- a/system/autorandr/laptop/config +++ b/system/autorandr/laptop/config @@ -1,18 +1,18 @@ -output DP-1 +output DP1 off -output HDMI-1 +output HDMI1 off -output DP-2 +output DP2 off -output HDMI-2 +output HDMI2 off -output DP-2-1 +output DP2-1 off -output DP-2-2 +output DP2-2 off -output DP-2-3 +output DP2-3 off -output eDP-1 +output eDP1 mode 1920x1080 pos 0x0 primary diff --git a/system/autorandr/work-1/config b/system/autorandr/work-1/config index 3573f22d..34fda0db 100644 --- a/system/autorandr/work-1/config +++ b/system/autorandr/work-1/config @@ -1,21 +1,21 @@ -output DP-1 +output DP1 off -output HDMI-1 +output HDMI1 off -output DP-2 +output DP2 off -output HDMI-2 +output HDMI2 mode 1920x1200 pos 0x0 primary rate 59.95 -output DP-2-1 +output DP2-1 off -output DP-2-2 +output DP2-2 off -output DP-2-3 +output DP2-3 off -output eDP-1 +output eDP1 mode 1920x1080 pos 1920x0 rate 60.03 diff --git a/system/settings/hardware/intel-gpu.nix b/system/settings/hardware/intel-gpu.nix index 95d27cc0..3503c315 100644 --- a/system/settings/hardware/intel-gpu.nix +++ b/system/settings/hardware/intel-gpu.nix @@ -1,6 +1,14 @@ { config, pkgs, ... }: { + # https://wiki.gentoo.org/wiki/Intel#Feature_support + services.xserver = { + useGlamor = true; + deviceSection = '' + Option "DRI" "3" + ''; + videoDrivers = [ "intel" ]; + }; boot.kernelParams = [ "i915.enable_guc=2" |