Compare commits

...

2 Commits

Author SHA1 Message Date
Henrik Bakken f9a270ac3e nvim pyright root_dir 2025-09-10 21:57:37 +02:00
Henrik Bakken 517d0111aa gitconfig disable diff3 2025-09-10 21:25:47 +02:00
2 changed files with 14 additions and 2 deletions
+2 -2
View File
@@ -13,8 +13,8 @@
required = true
[interactive]
diffFilter = delta --color-only
[merge]
conflictstyle = diff3
; [merge]
; conflictstyle = diff3
[delta]
navigate = true
light = false
+12
View File
@@ -442,6 +442,18 @@ local function makespec_lspconfig()
lspconfig.pyright.setup({
cmd = { "pyright-langserver", "--stdio", "--threads", "20" },
filetypes = { "python" },
root_dir = function(fname)
local root_files = {
".git",
"pyproject.toml",
"setup.py",
"setup.cfg",
"requirements.txt",
"Pipfile",
"pyrightconfig.json",
}
return lspconfig.util.root_pattern(unpack(root_files))(fname)
end,
settings = {
python = {
analysis = {