remove unused nix code

nix/mkNeovim.nix

@@ -1,150 +1,40 @@
-# Function for creating a Neovim derivation
 {
   pkgs,
   lib,
-  stdenv,
-  # Set by the overlay to ensure we use a compatible version of `wrapNeovimUnstable`
-  pkgs-wrapNeovim ? pkgs,
 }:
-with lib;
 {
-  # NVIM_APPNAME - Defaults to 'nvim' if not set.
-  # If set to something else, this will also rename the binary.
-  appName ? "nvim",
-  # The Neovim package to wrap
-  neovim-unwrapped ? pkgs-wrapNeovim.neovim-unwrapped,
-  plugins ? [ ], # List of plugins
-  # List of dev plugins (will be bootstrapped) - useful for plugin developers
-  # { name = <plugin-name>; url = <git-url>; }
-  devPlugins ? [ ],
-  # Regexes for config files to ignore, relative to the nvim directory.
-  # e.g. [ "^plugin/neogit.lua" "^ftplugin/.*.lua" ]
-  ignoreConfigRegexes ? [ ],
-  extraPackages ? [ ], # Extra runtime dependencies (e.g. ripgrep, ...)
-  # The below arguments can typically be left as their defaults
-  # Additional lua packages (not plugins), e.g. from luarocks.org.
-  # e.g. p: [p.jsregexp]
-  extraLuaPackages ? p: [ ],
-  extraPython3Packages ? p: [ ], # Additional python 3 packages
-  withPython3 ? false, # Build Neovim with Python 3 support?
-  withRuby ? false, # Build Neovim with Ruby support?
-  withNodeJs ? false, # Build Neovim with NodeJS support?
-  withSqlite ? true, # Add sqlite? This is a dependency for some plugins
-  # You probably don't want to create vi or vim aliases
-  # if the appName is something different than "nvim"
-  viAlias ? appName == "nvim", # Add a "vi" binary to the build output as an alias?
-  vimAlias ? appName == "nvim", # Add a "vim" binary to the build output as an alias?
+  name ? "nvim",
+  plugins ? [ ],
+  packages ? [ ],
   wrapRc ? true,
 }:
 let
-  # This is the structure of a plugin definition.
-  # Each plugin in the `plugins` argument list can also be defined as this attrset
-  defaultPlugin = {
-    plugin = null; # e.g. nvim-lspconfig
-    config = null; # plugin config
-    # If `optional` is set to `false`, the plugin is installed in the 'start' packpath
-    # set to `true`, it is installed in the 'opt' packpath, and can be lazy loaded with
-    # ':packadd! {plugin-name}
-    optional = false;
-    runtime = { };
-  };
-
-  externalPackages = extraPackages ++ (optionals withSqlite [ pkgs.sqlite ]);
-
-  # Map all plugins to an attrset { plugin = <plugin>; config = <config>; optional = <tf>; ... }
-
-  # This nixpkgs util function creates an attrset
-  # that pkgs.wrapNeovimUnstable uses to configure the Neovim build.
-  neovimConfig = pkgs-wrapNeovim.neovimUtils.makeNeovimConfig {
-    inherit
-      extraPython3Packages
-      withPython3
-      withRuby
-      withNodeJs
-      viAlias
-      vimAlias
-      ;
-
-    plugins = (pkgs.neovimUtils.normalizePlugins plugins);
-  };
-
-  packDir = pkgs.neovimUtils.packDir {
-    iofq = pkgs.neovimUtils.normalizedPluginsToVimPackage (pkgs.neovimUtils.normalizePlugins plugins);
-  };
-
-  nvimRtp = stdenv.mkDerivation {
+  isNvim = (name == "nvim");
+  nvimRtp = pkgs.stdenv.mkDerivation {
     name = "nvim-rtp";
     src = ../nvim;
-
     installPhase = ''
       mkdir -p $out/
       cp -r . $out/
     '';
   };
 
-  # The final init.lua content that we pass to the Neovim wrapper.
-  # It wraps the user init.lua, prepends the lua lib directory to the RTP
-  # and prepends the nvim and after directory to the RTP
-  initLua = ''
-    vim.opt.rtp:prepend('${nvimRtp}')
-  ''
-  + builtins.readFile ../nvim/init.lua;
+  wrapperArgs = ''
+    --set NVIM_APPNAME "${name}"
+    --prefix PATH : "${lib.makeBinPath packages}"
+    --set LIBSQLITE_CLIB_PATH "${pkgs.sqlite.out}/lib/libsqlite3.so"
+    --set LIBSQLITE "${pkgs.sqlite.out}/lib/libsqlite3.so"
+  '';
 
-  # Add arguments to the Neovim wrapper script
-  extraMakeWrapperArgs = builtins.concatStringsSep " " (
-    # Set the NVIM_APPNAME environment variable
-    (optional (
-      appName != "nvim" && appName != null && appName != ""
-    ) ''--set NVIM_APPNAME "${appName}"'')
-    # Add external packages to the PATH
-    ++ (optional (externalPackages != [ ]) ''--prefix PATH : "${makeBinPath externalPackages}"'')
-    # Set the LIBSQLITE_CLIB_PATH if sqlite is enabled
-    ++ (optional withSqlite ''--set LIBSQLITE_CLIB_PATH "${pkgs.sqlite.out}/lib/libsqlite3.so"'')
-    # Set the LIBSQLITE environment variable if sqlite is enabled
-    ++ (optional withSqlite ''--set LIBSQLITE "${pkgs.sqlite.out}/lib/libsqlite3.so"'')
-  );
-
-  luaPackages = neovim-unwrapped.lua.pkgs;
-  resolvedExtraLuaPackages = extraLuaPackages luaPackages;
-
-  # Native Lua libraries
-  extraMakeWrapperLuaCArgs =
-    optionalString (resolvedExtraLuaPackages != [ ])
-      ''--suffix LUA_CPATH ";" "${
-        concatMapStringsSep ";" luaPackages.getLuaCPath resolvedExtraLuaPackages
-      }"'';
-
-  # Lua libraries
-  extraMakeWrapperLuaArgs =
-    optionalString (resolvedExtraLuaPackages != [ ])
-      ''--suffix LUA_PATH ";" "${
-        concatMapStringsSep ";" luaPackages.getLuaPath resolvedExtraLuaPackages
-      }"'';
-
-  # wrapNeovimUnstable is the nixpkgs utility function for building a Neovim derivation.
-  neovim-wrapped = pkgs-wrapNeovim.wrapNeovimUnstable neovim-unwrapped (
-    neovimConfig
-    // {
-      luaRcContent = initLua;
-      wrapperArgs =
-        escapeShellArgs neovimConfig.wrapperArgs
-        + " "
-        + extraMakeWrapperArgs
-        + " "
-        + extraMakeWrapperLuaCArgs
-        + " "
-        + extraMakeWrapperLuaArgs;
-      wrapRc = wrapRc;
-    }
-  );
-
-  isCustomAppName = appName != null && appName != "nvim";
+  neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
+    wrapRc = wrapRc;
+    withPython3 = false;
+    vimAlias = isNvim;
+    plugins = (pkgs.neovimUtils.normalizePlugins plugins);
+    customLuaRC = ''vim.opt.rtp:prepend('${nvimRtp}')'' + builtins.readFile ../nvim/init.lua;
+    extraMakeWrapperArgs = wrapperArgs;
+  };
 in
