From 6d3a143ce2d7cd98b5b0f592b44f4d13eee9bb45 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Fri, 14 Feb 2025 17:37:01 -0500
Subject: [PATCH] working on screens and power stuff

---
 .../dotfiles/dot_config/shikane/config.toml   | 52 +++++++++++--------
 hosts/eddie/configuration.nix                 |  5 +-
 modules/home/niri.nix                         |  2 +-
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/homes/emenel/dotfiles/dot_config/shikane/config.toml b/homes/emenel/dotfiles/dot_config/shikane/config.toml
index daa1ee9..259bc72 100644
--- a/homes/emenel/dotfiles/dot_config/shikane/config.toml
+++ b/homes/emenel/dotfiles/dot_config/shikane/config.toml
@@ -1,13 +1,25 @@
+[[profile]]
+name = "desk-clam"
+exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""]
+     [[profile.output]]
+     search = ["n=eDP-1"]
+     enable = false
+
+     [[profile.output]]
+     search = ["m=BenQ PD2725U", "s=N2N00414019", "v=PNP(BNQ)"]
+     enable = true
+     mode = "3840x2160@59.997Hz"
+     position = "0,0"
+
+
 [[profile]]
 name = "desk-dual"
 exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""]
      [[profile.output]]
+     search = "eDP-1"
      enable = true
-     search = ["m=TL140ADXP04-0", "s=", "v=Thermotrex Corporation"]
      mode = "2560x1600@240Hz"
      position = "3840,0"
-     scale = 1.0
-     transform = "normal"
      adaptive_sync = true
 
      [[profile.output]]
@@ -15,9 +27,6 @@ exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""
      search = ["m=BenQ PD2725U", "s=N2N00414019", "v=PNP(BNQ)"]
      mode = "3840x2160@59.997Hz"
      position = "0,0"
-     scale = 1.0
-     transform = "normal"
-     adaptive_sync = false
 
 
 [[profile]]
@@ -25,26 +34,23 @@ name = "laptop"
 exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""]
      [[profile.output]]
      enable = true
-     search = ["m=TL140ADXP04-0", "s=", "v=Thermotrex Corporation"]
+     search = "eDP-1"
      mode = "2560x1600@240Hz"
      position = "0,0"
-     scale = 1.0
-     transform = "normal"
      adaptive_sync = true
 
 
-[[profile]]
-name = "misc"
-exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""]
-     [[profile.output]]
-     enable = true
-     search = ["m=TL140ADXP04-0", "s=", "v=Thermotrex Corporation"]
-     mode = "2560x1600@240Hz"
-     position = "3840,0"
-     scale = 1.0
-     transform = "normal"
-     adaptive_sync = true
+# [[profile]]
+# name = "laptop-mirror"
+# exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\"",
+#        "wl-present mirror eDP-1 & sleep .5; wl-present fullscreen-output HDMI-A-1; wl-present fullscreen"]
+#      [[profile.output]]
+#      enable = true
+#      search = ["m=TL140ADXP04-0", "s=", "v=Thermotrex Corporation"]
+#      mode = "2560x1600@240Hz"
+#      position = "0,0"
+#      adaptive_sync = true
 
-     [[profile.output]]
-     enable = true
-     match = "/.*/"
+#      [[profile.output]]
+#      enable = true
+#      search  = "n/HDMI-[ABC]-[1-9]" # search for a matching name by regex
diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix
index 2da2df9..671099d 100644
--- a/hosts/eddie/configuration.nix
+++ b/hosts/eddie/configuration.nix
@@ -167,7 +167,8 @@ password=${config.sops.placeholder.filez}
       efi.canTouchEfiVariables = true;
     };
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelModules = [ "i2c-dev" "ddcci_backlight" ];
+    kernelModules = [ "i2c-dev" "ddcci-backlight" ];
+    extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver ];
     initrd.systemd.enable = true;
     initrd.kernelModules = [
       "nvidia"
@@ -257,7 +258,7 @@ password=${config.sops.placeholder.filez}
   services.logind = {
     extraConfig = ''
       IdleAction=lock
-      IdleActionSec=5m
+      IdleActionSec=15m
     '';
   };
   services.udev = {
diff --git a/modules/home/niri.nix b/modules/home/niri.nix
index fd15ceb..e546512 100644
--- a/modules/home/niri.nix
+++ b/modules/home/niri.nix
@@ -181,7 +181,7 @@ in {
 
         switch-events = with config.lib.niri.actions; {
           lid-close.action = spawn "shikanectl switch desk-clam";
-          lid-open.action = spawn "niri msg output eDP-1 on";
+          lid-open.action = spawn "niri msg output eDP-1 on && shikanectl reload";
         };
 
         binds = with config.lib.niri.actions; let