ci(flake): some small improvements

jghauser · Jul 8, 2024 · ac8fcee · ac8fcee
1 parent 131ef33
commit ac8fcee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/flake.nix b/flake.nix
@@ -55,7 +55,7 @@
                 ''
                   ${pkgs.coreutils}/bin/rm -rf ${test-lib-dir}
                   ${pkgs.coreutils}/bin/cp -r -r ./tests/files/library ${test-lib-dir}
-                  ${pkgs.neovim-with-papis}/bin/nvim -c "lua _Load_papis()" -c "e test.md"
+                  ${pkgs.neovim-with-plugin}/bin/nvim -c "lua _Load_papis()" -c "e test.md"
                 '';
             };
           in [
@@ -74,7 +74,7 @@
         packages = rec {
           default = papis-nvim;
           inherit (pkgs.luajitPackages) papis-nvim;
-          inherit (pkgs) neovim-with-papis;
+          inherit (pkgs) neovim-with-plugin;
         };
       };
       flake = {

diff --git a/nix/ci-overlay.nix b/nix/ci-overlay.nix
@@ -16,7 +16,7 @@
       };
 
       neovimConfig = neovimUtils.makeNeovimConfig {
-        withPython3 = true;
+        withPython3 = false;
         viAlias = true;
         vimAlias = true;
         extraLuaPackages = luaPkgs: [
@@ -41,7 +41,7 @@
           wrapperArgs =
             lib.escapeShellArgs neovimConfig.wrapperArgs
             + " "
-            + ''--set NVIM_APPNAME "nvim-papis"''
+            + ''--set NVIM_APPNAME "nvim-${name}"''
             + " "
             + ''--prefix PATH : "${lib.makeBinPath runtimeDeps}"'';
           wrapRc = true;
@@ -141,5 +141,5 @@
             '';
         });
 in {
-  neovim-with-papis = mkNvimMinimal final.neovim-unwrapped;
+  neovim-with-plugin = mkNvimMinimal final.neovim-unwrapped;
 }
diff --git a/nix/plugin-overlay.nix b/nix/plugin-overlay.nix
@@ -14,7 +14,7 @@
       buildLuarocksPackage {
         pname = name;
         version = "scm-1";
-        knownRockspec = "${self}/papis.nvim-scm-1.rockspec";
+        knownRockspec = "${self}/${name}-scm-1.rockspec";
         disabled = luaOlder "5.1";
         propagatedBuildInputs = [
           nui-nvim