jrnl: modernize

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;
+    };
+  };
 }

tests/modules/programs/jrnl/default.nix

@@ -0,0 +1,4 @@
+{
+  jrnl-empty-settings = ./jrnl-empty-settings.nix;
+  jrnl-basic-settings = ./jrnl-basic-settings.nix;
+}

tests/modules/programs/jrnl/jrnl-basic-settings-expected.yaml

@@ -0,0 +1,18 @@
+colors:
+  body: none
+  date: green
+  tags: yellow
+  title: cyan
+default_hour: 9
+default_minute: 0
+editor: vim
+encrypt: false
+highlight: true
+indent_character: '|'
+journals:
+  default: ~/journals/journal.txt
+  work: ~/journals/work.txt
+linewrap: 80
+tagsymbols: '@'
+template: false
+timeformat: '%Y-%m-%d %H:%M'

tests/modules/programs/jrnl/jrnl-basic-settings.nix

@@ -0,0 +1,32 @@
+{
+  programs.jrnl = {
+    enable = true;
+    settings = {
+      journals = {
+        default = "~/journals/journal.txt";
+        work = "~/journals/work.txt";
+      };
+      colors = {
+        body = "none";
+        date = "green";
+        tags = "yellow";
+        title = "cyan";
+      };
+      default_hour = 9;
+      default_minute = 0;
+      editor = "vim";
+      encrypt = false;
+      highlight = true;
+      indent_character = "|";
+      linewrap = 80;
+      tagsymbols = "@";
+      template = false;
+      timeformat = "%Y-%m-%d %H:%M";
+    };
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/jrnl/jrnl.yaml
+    assertFileContent home-files/.config/jrnl/jrnl.yaml ${./jrnl-basic-settings-expected.yaml}
+  '';
+}

tests/modules/programs/jrnl/jrnl-empty-settings.nix

@@ -0,0 +1,9 @@
+{
+  programs.jrnl = {
+    enable = true;
+  };
+
+  nmt.script = ''
+    assertPathNotExists home-files/.config/jrnl/jrnl.yaml
+  '';
+}