From 14317eea79fe8ea799a263542f126b59f4361d5c Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 24 Jun 2020 02:23:59 +0100 Subject: fix(tazjin/frog): Explicitly use amdgpu driver This ends up using the same driver, but generates saner display names somehow. Who knows what's going on there. FWIW, it didn't help with the font weight issue. Change-Id: Ib6161088b23109f4f0e24b8a87c478ad274df4d6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/566 Reviewed-by: tazjin --- users/tazjin/emacs/config/desktop.el | 14 +++++++------- users/tazjin/nixos/frog/default.nix | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/users/tazjin/emacs/config/desktop.el b/users/tazjin/emacs/config/desktop.el index b5915233cd51..8cb0f18b7462 100644 --- a/users/tazjin/emacs/config/desktop.el +++ b/users/tazjin/emacs/config/desktop.el @@ -216,18 +216,18 @@ (defun randr-frog-layout-right-only () "Use only the right screen on frog." (interactive) - (set-randr-config `(("DP-1" ,(number-sequence 0 9)))) - (shell-command "xrandr --output DP-2 --off") - (shell-command "xrandr --output DP-1 --auto --primary")) + (set-randr-config `(("DisplayPort-0" ,(number-sequence 0 9)))) + (shell-command "xrandr --output DisplayPort-1 --off") + (shell-command "xrandr --output DisplayPort-0 --auto --primary")) (defun randr-frog-layout-both () "Use the left and right screen on frog." (interactive) - (set-randr-config `(("DP-2" 1 2 3 4 5) - ("DP-1" 6 7 8 9 0))) + (set-randr-config `(("DisplayPort-1" 1 2 3 4 5) + ("DisplayPort-0" 6 7 8 9 0))) - (shell-command "xrandr --output DP-2 --auto --primary --left-of DP-1") - (shell-command "xrandr --output DP-1 --auto --right-of DP-2")) + (shell-command "xrandr --output DisplayPort-1 --auto --primary --left-of DisplayPort-0") + (shell-command "xrandr --output DisplayPort-0 --auto --right-of DisplayPort-1")) (pcase (s-trim (shell-command-to-string "hostname")) ("vauxhall" diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix index 478c3882981b..62273b0b5733 100644 --- a/users/tazjin/nixos/frog/default.nix +++ b/users/tazjin/nixos/frog/default.nix @@ -151,6 +151,7 @@ in depot.lib.fix(self: { layout = "us"; xkbOptions = "caps:super"; exportConfiguration = true; + videoDrivers = [ "amdgpu" ]; displayManager = { # Give EXWM permission to control the session. sessionCommands = "${nixpkgs.xorg.xhost}/bin/xhost +SI:localuser:$USER"; -- cgit 1.4.1