5 files changed, 22 insertions, 25 deletions

diff --git a/accounts/gkleen@skadhi/default.nix b/accounts/gkleen@skadhi/default.nix
index 553eabd5..18e23131 100644
--- a/accounts/gkleen@skadhi/default.nix
+++ b/accounts/gkleen@skadhi/default.nix
@@ -42,6 +42,11 @@ in {
 
     security.pam.services.quickshell = {};
 
+    services.upower.enable = true;
+    environment.persistence."/persistent".directories = [
+      "/var/lib/upower"
+    ];
+
     home-manager.users.${userName} = { sysConfig, config, ... }: {
       imports = [
         flakeInputs.nix-index-database.homeModules.nix-index
diff --git a/accounts/gkleen@skadhi/niri.nix b/accounts/gkleen@skadhi/niri.nix
index b30c5701..0ae76e5c 100644
--- a/accounts/gkleen@skadhi/niri.nix
+++ b/accounts/gkleen@skadhi/niri.nix
@@ -540,10 +540,6 @@ in {
             (flag "variable-refresh-rate")
           ])
 
-          (plain "debug" [
-            (sleaf "render-drm-device" "/dev/dri/by-path/pci-0000:00:02.0-render")
-          ])
-
           (plain "animations" [
             (sleaf "slowdown" 0.5)
             (plain "workspace-switch" [(flag "off")])
@@ -552,8 +548,8 @@ in {
           (plain "layout" [
             (sleaf "gaps" 8)
             (plain "struts" [
-              (sleaf "left" 26)
-              (sleaf "right" 26)
+              (sleaf "left" 2)
+              (sleaf "right" 2)
               (sleaf "top" 0)
               (sleaf "bottom" 0)
             ])
diff --git a/accounts/gkleen@skadhi/shell/default.nix b/accounts/gkleen@skadhi/shell/default.nix
index 09eb6863..d38356d3 100644
--- a/accounts/gkleen@skadhi/shell/default.nix
+++ b/accounts/gkleen@skadhi/shell/default.nix
@@ -79,17 +79,17 @@
               typeset sources=($srcs)
 
               mkdir -p $out
-              magick ''${sources[0]} -crop 10000x5625+0+79 +repage -define webp:target-size=10000000 $out/carinanebula3.webp
-              magick ''${sources[1]} -crop 6716x3778+329+80 +repage -define webp:target-size=10000000 $out/pillarsofcreation_composite.webp
-              magick ''${sources[2]} -crop 10000x5625+0+79 +repage -define webp:target-size=10000000 $out/weic2212a.webp
-              magick ''${sources[3]} -crop 7650x4302+1166+389 +repage -define webp:target-size=10000000 $out/weic2415a.webp
-              magick ''${sources[4]} -crop 8732x4912+0+434 +repage -define webp:target-size=10000000 $out/weic2330a.webp
-              magick ''${sources[5]} -crop 5302x2982+636+0 +repage -define webp:target-size=10000000 $out/weic2426a.webp
-              magick ''${sources[6]} -crop 4328x2434+0+906 +repage -define webp:target-size=10000000 $out/weic2503a.webp
-              magick ''${sources[7]} -crop 4152x2335+0+666 +repage -define webp:target-size=10000000 $out/weic2506a.webp
-              magick ''${sources[8]} -crop 4320x2430+0+0 +repage -define webp:target-size=10000000 $out/weic2514a.webp
-              magick ''${sources[9]} -crop 5863x3298+0+477 +repage -define webp:target-size=10000000 $out/weic2425c.webp
-              magick ''${sources[10]} -crop 3990x2244+0+1379 +repage -define webp:target-size=10000000 $out/weic2605c.webp
+              magick ''${sources[0]} -crop 8702x5801+251+0 +repage -define webp:target-size=10000000 $out/carinanebula3.webp
+              magick ''${sources[1]} -crop 7131x4754+0+166 +repage -define webp:target-size=10000000 $out/pillarsofcreation_composite.webp
+              magick ''${sources[2]} -crop 8675x5783+497+0 +repage -define webp:target-size=10000000 $out/weic2212a.webp
+              magick ''${sources[3]} -crop 7657x5105+1158+618 +repage -define webp:target-size=10000000 $out/weic2415a.webp
+              magick ''${sources[4]} -crop 7582x5055+0+2253 +repage -define webp:target-size=10000000 $out/weic2330a.webp
+              magick ''${sources[5]} -crop 4473x2982+1018+0 +repage -define webp:target-size=10000000 $out/weic2426a.webp
+              magick ''${sources[6]} -crop 4073x2716+147+1709 +repage -define webp:target-size=10000000 $out/weic2503a.webp
+              magick ''${sources[7]} -crop 3626x2417+526+811 +repage -define webp:target-size=10000000 $out/weic2506a.webp
+              magick ''${sources[8]} -crop 4320x2880+0+965 +repage -define webp:target-size=10000000 $out/weic2514a.webp
+              magick ''${sources[9]} -crop 5863x3909+0+326 +repage -define webp:target-size=10000000 $out/weic2425c.webp
+              magick ''${sources[10]} -rotate 90 -crop 4536x3024+1+611 +repage -define webp:target-size=10000000 $out/weic2605c.webp
 
               runHook postBuild
             '';
diff --git a/accounts/gkleen@skadhi/shell/quickshell/Bar.qml b/accounts/gkleen@skadhi/shell/quickshell/Bar.qml
index 33909884..fdaa8f56 100644
--- a/accounts/gkleen@skadhi/shell/quickshell/Bar.qml
+++ b/accounts/gkleen@skadhi/shell/quickshell/Bar.qml
@@ -25,8 +25,8 @@ PanelWindow {
     right: true
   }
   margins {
-    left: bar.haveMaximizedWindow ? 0 : 26 + 8
-    right: bar.haveMaximizedWindow ? 0 : 26 + 8
+    left: bar.haveMaximizedWindow ? 0 : 8 + 2
+    right: bar.haveMaximizedWindow ? 0 : 8 + 2
   }
 
   implicitHeight: 21
@@ -35,11 +35,7 @@ PanelWindow {
   property bool haveScreenshare: Array.from(NiriService.casts).some(cast => cast.target.Output?.name == bar.screen.name)
 
   Rectangle {
-    color: {
-      if (bar.haveScreenshare)
-        return bar.haveMaximizedWindow ? Qt.rgba(0.2, 0, 0, 1) : Qt.rgba(0.2, 0, 0, 0.75);
-      return bar.haveMaximizedWindow ? "black" : Qt.rgba(0, 0, 0, 0.75);
-    }
+    color: Qt.rgba(bar.haveScreenshare ? 0.2 : 0, 0, 0, bar.haveMaximizedWindow ? 1 : 0.75)
     anchors.fill: parent
     // bottomLeftRadius: 8
     // bottomRightRadius: 8
diff --git a/accounts/gkleen@skadhi/shell/quickshell/Services/Brightness.qml b/accounts/gkleen@skadhi/shell/quickshell/Services/Brightness.qml
index f3ae6804..76e8c08d 100644
--- a/accounts/gkleen@skadhi/shell/quickshell/Services/Brightness.qml
+++ b/accounts/gkleen@skadhi/shell/quickshell/Services/Brightness.qml
@@ -10,7 +10,7 @@ Singleton {
   id: root
 
   property string subsystem: "backlight"
-  property string device: "intel_backlight"
+  property string device: "amdgpu_bl1"
 
   property real currBrightness
   property real exponent: 4