From 738e94e366d9c129093620c4014593d15c9f13a5 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Fri, 19 Apr 2024 11:31:49 +0200
Subject: [PATCH] river: use v3.0

---
 flake.lock                             | 31 +++++---------------------
 flake.nix                              |  8 -------
 users/rouven/modules/wayland/river.nix | 10 +--------
 3 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/flake.lock b/flake.lock
index e786722..489fa63 100644
--- a/flake.lock
+++ b/flake.lock
@@ -216,11 +216,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713453913,
-        "narHash": "sha256-vbXq52VRlL1defMHrwhsoeHm95O3mFefsSSJyNEghbA=",
+        "lastModified": 1713479476,
+        "narHash": "sha256-kTww3Hd+R95AB6J+Y1zvXrhUScgMzf0vV5hN6+wFPXE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "178e26895b3aef028a00a32fb7e7ed0fc660645c",
+        "rev": "ffc3600f4009ca39b6cb63b24127ca4f93792854",
         "type": "github"
       },
       "original": {
@@ -332,11 +332,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713248628,
-        "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
+        "lastModified": 1713297878,
+        "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
+        "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
         "type": "github"
       },
       "original": {
@@ -447,24 +447,6 @@
         "type": "sourcehut"
       }
     },
-    "river": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1713357595,
-        "narHash": "sha256-LGqP2HBrMKGGTnqFDjmZRKXN88SQMgfLm2plVAzan8c=",
-        "ref": "refs/heads/master",
-        "rev": "6b86af4f85f66697a0ffc504c4fcc1db05bfbb80",
-        "revCount": 1246,
-        "submodules": true,
-        "type": "git",
-        "url": "https://codeberg.org/river/river"
-      },
-      "original": {
-        "submodules": true,
-        "type": "git",
-        "url": "https://codeberg.org/river/river"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -477,7 +459,6 @@
         "nixpkgs": "nixpkgs",
         "pfersel": "pfersel",
         "purge": "purge",
-        "river": "river",
         "trucksimulatorbot": "trucksimulatorbot"
       }
     },
diff --git a/flake.nix b/flake.nix
index ffb8b80..9dcbbae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,14 +45,6 @@
       url = "github:nix-community/lanzaboote/v0.3.0";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    river = {
-      url = "https://codeberg.org/river/river";
-      flake = false;
-      type = "git";
-      submodules = true;
-    };
-
   };
 
   outputs =
diff --git a/users/rouven/modules/wayland/river.nix b/users/rouven/modules/wayland/river.nix
index 35c7e33..14c285d 100644
--- a/users/rouven/modules/wayland/river.nix
+++ b/users/rouven/modules/wayland/river.nix
@@ -1,15 +1,7 @@
-{ pkgs, lib, river, ... }:
+{ pkgs, lib, ... }:
 {
   wayland.windowManager.river = {
     enable = true;
-    package = with pkgs; pkgs.river.overrideAttrs (old: {
-      src = river;
-      buildInputs = lib.lists.remove wlroots_0_16 old.buildInputs ++ [
-        (wlroots.overrideAttrs (_: {
-          version = "0.17.2";
-        }))
-      ];
-    });
     systemd. extraCommands = [ "systemctl --user start river-session.target" ];
     settings = {
       focus-follows-cursor = "always";