Compare commits

..

No commits in common. "5d2bc9abb8972e3245eb57dd71be328dba07c7d1" and "a510ccafb63215bb395f54da0d31029b9f201c5a" have entirely different histories.

4 changed files with 7 additions and 25 deletions

View file

@ -188,14 +188,15 @@
(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));
}); });
# All runtime dependencies are now optional and checked lazily by plugins # 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 # This keeps the neovim flake lean and allows project devShells to provide tools
# Core dependencies that telescope needs are kept here # Core dependencies that neovim itself might need can still be added here
runtimeDependencies = with pkgs; [ runtimeDependencies = with pkgs; [
ripgrep # search - core to telescope, checked in telescope.lua init # Keeping ripgrep and fd as they're core to telescope functionality
fd # file finding - improves telescope performance, checked in telescope.lua init ripgrep # search - used heavily by telescope
fd # file finding - used by telescope
# 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
]; ];
in in
@ -218,7 +219,6 @@
++ [ ++ [
# Add minimal runtime dependencies to neovim path # Add minimal runtime dependencies to neovim path
# Most tools are now optional and checked at runtime # Most tools are now optional and checked at runtime
# Project devShells take precedence via --suffix
"--suffix" "--suffix"
"PATH" "PATH"
":" ":"

View file

@ -83,8 +83,7 @@ return {
-- args = { "fmt" }, -- args = { "fmt" },
-- }, -- },
}, },
-- Formatters are checked lazily on format attempt -- Note that all these need to be available at runtime, add them to flake.nix#runtimeDependencies
-- conform.nvim will show errors if formatters are missing
formatters_by_ft = { formatters_by_ft = {
sql = { "sql_formatter", lsp_format = "first" }, sql = { "sql_formatter", lsp_format = "first" },
lua = { "stylua", lsp_format = "first" }, lua = { "stylua", lsp_format = "first" },

View file

@ -13,16 +13,6 @@ return {
default_type = "keep", default_type = "keep",
}, },
cmd = "Glow", cmd = "Glow",
config = function(_, opts)
-- Check for glow when plugin is first used
if not U.cmd_executable("glow") then
vim.notify(
"'glow' not found on PATH. Install it to use markdown preview.",
vim.log.levels.ERROR
)
end
require("glow").setup(opts)
end,
keys = { keys = {
{ "<leader>,m", "<cmd>Glow<cr>", desc = "Markdown preview" }, { "<leader>,m", "<cmd>Glow<cr>", desc = "Markdown preview" },
}, },

View file

@ -20,13 +20,6 @@ return {
dependencies = { "nvim-telescope/telescope.nvim" }, dependencies = { "nvim-telescope/telescope.nvim" },
opts = {}, opts = {},
config = function(_, opts) config = function(_, opts)
-- Check for sshfs when plugin is first used
if not U.cmd_executable("sshfs") then
vim.notify(
"'sshfs' not found on PATH. Install it to use RemoteSSHFS commands.",
vim.log.levels.ERROR
)
end
require("remote-sshfs").setup(opts) require("remote-sshfs").setup(opts)
require("telescope").load_extension("remote-sshfs") require("telescope").load_extension("remote-sshfs")
end, end,