Merge branch 'main' into castrojo-patch-4

ublue-os · Sep 20, 2024 · 5ca997c · 5ca997c
2 parents f5d78a4 + 5574d2c
commit 5ca997c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Check just syntax
         id: check_just_syntax
-        uses: ublue-os/just-action@v1
+        uses: ublue-os/just-action@v2
 
       # Build image using Buildah action
       - name: Build Image

diff --git a/files/etc/udev/rules.d/50-framework16.rules b/files/etc/udev/rules.d/50-framework16.rules
@@ -2,12 +2,12 @@
 ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="32ac", ATTR{idProduct}=="0010", ATTR{power/autosuspend}="10", ATTR{power/control}="auto", GOTO="rules_end"
 
 # Framework Laptop 16 Keyboard Module - ANSI
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="32ac", ATTR{idProduct}=="0012", ATTR{power/autosuspend}="-1", ATTR{power/control}="on", GOTO="rules_end"
+ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="32ac", ATTR{idProduct}=="0012", ATTR{power/autosuspend}="-1", ATTR{power/control}="on", ATTR{power/wakeup}="disabled", GOTO="rules_end"
 
 # Framework Laptop 16 Numpad Module
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="32ac", ATTR{idProduct}=="0014", ATTR{power/autosuspend}="-1", ATTR{power/control}="on", GOTO="rules_end"
+ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="32ac", ATTR{idProduct}=="0014", ATTR{power/autosuspend}="-1", ATTR{power/control}="on", ATTR{power/wakeup}="disabled", GOTO="rules_end"
 
 # Framework Laptop 16 Keyboard Module
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="32ac", ATTR{idProduct}=="0018", ATTR{power/autosuspend}="-1", ATTR{power/control}="on", GOTO="rules_end"
+ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="32ac", ATTR{idProduct}=="0018", ATTR{power/autosuspend}="-1", ATTR{power/control}="on", ATTR{power/wakeup}="disabled", GOTO="rules_end"
 
 LABEL="rules_end"