From 87c1648dc37a832f90df8b26b00a311b796ed893 Mon Sep 17 00:00:00 2001
From: Caroline Larimore <caroline@larimo.re>
Date: Thu, 25 Jul 2024 23:02:06 -0700
Subject: roles: desktop: replace hardcoded setupCommands with option

---
 roles/desktop/default.nix |  8 ++++++++
 roles/desktop/xserver.nix | 14 ++------------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'roles')

diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix
index f48b82c..ac6444f 100644
--- a/roles/desktop/default.nix
+++ b/roles/desktop/default.nix
@@ -9,6 +9,14 @@ let cfg = config.roles.desktop; in {
 
   options.roles.desktop = {
     enable = mkEnableOption "desktop";
+
+    setupCommands = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Shell commands executed just after the X server has started.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
diff --git a/roles/desktop/xserver.nix b/roles/desktop/xserver.nix
index 461de83..89e768e 100644
--- a/roles/desktop/xserver.nix
+++ b/roles/desktop/xserver.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   services.displayManager = {
@@ -9,17 +9,7 @@
     videoDrivers = [ "amdgpu" ];
 
     displayManager = {
-      setupCommands = ''
-        if ${pkgs.xorg.xrandr}/bin/xrandr --query | grep 2560x1080; then
-          ${pkgs.xorg.xrandr}/bin/xrandr --output DVI-D-0 --mode 1920x1080  --rate 60  --pos 0x0
-          ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-2 --mode 2560x1080  --rate 60  --pos 1920x0 --primary
-          ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-A-0 --mode 1920x1080  --rate 75  --pos 4480x0
-        elif ${pkgs.xorg.xrandr}/bin/xrandr --query | grep 2560x1440; then
-          ${pkgs.xorg.xrandr}/bin/xrandr --output DVI-D-0 --mode 1920x1080 --rate 60 --pos 0x360
-          ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-2 --mode 2560x1440 --rate 165 --pos 1920x0 --primary
-          ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-1 --mode 1920x1200 --rate 60 --pos 4480x0
-        fi
-      '';
+      setupCommands = config.roles.desktop.setupCommands;
     };
 
     xkb.layout = "us";
-- 
cgit v1.2.3