Merge branch 'main' into fix/invalid-keys-in-haskell-tools

This commit is contained in:
Ching Pei Yang 2026-06-03 12:25:15 +02:00 committed by GitHub
commit c03ddf95ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 23 deletions

View file

@ -378,5 +378,15 @@ in {
[
(mkRenamedOptionModule ["vim" "languages" "typescript" "treesitter" "tsxPackage"] ["vim" "languages" "tsx" "treesitter" "package"])
]
# 2026-06-02
[
(mkRemovedOptionModule ["vim" "filetree" "nvimTree" "systemOpen" "args"] ''
nvim-tree.lua removed system_open and now uses Neovim's vim.ui.open().
'')
(mkRemovedOptionModule ["vim" "filetree" "nvimTree" "systemOpen" "cmd"] ''
nvim-tree.lua removed system_open and now uses Neovim's vim.ui.open().
'')
]
];
}

View file

@ -28,10 +28,6 @@
reloadOnBufEnter = "reload_on_buf_enter";
respectBufCwd = "respect_buf_cwd";
hijackDirectories = "hijack_directories";
systemOpen = {
args = "args";
cmd = "cmd";
};
diagnostics = "diagnostics";
git = {
enable = "enable";
@ -228,25 +224,6 @@ in {
};
};
system_open = {
args = mkOption {
default = [];
description = "Optional argument list.";
type = listOf str;
};
cmd = mkOption {
default =
if pkgs.stdenv.isDarwin
then "open"
else if pkgs.stdenv.isLinux
then "${pkgs.xdg-utils}/bin/xdg-open"
else throw "NvimTree: No default system open command for this platform, please set `vim.filetree.nvimTree.systemOpen.cmd`";
description = "The open command itself";
type = str;
};
};
diagnostics = mkOption {
description = ''
Show LSP and COC diagnostics in the signcolumn