mirror of
https://github.com/nix-community/home-manager
synced 2024-12-25 03:09:47 +01:00
sway: writeText -> writeTextFile
The latter is more flexible and shall be used soon, splitting this change out for simpler diff later.
This commit is contained in:
parent
7c61e400a9
commit
95888b153c
1 changed files with 60 additions and 56 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue