This commit is contained in:
RingOfStorms (Joshua Bell) 2025-10-27 21:57:13 -05:00
parent 5f4f5a9997
commit 5d2bc9abb8

View file

@ -188,17 +188,6 @@
(builtins.filter (n: builtins.substring 0 12 n == "nvim_plugin-") (builtins.attrNames inputs)); (builtins.filter (n: builtins.substring 0 12 n == "nvim_plugin-") (builtins.attrNames inputs));
}); });
<<<<<<< Updated upstream
# All runtime dependencies are now optional and checked at runtime by plugins
# This keeps the neovim flake lean and allows project devShells to provide tools
# Core dependencies that neovim itself might need can still be added here
runtimeDependencies = with pkgs; [
# Keeping ripgrep and fd as they're core to telescope functionality
ripgrep # search - used heavily by telescope
fd # file finding - used by telescope
# All other tools (LSPs, formatters, linters, glow, sshfs, etc.) are now optional
# and will show helpful errors when missing
=======
# All runtime dependencies are now optional and checked lazily by plugins # All runtime dependencies are now optional and checked lazily by plugins
# This keeps the neovim flake lean and allows project devShells to provide tools # This keeps the neovim flake lean and allows project devShells to provide tools
# Core dependencies that telescope needs are kept here # Core dependencies that telescope needs are kept here
@ -207,7 +196,6 @@
fd # file finding - improves telescope performance, checked in telescope.lua init fd # file finding - improves telescope performance, checked in telescope.lua init
# All other tools (LSPs, formatters, linters, glow, sshfs, etc.) are now optional # All other tools (LSPs, formatters, linters, glow, sshfs, etc.) are now optional
# and will show helpful errors when missing at the point of use # and will show helpful errors when missing at the point of use
>>>>>>> Stashed changes
]; ];
in in
@ -229,11 +217,8 @@
old.generatedWrapperArgs or [ ] old.generatedWrapperArgs or [ ]
++ [ ++ [
# Add minimal runtime dependencies to neovim path # Add minimal runtime dependencies to neovim path
<<<<<<< Updated upstream
# Most tools are now optional and checked at runtime # Most tools are now optional and checked at runtime
=======
# Project devShells take precedence via --suffix # Project devShells take precedence via --suffix
>>>>>>> Stashed changes
"--suffix" "--suffix"
"PATH" "PATH"
":" ":"