From 7af03d5dae337820dd96795306ceb4394f6e802e Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Fri, 30 May 2025 20:45:44 +0200
Subject: modules/river: Move the `river-start` package into the module

The package was already tied to the module (via the log file path) and
as such should be in the module directory.
---
 modules/by-name/ri/river/module.nix                |  2 +-
 modules/by-name/ri/river/river-start/package.nix   | 23 ++++++++++++++++++++++
 .../by-name/ri/river/river-start/river-start.sh    | 20 +++++++++++++++++++
 pkgs/by-name/ri/river-start/package.nix            | 23 ----------------------
 pkgs/by-name/ri/river-start/river-start.sh         | 20 -------------------
 5 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 modules/by-name/ri/river/river-start/package.nix
 create mode 100755 modules/by-name/ri/river/river-start/river-start.sh
 delete mode 100644 pkgs/by-name/ri/river-start/package.nix
 delete mode 100755 pkgs/by-name/ri/river-start/river-start.sh

diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix
index 33c8a713..38d4bdef 100644
--- a/modules/by-name/ri/river/module.nix
+++ b/modules/by-name/ri/river/module.nix
@@ -193,7 +193,7 @@ in {
       };
 
       home.packages = [
-        pkgs.river-start
+        (pkgs.callPackage ./river-start/package.nix {})
       ];
 
       xdg.configFile."river/init" = {
diff --git a/modules/by-name/ri/river/river-start/package.nix b/modules/by-name/ri/river/river-start/package.nix
new file mode 100644
index 00000000..10957cc0
--- /dev/null
+++ b/modules/by-name/ri/river/river-start/package.nix
@@ -0,0 +1,23 @@
+# nixos-config - My current NixOS configuration
+#
+# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of my nixos-config.
+#
+# You should have received a copy of the License along with this program.
+# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
+{
+  writeShellApplication,
+  river,
+}:
+writeShellApplication {
+  name = "river-start";
+  text = builtins.readFile ./river-start.sh;
+  runtimeInputs = [
+    river
+  ];
+  meta = {
+    mainProgram = "river-start";
+  };
+}
diff --git a/modules/by-name/ri/river/river-start/river-start.sh b/modules/by-name/ri/river/river-start/river-start.sh
new file mode 100755
index 00000000..e3a4adcb
--- /dev/null
+++ b/modules/by-name/ri/river/river-start/river-start.sh
@@ -0,0 +1,20 @@
+#! /usr/bin/env sh
+
+# nixos-config - My current NixOS configuration
+#
+# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of my nixos-config.
+#
+# You should have received a copy of the License along with this program.
+# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
+
+# NOTE: Keep this in sync with the file from `base_init.sh` <2025-02-03>
+RIVER_LOG_FILE="$HOME/.local/share/river/log"
+
+[ -d "$(dirname "$RIVER_LOG_FILE")" ] || mkdir --parents "$(dirname "$RIVER_LOG_FILE")"
+
+exec river -log-level info >"$RIVER_LOG_FILE" 2>&1
+
+# vim: ft=sh
diff --git a/pkgs/by-name/ri/river-start/package.nix b/pkgs/by-name/ri/river-start/package.nix
deleted file mode 100644
index 10957cc0..00000000
--- a/pkgs/by-name/ri/river-start/package.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# nixos-config - My current NixOS configuration
-#
-# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# This file is part of my nixos-config.
-#
-# You should have received a copy of the License along with this program.
-# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
-{
-  writeShellApplication,
-  river,
-}:
-writeShellApplication {
-  name = "river-start";
-  text = builtins.readFile ./river-start.sh;
-  runtimeInputs = [
-    river
-  ];
-  meta = {
-    mainProgram = "river-start";
-  };
-}
diff --git a/pkgs/by-name/ri/river-start/river-start.sh b/pkgs/by-name/ri/river-start/river-start.sh
deleted file mode 100755
index e3a4adcb..00000000
--- a/pkgs/by-name/ri/river-start/river-start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /usr/bin/env sh
-
-# nixos-config - My current NixOS configuration
-#
-# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# This file is part of my nixos-config.
-#
-# You should have received a copy of the License along with this program.
-# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
-
-# NOTE: Keep this in sync with the file from `base_init.sh` <2025-02-03>
-RIVER_LOG_FILE="$HOME/.local/share/river/log"
-
-[ -d "$(dirname "$RIVER_LOG_FILE")" ] || mkdir --parents "$(dirname "$RIVER_LOG_FILE")"
-
-exec river -log-level info >"$RIVER_LOG_FILE" 2>&1
-
-# vim: ft=sh
-- 
cgit 1.4.1