Patch rivertile bar

2 files changed, 32 insertions, 1 deletions

diff --git a/patches/rivertile.patch b/patches/rivertile.patch
new file mode 100644
index 0000000..f6a0f87
--- /dev/null
+++ b/patches/rivertile.patch
@@ -0,0 +1,19 @@
+diff --git a/rivertile/main.zig b/rivertile/main.zig
+index 2590e7e..91f2c25 100644
+--- a/rivertile/main.zig
++++ b/rivertile/main.zig
+@@ -291,10 +291,10 @@ const Output = struct {
+                 }
+
+                 switch (output.main_location) {
+-                    .left => layout.commit("rivertile - left", ev.serial),
+-                    .right => layout.commit("rivertile - right", ev.serial),
+-                    .top => layout.commit("rivertile - top", ev.serial),
+-                    .bottom => layout.commit("rivertile - bottom", ev.serial),
++                    .left => layout.commit("[]=", ev.serial),
++                    .right => layout.commit("=[]", ev.serial),
++                    .top => layout.commit("[]^", ev.serial),
++                    .bottom => layout.commit("[]v", ev.serial),
+                 }
+             },
+             .user_command_tags => {},
diff --git a/software/windowmanager.nix b/software/windowmanager.nix
index c89913b..5b85a0a 100644
--- a/software/windowmanager.nix
+++ b/software/windowmanager.nix
@@ -10,7 +10,8 @@
 
     kanshi # auto-configure monitors on connect/disconnect
 
-    river  # wm
+    patchedRiver # Use patched river
+
     lua    # river config
     luajitPackages.luaposix
 
@@ -41,6 +42,17 @@
     glib # for gdbus needed by volumectl
   ];
 
+  # Overlay to patch river
+  nixpkgs.overlays = [
+    (final: prev: {
+      patchedRiver = prev.river.overrideAttrs (oldAttrs: rec {
+        patches = (oldAttrs.patches or []) ++ [
+          ../patches/rivertile.patch
+        ];
+      });
+    })
+  ];
+
   # Screen capture/sharing:
   xdg.portal = {
     enable = true;