Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

sway: writeText -> writeTextFile

Browse source 
The latter is more flexible and shall be used soon, splitting this
change out for simpler diff later.
This commit is contained in:
Andrew Marshall 2023-11-09 13:14:12 -05:00 committed by Robert Helgesson
parent 7c61e400a9
commit 95888b153c
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
1 changed files with 60 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/services/window-managers/i3-sway/sway.nix
View file

@ -261,7 +261,9 @@ let
systemdActivation = '' systemdActivation = ''
exec "${pkgs.dbus}/bin/dbus-update-activation-environment --systemd ${variables}; ${extraCommands}"''; exec "${pkgs.dbus}/bin/dbus-update-activation-environment --systemd ${variables}; ${extraCommands}"'';
configFile = pkgs.writeText "sway.conf" (concatStringsSep "\n" configFile = pkgs.writeTextFile {
name = "sway.conf";
text = (concatStringsSep "\n"
((optional (cfg.extraConfigEarly != "") cfg.extraConfigEarly) ((optional (cfg.extraConfigEarly != "") cfg.extraConfigEarly)
++ (if cfg.config != null then ++ (if cfg.config != null then
with cfg.config; with cfg.config;
@ -316,7 +318,9 @@ let
) )
else else
[ ]) ++ (optional cfg.systemd.enable systemdActivation) [ ]) ++ (optional cfg.systemd.enable systemdActivation)
++ (optional (!cfg.xwayland) "xwayland disable") ++ [ cfg.extraConfig ])); ++ (optional (!cfg.xwayland) "xwayland disable")
++ [ cfg.extraConfig ]));
};
defaultSwayPackage = pkgs.sway.override { defaultSwayPackage = pkgs.sway.override {
extraSessionCommands = cfg.extraSessionCommands; extraSessionCommands = cfg.extraSessionCommands;