From 77648a07e459adff69b2c4033a77b2cababb5843 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Mon, 1 Aug 2022 19:58:38 -0400 Subject: [PATCH] hyfetch: prevent writing config with default/empty settings (#3124) --- modules/programs/hyfetch.nix | 5 +++-- tests/modules/programs/hyfetch/default.nix | 5 ++++- tests/modules/programs/hyfetch/empty-settings.nix | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 tests/modules/programs/hyfetch/empty-settings.nix diff --git a/modules/programs/hyfetch.nix b/modules/programs/hyfetch.nix index b473fd654..726bc94e6 100644 --- a/modules/programs/hyfetch.nix +++ b/modules/programs/hyfetch.nix @@ -37,7 +37,8 @@ in { config = mkIf cfg.enable { home.packages = [ cfg.package ]; - xdg.configFile."hyfetch.json".source = - jsonFormat.generate "hyfetch.json" cfg.settings; + xdg.configFile."hyfetch.json" = mkIf (cfg.settings != { }) { + source = jsonFormat.generate "hyfetch.json" cfg.settings; + }; }; } diff --git a/tests/modules/programs/hyfetch/default.nix b/tests/modules/programs/hyfetch/default.nix index 6a5818f91..680b38cc9 100644 --- a/tests/modules/programs/hyfetch/default.nix +++ b/tests/modules/programs/hyfetch/default.nix @@ -1 +1,4 @@ -{ hyfetch-settings = ./settings.nix; } +{ + hyfetch-settings = ./settings.nix; + hyfetch-empty-settings = ./empty-settings.nix; +} diff --git a/tests/modules/programs/hyfetch/empty-settings.nix b/tests/modules/programs/hyfetch/empty-settings.nix new file mode 100644 index 000000000..badb5220f --- /dev/null +++ b/tests/modules/programs/hyfetch/empty-settings.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + config = { + programs.hyfetch.enable = true; + + test.stubs.hyfetch = { }; + + nmt.script = '' + assertPathNotExists home-files/.config/hyfetch.json + ''; + }; +}