mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-03-08 09:46:00 +00:00
Compare commits
No commits in common. "39813f03226d0c603a85458d2bdf27e947b593da" and "1481131ee9d4098b2981879c6dc92a3a6c984883" have entirely different histories.
39813f0322
...
1481131ee9
4 changed files with 0 additions and 66 deletions
|
|
@ -72,7 +72,6 @@ isMaximal: {
|
||||||
extensions.crates-nvim.enable = isMaximal;
|
extensions.crates-nvim.enable = isMaximal;
|
||||||
};
|
};
|
||||||
toml.enable = isMaximal;
|
toml.enable = isMaximal;
|
||||||
xml.enable = isMaximal;
|
|
||||||
|
|
||||||
# Language modules that are not as common.
|
# Language modules that are not as common.
|
||||||
assembly.enable = false;
|
assembly.enable = false;
|
||||||
|
|
|
||||||
|
|
@ -151,8 +151,6 @@
|
||||||
- Added [Selenen](https://github.com/kampfkarren/selene) for more diagnostics in
|
- Added [Selenen](https://github.com/kampfkarren/selene) for more diagnostics in
|
||||||
`languages.lua`.
|
`languages.lua`.
|
||||||
|
|
||||||
- Added XML syntax highlighting, LSP support and formatting
|
|
||||||
|
|
||||||
[vagahbond](https://github.com/vagahbond): [codewindow.nvim]:
|
[vagahbond](https://github.com/vagahbond): [codewindow.nvim]:
|
||||||
https://github.com/gorbit99/codewindow.nvim
|
https://github.com/gorbit99/codewindow.nvim
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,6 @@ in {
|
||||||
./yaml.nix
|
./yaml.nix
|
||||||
./ruby.nix
|
./ruby.nix
|
||||||
./just.nix
|
./just.nix
|
||||||
./xml.nix
|
|
||||||
|
|
||||||
# This is now a hard deprecation.
|
# This is now a hard deprecation.
|
||||||
(mkRenamedOptionModule ["vim" "languages" "enableLSP"] ["vim" "lsp" "enable"])
|
(mkRenamedOptionModule ["vim" "languages" "enableLSP"] ["vim" "lsp" "enable"])
|
||||||
|
|
|
||||||
|
|
@ -1,62 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (builtins) attrNames;
|
|
||||||
inherit (lib.options) mkOption mkEnableOption;
|
|
||||||
inherit (lib.meta) getExe;
|
|
||||||
inherit (lib.modules) mkIf mkMerge;
|
|
||||||
inherit (lib.types) enum listOf;
|
|
||||||
inherit (lib.nvim.types) mkGrammarOption;
|
|
||||||
inherit (lib.nvim.attrsets) mapListToAttrs;
|
|
||||||
|
|
||||||
cfg = config.vim.languages.xml;
|
|
||||||
|
|
||||||
defaultServers = ["lemminx"];
|
|
||||||
servers = {
|
|
||||||
lemminx = {
|
|
||||||
enable = true;
|
|
||||||
cmd = [
|
|
||||||
(getExe pkgs.lemminx)
|
|
||||||
];
|
|
||||||
filetypes = ["xml"];
|
|
||||||
root_markers = [".git"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
options.vim.languages.xml = {
|
|
||||||
enable = mkEnableOption "XML language support";
|
|
||||||
|
|
||||||
treesitter = {
|
|
||||||
enable = mkEnableOption "XML treesitter" // {default = config.vim.languages.enableTreesitter;};
|
|
||||||
package = mkGrammarOption pkgs "xml";
|
|
||||||
};
|
|
||||||
|
|
||||||
lsp = {
|
|
||||||
enable = mkEnableOption "XML LSP support" // {default = config.vim.lsp.enable;};
|
|
||||||
servers = mkOption {
|
|
||||||
type = listOf (enum (attrNames servers));
|
|
||||||
default = defaultServers;
|
|
||||||
description = "XML LSP server to use";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable (mkMerge [
|
|
||||||
(mkIf cfg.treesitter.enable {
|
|
||||||
vim.treesitter.enable = true;
|
|
||||||
vim.treesitter.grammars = [cfg.treesitter.package];
|
|
||||||
})
|
|
||||||
|
|
||||||
(mkIf cfg.lsp.enable {
|
|
||||||
vim.lsp.servers =
|
|
||||||
mapListToAttrs (name: {
|
|
||||||
inherit name;
|
|
||||||
value = servers.${name};
|
|
||||||
})
|
|
||||||
cfg.lsp.servers;
|
|
||||||
})
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue