mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-08 01:53:13 -05:00
nixos/foot: move mkIf outside .source option
Should resolve https://github.com/NixOS/nixpkgs/pull/493708#discussion_r2935397639
This commit is contained in:
parent
3a3957c16b
commit
d3dc9d62fc
1 changed files with 10 additions and 7 deletions
|
|
@ -75,13 +75,16 @@ in
|
|||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment = {
|
||||
systemPackages = [ cfg.package ];
|
||||
etc."xdg/foot/foot.ini".source = settingsFormat.generate "foot.ini" cfg.settings;
|
||||
|
||||
etc."xdg/autostart/foot-server.desktop".source =
|
||||
lib.mkIf cfg.xdg.serverAutostart "${cfg.package}/share/applications/foot-server.desktop";
|
||||
};
|
||||
environment = lib.mkMerge [
|
||||
{
|
||||
systemPackages = [ cfg.package ];
|
||||
etc."xdg/foot/foot.ini".source = settingsFormat.generate "foot.ini" cfg.settings;
|
||||
}
|
||||
(lib.mkIf cfg.xdg.serverAutostart {
|
||||
etc."xdg/autostart/foot-server.desktop".source =
|
||||
"${cfg.package}/share/applications/foot-server.desktop";
|
||||
})
|
||||
];
|
||||
|
||||
programs = {
|
||||
foot.settings.main.include = lib.optionals (cfg.theme != null) [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue