From 33b3de0c41d1886442faa26431db586f0f7282f8 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Fri, 21 Apr 2023 08:14:29 +0200
Subject: [PATCH] Improve default display config for hikari

---
 home/windowManager/i3.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/home/windowManager/i3.nix b/home/windowManager/i3.nix
index 3526edc..c9127a4 100644
--- a/home/windowManager/i3.nix
+++ b/home/windowManager/i3.nix
@@ -10,9 +10,10 @@ let
   modifier = config.xsession.windowManager.i3.config.modifier;
 
   soundSwitcherForHikari2 = if ownLib.onHikari { } then "" else "-D pulse";
-  displayBrightnessDevice = if ownLib.onHikari { } then "mba6x_backlight" else "";
   keyboardBrightnessDevice = if ownLib.onHikari { } then "smc::kbd_backlight" else "";
+  displayBrightnessDevice = if ownLib.onHikari { } then "mba6x_backlight" else "";
   displayBuiltInOutput = if ownLib.onHikari { } then "eDP-1" else "eDP1";
+  displayDefaults = if ownLib.onHikari { } then "--output ${displayBuiltInOutput} --mode 1366x768 --scale 1.25x1.25" else "";
 in {
   enable = true;
   config = {
@@ -358,7 +359,7 @@ in {
       # TODO: Maybe move to dmenu script instead?!
       # "display setup: [a]uto [e]extern only [h]ome [i]intern [r]ecord [v]ideo" = {
       displays = {
-        "a" = "exec xrandr --auto && xbacklight -set 10;";
+        "a" = "exec xrandr --auto ${displayDefaults} && ${pkgs.brightnessctl}/bin/brightnessctl --device ${displayBrightnessDevice} s 10;";
         "e" = "exec xrandr --auto --output ${displayBuiltInOutput} --off";
         "h" = "exec xrandr --output ${displayBuiltInOutput} --off --output DP2-1 --scale 1x1 --mode 2560x1440";
         "v" = "exec xrandr --auto --output DP2-1 --primary --scale 1x1 --mode 2560x1440 --output ${displayBuiltInOutput} --mode 1920x1080 --left-of DP2-1";