diff options
| -rwxr-xr-x | modules/by-name/ri/river/init_base.sh | 10 | ||||
| -rw-r--r-- | modules/by-name/ri/river/module.nix | 4 | ||||
| -rw-r--r-- | pkgs/by-name/ri/river-start/package.nix | 14 | ||||
| -rwxr-xr-x | pkgs/by-name/ri/river-start/river-start.sh | 10 |
4 files changed, 34 insertions, 4 deletions
diff --git a/modules/by-name/ri/river/init_base.sh b/modules/by-name/ri/river/init_base.sh index 5ed1d00a..938b46b1 100755 --- a/modules/by-name/ri/river/init_base.sh +++ b/modules/by-name/ri/river/init_base.sh @@ -1,5 +1,8 @@ #!/usr/bin/env sh +# NOTE: Keep this in sync with the file from `river-start` <2025-02-03> +RIVER_LOG_FILE="$HOME/.local/share/river/log" + err_fail() { if ! "$@"; then output="" @@ -10,11 +13,10 @@ err_fail() { output="$output '$arg'" fi done - printf "%s failed!\n" "$output" >>~/river_log + printf "%s failed!\n" "$output" >>"$RIVER_LOG_FILE" fi } -err_fail rm ~/river_log -exec 1>>"$HOME"/river_log -exec 2>>"$HOME"/river_log +exec 1>>"$RIVER_LOG_FILE" +exec 2>>"$RIVER_LOG_FILE" # Start of the generated stuff. diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix index 1f1f2cae..c0b38bc5 100644 --- a/modules/by-name/ri/river/module.nix +++ b/modules/by-name/ri/river/module.nix @@ -183,6 +183,10 @@ in { # }}} }; + home.packages = [ + pkgs.river-start + ]; + xdg.configFile."river/init".text = let mkHeading = text: other_stuff: '' # ${text} diff --git a/pkgs/by-name/ri/river-start/package.nix b/pkgs/by-name/ri/river-start/package.nix new file mode 100644 index 00000000..ab986708 --- /dev/null +++ b/pkgs/by-name/ri/river-start/package.nix @@ -0,0 +1,14 @@ +{ + 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 new file mode 100755 index 00000000..4587ff96 --- /dev/null +++ b/pkgs/by-name/ri/river-start/river-start.sh @@ -0,0 +1,10 @@ +#! /usr/bin/env sh + +# 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 |