From 42bb553544420942415257fb2d3938698b27d72d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 Mar 2021 04:20:00 +0000 Subject: [PATCH] broot: use formats.toml to generate configuration --- modules/programs/broot.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/modules/programs/broot.nix b/modules/programs/broot.nix index a1b0ee71f..72b2c6ea1 100644 --- a/modules/programs/broot.nix +++ b/modules/programs/broot.nix @@ -6,16 +6,7 @@ let cfg = config.programs.broot; - configFile = config: - pkgs.runCommand "conf.toml" { - buildInputs = [ pkgs.remarshal ]; - preferLocalBuild = true; - allowSubstitutes = false; - } '' - remarshal -if json -of toml \ - < ${pkgs.writeText "verbs.json" (builtins.toJSON config)} \ - > $out - ''; + tomlFormat = pkgs.formats.toml { }; brootConf = { verbs = cfg.verbs; @@ -194,7 +185,8 @@ in { config = mkIf cfg.enable { home.packages = [ cfg.package ]; - xdg.configFile."broot/conf.toml".source = configFile brootConf; + xdg.configFile."broot/conf.toml".source = + tomlFormat.generate "broot-config" brootConf; # Dummy file to prevent broot from trying to reinstall itself xdg.configFile."broot/launcher/installed-v1".text = "";