diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-01-14 23:41:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-14 23:41:48 +0100 |
| commit | 95ba4fbe4de716b01b4854bf902e35876c8d926b (patch) | |
| tree | d519777611ace06b9bd26b33b2f68a159f6ea3c6 | |
| parent | c74b019ab27b922e4182cc835a970098d84fe5d6 (diff) | |
| parent | 4dbf45bc5ea4f872413cffda9570420d35f40f8c (diff) | |
| download | nixlib-95ba4fbe4de716b01b4854bf902e35876c8d926b.tar nixlib-95ba4fbe4de716b01b4854bf902e35876c8d926b.tar.gz nixlib-95ba4fbe4de716b01b4854bf902e35876c8d926b.tar.bz2 nixlib-95ba4fbe4de716b01b4854bf902e35876c8d926b.tar.lz nixlib-95ba4fbe4de716b01b4854bf902e35876c8d926b.tar.xz nixlib-95ba4fbe4de716b01b4854bf902e35876c8d926b.tar.zst nixlib-95ba4fbe4de716b01b4854bf902e35876c8d926b.zip | |
Merge pull request #53968 from avdv/nano-syntax-enabled
programs/nano: Generate nanorc if `syntaxHighlight` enabled
| -rw-r--r-- | nixos/modules/programs/nano.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/programs/nano.nix b/nixos/modules/programs/nano.nix index 27b6d446c75d..6a4d46338e19 100644 --- a/nixos/modules/programs/nano.nix +++ b/nixos/modules/programs/nano.nix @@ -2,6 +2,7 @@ let cfg = config.programs.nano; + LF = "\n"; in { @@ -33,9 +34,9 @@ in ###### implementation - config = lib.mkIf (cfg.nanorc != "") { + config = lib.mkIf (cfg.nanorc != "" || cfg.syntaxHighlight) { environment.etc."nanorc".text = lib.concatStrings [ cfg.nanorc - (lib.optionalString cfg.syntaxHighlight ''include "${pkgs.nano}/share/nano/*.nanorc"'') ]; + (lib.optionalString cfg.syntaxHighlight ''${LF}include "${pkgs.nano}/share/nano/*.nanorc"'') ]; }; } |