From 8ca0687b97298518ec7a074427de074d06ebc20a Mon Sep 17 00:00:00 2001 From: uoleg <126404029+uoleg@users.noreply.github.com> Date: Mon, 27 Feb 2023 20:24:33 +0300 Subject: [PATCH] nixos/nano: refactor nanorc creation The default syntax highlighting rules are included at the top of the nanorc file to allow overriding. --- nixos/modules/programs/nano.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/nano.nix b/nixos/modules/programs/nano.nix index 16bab620d6e2..7705bf0ddc72 100644 --- a/nixos/modules/programs/nano.nix +++ b/nixos/modules/programs/nano.nix @@ -35,8 +35,17 @@ in ###### implementation config = lib.mkIf (cfg.nanorc != "" || cfg.syntaxHighlight) { - environment.etc.nanorc.text = lib.concatStrings [ cfg.nanorc - (lib.optionalString cfg.syntaxHighlight ''${LF}include "${pkgs.nano}/share/nano/*.nanorc"'') ]; + environment.etc.nanorc.text = lib.concatStringsSep LF ( + ( lib.optionals cfg.syntaxHighlight [ + "# The line below is added because value of programs.nano.syntaxHighlight is set to true" + ''include "${pkgs.nano}/share/nano/*.nanorc"'' + "" + ]) + ++ ( lib.optionals (cfg.nanorc != "") [ + "# The lines below have been set from value of programs.nano.nanorc" + cfg.nanorc + ]) + ); }; }