-neovim-wrapped.overrideAttrs (oa: {
-  buildPhase =
-    oa.buildPhase
-    # If a custom NVIM_APPNAME has been set, rename the `nvim` binary
-    + lib.optionalString isCustomAppName ''
-      mv $out/bin/nvim $out/bin/${lib.escapeShellArg appName}
-    '';
+(pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped (neovimConfig)).overrideAttrs (oa: {
+  buildPhase = oa.buildPhase + lib.optionalString (!isNvim) ''mv $out/bin/nvim $out/bin/${name}'';
 })

nix/neovim-overlay.nix

@@ -1,12 +1,11 @@
 # This overlay, when applied to nixpkgs, adds the final neovim derivation to nixpkgs.
 { inputs }:
 final: prev:
-with final.pkgs.lib;
 let
-  mkNeovim = prev.callPackage ./mkNeovim.nix { pkgs-wrapNeovim = prev; };
+  mkNeovim = prev.callPackage ./mkNeovim.nix { pkgs = prev; };
   dart-nvim = inputs.dart.packages.x86_64-linux.default;
 
-  plugins = with final.vimPlugins; [
+  plugins = with prev.vimPlugins; [
     blink-cmp
     blink-ripgrep-nvim
     conform-nvim
@@ -23,12 +22,13 @@ let
     snacks-nvim
   ];
 
-  basePackages = with final; [
+  basePackages = with prev; [
+    sqlite
     ripgrep
     fd
   ];
   # Extra packages that should be included on nixos but don't need to be bundled
-  extraPackages = with final; [
+  extraPackages = with prev; [
     # linters
     yamllint
     jq
@@ -47,25 +47,21 @@ in
 {
   nvim-pkg = mkNeovim {
     inherit plugins;
-    extraPackages = basePackages ++ extraPackages;
+    packages = basePackages ++ extraPackages;
   };
 
   nvim-min-pkg = mkNeovim {
     inherit plugins;
-    extraPackages = basePackages;
+    packages = basePackages;
   };
 
-  # This is meant to be used within a devshell.
-  # Instead of loading the lua Neovim configuration from
-  # the Nix store, it is loaded from $XDG_CONFIG_HOME/nvim-dev
   nvim-dev = mkNeovim {
     inherit plugins;
-    extraPackages = basePackages ++ extraPackages;
-    appName = "nvim-dev";
+    packages = basePackages ++ extraPackages;
+    name = "nvim-dev";
     wrapRc = false;
   };
 
-  # This can be symlinked in the devShell's shellHook
   nvim-luarc-json = final.mk-luarc-json {
     inherit plugins;
   };