From 7df6656b113ce0d39c8b7d30915cafe046e1d64e Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Thu, 1 Jul 2021 14:05:37 -0400 Subject: [PATCH] foot: revert always create config file (#2091) (#2157) This reverts commit 666eee4f72979b0ebbd2e065a3846d7a8a16895c (#2091). As of NixOS/nixpkgs#128121, which incorporated changes from: https://codeberg.org/dnkl/foot/pulls/588/, foot no longer errors if there is no config file. --- modules/programs/foot.nix | 2 +- tests/modules/programs/foot/empty-settings.nix | 5 +---- tests/modules/programs/foot/systemd-user-service.nix | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/programs/foot.nix b/modules/programs/foot.nix index 08b5e397..8df201fd 100644 --- a/modules/programs/foot.nix +++ b/modules/programs/foot.nix @@ -51,7 +51,7 @@ in { config = mkIf cfg.enable { home.packages = [ cfg.package ]; - xdg.configFile."foot/foot.ini" = { + xdg.configFile."foot/foot.ini" = mkIf (cfg.settings != { }) { source = iniFormat.generate "foot.ini" cfg.settings; }; diff --git a/tests/modules/programs/foot/empty-settings.nix b/tests/modules/programs/foot/empty-settings.nix index 44caeca5..3935fd9d 100644 --- a/tests/modules/programs/foot/empty-settings.nix +++ b/tests/modules/programs/foot/empty-settings.nix @@ -10,10 +10,7 @@ with lib; [ (self: super: { foot = pkgs.writeScriptBin "dummy-foot" ""; }) ]; nmt.script = '' - assertFileExists home-files/.config/foot/foot.ini - assertFileContent \ - home-files/.config/foot/foot.ini \ - ${builtins.toFile "test" ""} + assertPathNotExists home-files/.config/foot ''; }; } diff --git a/tests/modules/programs/foot/systemd-user-service.nix b/tests/modules/programs/foot/systemd-user-service.nix index 9c131362..1eff14f9 100644 --- a/tests/modules/programs/foot/systemd-user-service.nix +++ b/tests/modules/programs/foot/systemd-user-service.nix @@ -11,10 +11,7 @@ in { }; nmt.script = '' - assertFileExists home-files/.config/foot/foot.ini - assertFileContent \ - home-files/.config/foot/foot.ini \ - ${builtins.toFile "test" ""} + assertPathNotExists home-files/.config/foot/foot.ini assertFileContent \ home-files/.config/systemd/user/foot.service \