From 89544bf918cd9170115aa57dc23517886c479fc6 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 21 Nov 2025 20:29:46 -0600 Subject: [PATCH] jrnl: modernize cleanup with lib and other lint warnings Signed-off-by: Austin Horstman --- modules/programs/jrnl.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/programs/jrnl.nix b/modules/programs/jrnl.nix index 9103b651b..cb395dd65 100644 --- a/modules/programs/jrnl.nix +++ b/modules/programs/jrnl.nix @@ -9,15 +9,16 @@ let cfg = config.programs.jrnl; yamlFormat = pkgs.formats.yaml { }; in -with lib; { + meta.maintainers = [ lib.maintainers.matthiasbeyer ]; + options.programs.jrnl = { - enable = mkEnableOption "jrnl"; + enable = lib.mkEnableOption "jrnl"; package = lib.mkPackageOption pkgs "jrnl" { nullable = true; }; - settings = mkOption { - type = yamlFormat.type; + settings = lib.mkOption { + inherit (yamlFormat) type; default = { }; description = '' Configuration for the jrnl binary. @@ -27,10 +28,11 @@ with lib; }; }; - config = mkIf cfg.enable { - home.packages = mkIf (cfg.package != null) [ cfg.package ]; - xdg.configFile."jrnl/jrnl.yaml".source = yamlFormat.generate "jrnl.yaml" cfg.settings; - }; + config = lib.mkIf cfg.enable { + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; - meta.maintainers = [ lib.maintainers.matthiasbeyer ]; + xdg.configFile."jrnl/jrnl.yaml" = lib.mkIf (cfg.settings != { }) { + source = yamlFormat.generate "jrnl.yaml" cfg.settings; + }; + }; }