From b31c9b948fbc12fcbf23b30673afc41cf420f6c5 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Tue, 2 Sep 2025 09:17:50 +0200
Subject: treewide: Use `river-classic` instead of `river`

`river-classic` is the continuation of the 3.0 branch without the
breaking introduction of the window manager process.
---
 modules/by-name/lf/lf/commands/default.nix       | 2 +-
 modules/by-name/ri/river/module.nix              | 6 ++++--
 modules/by-name/ri/river/river-start/package.nix | 4 ++--
 modules/by-name/yt/yt/module.nix                 | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/by-name/lf/lf/commands/default.nix b/modules/by-name/lf/lf/commands/default.nix
index 5d5277d6..055bfa2c 100644
--- a/modules/by-name/lf/lf/commands/default.nix
+++ b/modules/by-name/lf/lf/commands/default.nix
@@ -123,7 +123,7 @@ in {
   set_wallpaper = pipe {
     name = "set_wallpaper";
     dependencies = [
-      pkgs.river # for `riverctl`
+      pkgs.river-classic # for `riverctl`
       pkgs.swaybg
       pkgs.procps
     ];
diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix
index 8be77777..75725a8d 100644
--- a/modules/by-name/ri/river/module.nix
+++ b/modules/by-name/ri/river/module.nix
@@ -17,7 +17,7 @@
 }: let
   cfg = config.soispha.programs.river;
   esa = lib.strings.escapeShellArg;
-  riverctl = lib.getExe' pkgs.river "riverctl";
+  riverctl = lib.getExe' cfg.package "riverctl";
 
   mkOutputFlags = output: flags: let
     expandedFlags = builtins.concatStringsSep " " (lib.attrsets.mapAttrsToList (flag: value: "--${esa flag} ${esa value}") flags);
@@ -84,6 +84,8 @@ in {
   options.soispha.programs.river = {
     enable = lib.mkEnableOption "river";
 
+    package = lib.mkPackageOption pkgs "river-classic" {};
+
     unicodeInput = {
       enable = lib.mkEnableOption "udev rules for rawhid based unicode input";
     };
@@ -235,7 +237,7 @@ in {
           + mkHeading "Background services" longRunningPrograms
           + mkHeading "Layout Setup" ''
             err_fail ${riverctl} default-layout rivertile
-            ${lib.getExe' pkgs.river "rivertile"} -main-ratio 0.5 -view-padding 1 -outer-padding 0
+            ${lib.getExe' cfg.package "rivertile"} -main-ratio 0.5 -view-padding 1 -outer-padding 0
           '';
       };
     };
diff --git a/modules/by-name/ri/river/river-start/package.nix b/modules/by-name/ri/river/river-start/package.nix
index 10957cc0..3ae204b7 100644
--- a/modules/by-name/ri/river/river-start/package.nix
+++ b/modules/by-name/ri/river/river-start/package.nix
@@ -9,13 +9,13 @@
 # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
 {
   writeShellApplication,
-  river,
+  river-classic,
 }:
 writeShellApplication {
   name = "river-start";
   text = builtins.readFile ./river-start.sh;
   runtimeInputs = [
-    river
+    river-classic
   ];
   meta = {
     mainProgram = "river-start";
diff --git a/modules/by-name/yt/yt/module.nix b/modules/by-name/yt/yt/module.nix
index 3ac59439..81bacf44 100644
--- a/modules/by-name/yt/yt/module.nix
+++ b/modules/by-name/yt/yt/module.nix
@@ -68,7 +68,7 @@
             name = "start_external_command";
             text = builtins.readFile ./external_commands_script.sh;
             runtimeInputs = [
-              pkgs.river
+              pkgs.river-classic
               pkgs.alacritty
               pkgs.less
             ];
-- 
cgit 1.4.1