Skip to content

Commit 8e65234

Browse files
committed
chore(*): some changes from upstream (NvChad/NvChad@b5b38eb), (NvChad/NvChad@a792fd1), (NvChad/NvChad@29ebe31)
1 parent 825282a commit 8e65234

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

modules/nixvim/blink.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
show_in_snippet = true;
2222
show_on_trigger_character = true;
2323
};
24+
ghost_text.enabled = true;
2425
documentation.auto_show = true;
2526
documentation.update_delay_ms = 100;
27+
documentation.window.border = "single";
2628
};
2729
signature.enabled = true;
2830

modules/nixvim/lsp.nix

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ in
1010
enable = true;
1111
settings = {
1212
diagnostics.globals = [ "vim" ];
13+
runtime.version = "LuaJIT";
1314
workspace.library = [
1415
{ __raw = ''vim.fn.expand "$VIMRUNTIME/lua"''; }
1516
"${pkgs.vimPlugins.nvchad-ui}/nvchad_types"
@@ -64,8 +65,14 @@ in
6465
(str: /* lua */ ''
6566
vim.tbl_deep_extend("force", {
6667
on_init = function(client, _)
67-
if client.supports_method "textDocument/semanticTokens" then
68-
client.server_capabilities.semanticTokensProvider = nil
68+
if vim.fn.has "nvim-0.11" ~= 1 then
69+
if client.supports_method "textDocument/semanticTokens" then
70+
client.server_capabilities.semanticTokensProvider = nil
71+
end
72+
else
73+
if client:supports_method "textDocument/semanticTokens" then
74+
client.server_capabilities.semanticTokensProvider = nil
75+
end
6976
end
7077
end,
7178
capabilities = ${capabilities}

modules/nixvim/opts.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
opts = {
55
laststatus = 3;
66
showmode = false;
7+
splitkeep = "screen";
78
cursorlineopt = "number";
89
cursorline = true;
910
clipboard = "unnamedplus";

0 commit comments

Comments
 (0)