From 1cc2e02fcaabd224348fa0dbfeb311063787a060 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Sat, 25 May 2024 21:56:39 +0100 Subject: [PATCH] wrappers/output: fix `initContent` formatting Originally introduced in 21c233919d747d3375e3a173b65f7f26ccf01256 --- wrappers/modules/output.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/wrappers/modules/output.nix b/wrappers/modules/output.nix index 661adb3f..614053e7 100644 --- a/wrappers/modules/output.nix +++ b/wrappers/modules/output.nix @@ -122,7 +122,6 @@ with lib; + config.content; init = helpers.writeLua "init.lua" customRC; - initPath = toString init; extraWrapperArgs = builtins.concatStringsSep " " ( (optional (config.extraPackages != [ ]) ''--prefix PATH : "${makeBinPath config.extraPackages}"'') @@ -140,17 +139,14 @@ with lib; { type = lib.mkForce "lua"; finalPackage = wrappedNeovim; - initContent = customRC; - inherit initPath; + initContent = readFile init; + initPath = "${init}"; printInitPackage = pkgs.writeShellApplication { name = "nixvim-print-init"; - runtimeInputs = with pkgs; [ - stylua - bat - ]; + runtimeInputs = [ pkgs.bat ]; text = '' - stylua - <"${initPath}" | bat --language=lua + bat --language=lua "${init}" ''; };