diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2025-02-04 11:15:37 +0100 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2025-02-04 11:15:37 +0100 |
| commit | ccf4f9277f9ad32f3a992ef35676900a964cccc2 (patch) | |
| tree | b3c7d391785e39e96e0f6be05f2d1cf99568e6c8 /modules/by-name | |
| parent | refactor(flake/nixosModules/common.nix): Move to `modules/common` (diff) | |
| download | nixos-config-ccf4f9277f9ad32f3a992ef35676900a964cccc2.zip | |
fix(modules/river): Mark the `init` file executable
Diffstat (limited to 'modules/by-name')
| -rw-r--r-- | modules/by-name/ri/river/module.nix | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix index c0b38bc5..c8fb973c 100644 --- a/modules/by-name/ri/river/module.nix +++ b/modules/by-name/ri/river/module.nix @@ -187,29 +187,32 @@ in { pkgs.river-start ]; - xdg.configFile."river/init".text = let - mkHeading = text: other_stuff: '' - # ${text} - ${other_stuff} - ''; - in - builtins.readFile ./init_base.sh - + - # bash - mkHeading "Environment variables" '' - err_fail ${riverctl} spawn "${lib.getExe' pkgs.dbus "dbus-update-activation-environment"} --verbose --systemd SEATD_SOCK DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION=river XDG_CURRENT_DESKTOP=river" - export XDG_CURRENT_DESKTOP=river DESKTOP_SESSION=river; - '' - + mkHeading "Key Mappings" keymappings - + mkHeading "Rules" ruleSetup - + mkHeading "General Settings" generalSettings - + mkHeading "Input Section" inputs - + mkHeading "Screen setup code" screenSetupCode - + 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 - ''; + xdg.configFile."river/init" = { + executable = true; + text = let + mkHeading = text: other_stuff: '' + # ${text} + ${other_stuff} + ''; + in + builtins.readFile ./init_base.sh + + + # bash + mkHeading "Environment variables" '' + err_fail ${riverctl} spawn "${lib.getExe' pkgs.dbus "dbus-update-activation-environment"} --verbose --systemd SEATD_SOCK DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION=river XDG_CURRENT_DESKTOP=river" + export XDG_CURRENT_DESKTOP=river DESKTOP_SESSION=river; + '' + + mkHeading "Key Mappings" keymappings + + mkHeading "Rules" ruleSetup + + mkHeading "General Settings" generalSettings + + mkHeading "Input Section" inputs + + mkHeading "Screen setup code" screenSetupCode + + 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 + ''; + }; }; }; } |