Optimize checkout output sizes

Author: josh

flake.nix

@@ -87,13 +87,14 @@
           packages = self.packages.${system};
           plugins = pkgs.lazynvimPlugins;
 
+          buildPkg = pkg: pkgs.runCommand "${pkg.name}-build" { env.PKG = pkg; } "touch $out";
           addAttrsetPrefix = prefix: lib.attrsets.concatMapAttrs (n: v: { "${prefix}${n}" = v; });
           localTests = lib.attrsets.concatMapAttrs (
             pkgName: pkg:
             if (builtins.hasAttr "tests" pkg) then
-              ({ "${pkgName}-build" = pkg; } // (addAttrsetPrefix "${pkgName}-tests-" pkg.tests))
+              ({ "${pkgName}-build" = buildPkg pkg; } // (addAttrsetPrefix "${pkgName}-tests-" pkg.tests))
             else
-              { "${pkgName}-build" = pkg; }
+              { "${pkgName}-build" = buildPkg pkg; }
           ) self.packages.${system};
         in
         {
@@ -105,12 +106,13 @@
                 nativeBuildInputs = [ packages.lazy-nvim ];
               }
               ''
-                HOME="$PWD" nvim --headless "+Lazy! home" --startuptime out~ +q 2>&1 | tee err
+                HOME="$PWD" nvim --headless "+Lazy! home" --startuptime out +q 2>&1 | tee err
                 if grep "^E[0-9]\\+: " err; then
                   cat err
                   exit 1
                 fi
-                mv out~ "$out"
+                cat out
+                touch $out
               '';
 
           LazyVimPlugins-outdated =
@@ -122,10 +124,10 @@
               }
               ''
                 diff --unified $actual $expected
-                touch "$out"
+                touch $out
               '';
 
-          LazyVim-extras-catppuccin = plugins.LazyVim.extras."lazyvim.plugins".catppuccin;
+          LazyVim-extras-catppuccin = buildPkg plugins.LazyVim.extras."lazyvim.plugins".catppuccin;
           LazyVim-extras-all = pkgs.runCommandLocal "LazyVim-extras-all" {
             buildInputs = lib'.flattenDerivations plugins.LazyVim.extras;
           } "touch $out";

pkgs/lazy-nvim-config.nix

@@ -1,6 +1,7 @@
 {
   lib,
   callPackage,
+  runCommand,
   writeTextFile,
   lazynvimPlugins,
   lazynvimUtils,
@@ -19,49 +20,55 @@ writeTextFile {
     })
   '';
 
-  passthru.tests = {
-    example = callPackage ./lazy-nvim-config.nix {
-      luaRcContent = ''
-        vim.g.mapleader = " "
-        vim.g.maplocalleader = "\\"
-      '';
+  passthru.tests =
+    let
+      example = callPackage ./lazy-nvim-config.nix {
+        luaRcContent = ''
+          vim.g.mapleader = " "
+          vim.g.maplocalleader = "\\"
+        '';
 
-      # https://lazy.folke.io/spec/examples
-      spec = [
-        {
-          url = "folke/tokyonight.nvim";
-          lazy = false;
-          priority = 1000;
-          config = lib.generators.mkLuaInline ''
-            function()
-              -- load the colorscheme here
-              vim.cmd([[colorscheme tokyonight]])
-            end
-          '';
-        }
-        {
-          url = "folke/which-key.nvim";
-          lazy = true;
-        }
-        {
-          url = "nvim-neorg/neorg";
-          ft = "norg";
-          opts = {
-            load = {
-              "core.defaults" = { };
+        # https://lazy.folke.io/spec/examples
+        spec = [
+          {
+            url = "folke/tokyonight.nvim";
+            lazy = false;
+            priority = 1000;
+            config = lib.generators.mkLuaInline ''
+              function()
+                -- load the colorscheme here
+                vim.cmd([[colorscheme tokyonight]])
+              end
+            '';
+          }
+          {
+            url = "folke/which-key.nvim";
+            lazy = true;
+          }
+          {
+            url = "nvim-neorg/neorg";
+            ft = "norg";
+            opts = {
+              load = {
+                "core.defaults" = { };
+              };
             };
-          };
-        }
-      ];
+          }
+        ];
 
-      opts = {
-        install = {
-          colorscheme = [ "habamax" ];
-        };
-        checker = {
-          enabled = true;
+        opts = {
+          install = {
+            colorscheme = [ "habamax" ];
+          };
+          checker = {
+            enabled = true;
+          };
         };
       };
+    in
+    {
+      example = runCommand "lazy-nvim-config-example" {
+        CONFIG = example;
+      } "touch $out";
     };
-  };
 }

pkgs/lazy-nvim.nix

@@ -66,8 +66,8 @@ in
       in
       {
         help = runCommand "nvim-help" { nativeBuildInputs = [ neovim ]; } ''
-          nvim --help 2>&1 >out~
-          mv out~ "$out"
+          nvim --help 2>&1
+          touch $out
         '';
 
         checkhealth = neovim-checkhealth.override {
@@ -120,12 +120,13 @@ in
         };
 
         startuptime = runCommand "nvim-startuptime" { nativeBuildInputs = [ neovim ]; } ''
-          HOME="$PWD" nvim --headless "+Lazy! home" --startuptime out~ +q 2>&1 | tee err
+          HOME="$PWD" nvim --headless "+Lazy! home" --startuptime out +q 2>&1 | tee err
           if grep "^E[0-9]\\+: " err; then
             cat err
             exit 1
           fi
-          mv out~ "$out"
+          cat out
+          touch $out
         '';
       };
   }

pkgs/neovim-checkhealth.nix

@@ -71,6 +71,6 @@ runCommand "checkhealth-${pluginName}"
       echo "Expected at least one OK" >&2
       return 1
     else
-      mv out.txt "$out"
+      touch $out
     fi
   ''