some more sway changes

flake.lock

@@ -376,15 +376,16 @@
     "mobile-nixos": {
       "flake": false,
       "locked": {
-        "lastModified": 1720660935,
+        "lastModified": 1723672395,
-        "narHash": "sha256-GnDGoVaObUjnYdCHUSIYVE1anMElis+Pq+RY30LFlIk=",
+        "narHash": "sha256-QQz3FQcVQggqOkOFKAfDNJKFjcyVfiQzCiB9KAjG7dM=",
-        "owner": "NixOS",
+        "owner": "chayleaf",
         "repo": "mobile-nixos",
-        "rev": "31704f8a55f5773c9b4e7adb7408a142d142e1f2",
+        "rev": "d7567082df75b11a47f384ec71b0a80c508d7ceb",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "chayleaf",
+        "ref": "sdm845",
         "repo": "mobile-nixos",
         "type": "github"
       }

flake.nix

@@ -12,7 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     mobile-nixos = {
-      url = "github:NixOS/mobile-nixos";
+      url = "github:chayleaf/mobile-nixos/sdm845";
       flake = false;
     };
     osu-wine = {

pkgs/sway/0001-mobile-don-t-idle_notify-for-volume-keys.patch

@@ -1,7 +1,7 @@
-From 466d750b96184b793d276d9d0e30d37af4477fea Mon Sep 17 00:00:00 2001
+From c4690b1496ca34c416869d2932abfa112a93f188 Mon Sep 17 00:00:00 2001
 From: chayleaf <chayleaf-git@pavluk.org>
 Date: Wed, 14 Aug 2024 08:17:44 +0700
-Subject: [PATCH 2/2] mobile: don't idle_notify for volume keys
+Subject: [PATCH 1/2] mobile: don't idle_notify for volume keys
 
 ---
  sway/input/keyboard.c | 4 +++-

pkgs/sway/0001-mobile-reverse-layer-order.patch

@@ -1,26 +0,0 @@
-From 7fead3cd2158fe913775ede5651291cf5f4ccf4d Mon Sep 17 00:00:00 2001
-From: chayleaf <chayleaf-git@pavluk.org>
-Date: Wed, 14 Aug 2024 07:32:11 +0700
-Subject: [PATCH 1/2] mobile: reverse layer order
-
-This makes exclusive anchored layers that were added first be first
----
- sway/desktop/layer_shell.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
-index 8c6cedfe..41a638ee 100644
---- a/sway/desktop/layer_shell.c
-+++ b/sway/desktop/layer_shell.c
-@@ -129,7 +129,7 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
- 	struct wlr_box full_area = { 0 };
- 	wlr_output_effective_resolution(output->wlr_output,
- 			&full_area.width, &full_area.height);
--	wl_list_for_each(sway_layer, list, link) {
-+	wl_list_for_each_reverse(sway_layer, list, link) {
- 		struct wlr_layer_surface_v1 *layer = sway_layer->layer_surface;
- 		struct wlr_layer_surface_v1_state *state = &layer->current;
- 		if (exclusive != (state->exclusive_zone > 0)) {
--- 
-2.44.1
-

pkgs/sway/0002-mobile-reverse-layer-order.patch

@@ -0,0 +1,46 @@
+From 0d352dff09bab4536d2e182538641af1c6d2a1ef Mon Sep 17 00:00:00 2001
+From: chayleaf <chayleaf-git@pavluk.org>
+Date: Wed, 14 Aug 2024 07:32:11 +0700
+Subject: [PATCH 2/2] mobile: reverse layer order
+
+This makes exclusive anchored layers that were added first be first
+---
+ sway/desktop/layer_shell.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
+index 8c6cedfe..4afca0b7 100644
+--- a/sway/desktop/layer_shell.c
++++ b/sway/desktop/layer_shell.c
+@@ -129,7 +129,7 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
+ 	struct wlr_box full_area = { 0 };
+ 	wlr_output_effective_resolution(output->wlr_output,
+ 			&full_area.width, &full_area.height);
+-	wl_list_for_each(sway_layer, list, link) {
++	wl_list_for_each_reverse(sway_layer, list, link) {
+ 		struct wlr_layer_surface_v1 *layer = sway_layer->layer_surface;
+ 		struct wlr_layer_surface_v1_state *state = &layer->current;
+ 		if (exclusive != (state->exclusive_zone > 0)) {
+@@ -214,14 +214,14 @@ void arrange_layers(struct sway_output *output) {
+ 	wlr_output_effective_resolution(output->wlr_output,
+ 			&usable_area.width, &usable_area.height);
+ 
+-	// Arrange exclusive surfaces from top->bottom
+-	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
+-			&usable_area, true);
+-	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
++	// Arrange exclusive surfaces from bottom->top
++	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
+ 			&usable_area, true);
+ 	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
+ 			&usable_area, true);
+-	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
++	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
++			&usable_area, true);
++	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
+ 			&usable_area, true);
+ 
+ 	if (memcmp(&usable_area, &output->usable_area,
+-- 
+2.44.1
+

system/hardware/oneplus-enchilada/pkgs.nix

@@ -41,8 +41,8 @@ in {
     src = pkgs.fetchFromGitLab {
       owner = "sdm845-mainline";
       repo = "alsa-ucm-conf";
-      rev = "9ed12836b269764c4a853411d38ccb6abb70b383";
+      rev = "aaa7889f7a6de640b4d78300e118457335ad16c0";
-      hash = "sha256-QvGZGLEmqE+sZpd15fHb+9+MmoD5zoGT+pYqyWZLdkM=";
+      hash = "sha256-2P5ZTrI1vCJ99BcZVPlkH4sv1M6IfAlaXR6ZjAdy4HQ=";
     };
     installPhase = ''
       substituteInPlace ucm2/lib/card-init.conf --replace '"/bin' '"/run/current-system/sw/bin'