From c02b5c01e530f998565b34cbb4d3daa5dff8b3e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sun, 24 Mar 2024 13:16:27 +0100
Subject: [PATCH] feat: use git river version

---
 flake.lock                         | 19 +++++++++++++++++++
 flake.nix                          |  4 ++++
 modules/programs/river/default.nix | 16 ++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/flake.lock b/flake.lock
index 2562b61..83e43d8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1071,6 +1071,24 @@
         "type": "github"
       }
     },
+    "river": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1711107438,
+        "narHash": "sha256-4nvFniKdJX+ZsoliFmWSzIAtZefekBCxmGS9xonHQN8=",
+        "ref": "refs/heads/master",
+        "rev": "b77b42f0d640457411204bbae346df1d1a0c4f44",
+        "revCount": 1214,
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/riverwm/river"
+      },
+      "original": {
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/riverwm/river"
+      }
+    },
     "root": {
       "inputs": {
         "actions-preview-nvim": "actions-preview-nvim",
@@ -1099,6 +1117,7 @@
         "nur": "nur",
         "nvim-lspconfig": "nvim-lspconfig",
         "pre-commit-hooks": "pre-commit-hooks",
+        "river": "river",
         "smartcolumn-nvim": "smartcolumn-nvim",
         "stable": "stable",
         "statuscol-nvim": "statuscol-nvim",
diff --git a/flake.nix b/flake.nix
index b7909c3..37e227d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,6 +48,10 @@
     hawtkeys-nvim.flake = false;
     hawtkeys-nvim.url = "github:tris203/hawtkeys.nvim";
 
+    # river
+    river.url = "git+https://github.com/riverwm/river?submodules=1";
+    river.flake = false;
+
     # Hyprland
     hypr-contrib.url = "github:hyprwm/contrib";
     hyprland.url = "github:hyprwm/Hyprland";
diff --git a/modules/programs/river/default.nix b/modules/programs/river/default.nix
index 61016ed..b0edbdc 100644
--- a/modules/programs/river/default.nix
+++ b/modules/programs/river/default.nix
@@ -47,6 +47,22 @@ in
       # enable home-manager module
       wayland.windowManager.river = {
         enable = true;
+        package = pkgs.river.overrideAttrs (old: {
+          src = inputs.river;
+          version = lib.my.mkVersionInput inputs.river;
+          # HACK: to change wlroots to 0.17.x
+          buildInputs = with pkgs; [
+            libGL
+            libevdev
+            libinput
+            libxkbcommon
+            pixman
+            udev
+            wayland-protocols
+            wlroots_0_17
+            xorg.libX11
+          ];
+        });
         settings = {
           border-width = 2;
           declare-mode = [