diff options
| author | ene <ene@sils.li> | 2023-02-19 22:55:56 +0100 |
|---|---|---|
| committer | ene <ene@sils.li> | 2023-02-19 22:55:56 +0100 |
| commit | 1330d4a5e1be158d4053b6f93665a43066c45a7b (patch) | |
| tree | 255f38478aaeba3e8f0c006c8478a6e7a21e772b | |
| parent | Feat(home-manager): Actually deploy the packages (diff) | |
| download | nixos-config-1330d4a5e1be158d4053b6f93665a43066c45a7b.tar.gz nixos-config-1330d4a5e1be158d4053b6f93665a43066c45a7b.zip | |
Fix(river): Record the deps for the init script
| -rw-r--r-- | home-manager/config/river/default.nix | 23 | ||||
| -rwxr-xr-x | home-manager/config/river/init | 7 |
2 files changed, 25 insertions, 5 deletions
diff --git a/home-manager/config/river/default.nix b/home-manager/config/river/default.nix index d0de7f13..bd1c842c 100644 --- a/home-manager/config/river/default.nix +++ b/home-manager/config/river/default.nix @@ -1,9 +1,30 @@ { config, pkgs, + sysLib, ... }: { - xdg.configFile."river/init".source = ./init; + xdg.configFile."river/init".source = sysLib.makeShellScriptWithLibrary { + name = "river_init"; + script = ./init; + dependencies = builtins.attrValues { + # TODO inherit river_init_lesser + inherit + (pkgs) + river + glib # gnome lib + gammastep + wlr-randr + yambar + mako + swaybg + swayidle + alacritty + ; + }; + } + + /bin/river_init; + xdg.configFile."river/res".source = ./res; } # vim: ts=2 diff --git a/home-manager/config/river/init b/home-manager/config/river/init index 4c49489a..2f14fcaa 100755 --- a/home-manager/config/river/init +++ b/home-manager/config/river/init @@ -1,11 +1,10 @@ -#!/bin/sh +#!/usr/bin/env dash # shellcheck disable=SC2086 # shellcheck source=/dev/null -. ~/.local/lib/shell/lib +. %SHELL_LIBRARY_PATH err_fail() { - "$@" - if [ $? -ne 0 ] ;then + if ! "$@";then printf "%s\n" "$@" >> ~/river_log exec ~/.config/river/res/safe_init fi |