this repo has no description
Merge branch 'new_treesitter'
+52
-30
+22
lua/technoduck/init.lua
+22
lua/technoduck/init.lua
···
25
25
26
26
vim.g.netrw_browse_split = 0
27
27
vim.g.netrw_winsize = 25
28
+
29
+
30
+
vim.api.nvim_create_autocmd('FileType', {
31
+
pattern = {
32
+
'javascript',
33
+
'typescript',
34
+
'python',
35
+
'rust',
36
+
'c',
37
+
'lua',
38
+
'vim',
39
+
'vimdoc',
40
+
'query',
41
+
'markdown',
42
+
'doxygen' },
43
+
callback = function()
44
+
vim.treesitter.start()
45
+
-- vim.wo[0][0].foldexpr = 'v:lua.vim.treesitter.foldexpr()'
46
+
-- vim.wo[0][0].foldmethod = 'expr'
47
+
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
48
+
end,
49
+
})
+3
-1
lua/technoduck/lazy_config.lua
+3
-1
lua/technoduck/lazy_config.lua
+11
-8
lua/technoduck/lazy_plugins/lsp.lua
+11
-8
lua/technoduck/lazy_plugins/lsp.lua
···
31
31
'lua_ls',
32
32
'rust_analyzer',
33
33
'lua_ls',
34
+
'marksman',
34
35
'jedi_language_server',
35
36
'fortls',
36
37
'tinymist',
38
+
'clangd'
37
39
},
38
40
handlers = {
39
41
function(server_name)
···
44
46
vim.lsp.protocol.make_client_capabilities(),
45
47
cmp_nvim_lsp.default_capabilities())
46
48
47
-
require("lspconfig")[server_name].setup {
48
-
capabilities = capabilities
49
-
}
50
-
require'lspconfig'.fortls.setup{
49
+
vim.lsp.config(server_name, {
50
+
capabilities = capabilities,
51
+
vim.lsp.enable(server_name)
52
+
})
53
+
vim.lsp.config('fortls' ,{
51
54
cmd = {
52
55
'fortls',
53
56
'--hover_signature',
···
55
58
'--use_signature_help',
56
59
'--lowercase_intrinsics'
57
60
},
58
-
}
59
-
require("lspconfig").lua_ls.setup({
61
+
})
62
+
vim.lsp.config('lua_ls',{
60
63
settings = {
61
64
Lua = {
62
65
diagnostics = {
···
72
75
}
73
76
}
74
77
})
75
-
require('lspconfig').tinymist.setup {
78
+
vim.lsp.config('tinymist', {
76
79
settings = {
77
80
78
81
formatterMode = "typstyle",
···
82
85
semanticTokens = "disable"
83
86
84
87
}
85
-
}
88
+
})
86
89
end,
87
90
}
88
91
})
+16
-21
lua/technoduck/lazy_plugins/treesitter.lua
+16
-21
lua/technoduck/lazy_plugins/treesitter.lua
···
1
1
return {
2
2
'nvim-treesitter/nvim-treesitter',
3
-
branch = 'master',
3
+
branch = 'main',
4
+
build = ":TSUpdate",
4
5
lazy = false,
5
-
build = ":TSUpdate",
6
6
config = function()
7
-
require'nvim-treesitter.configs'.setup({
8
-
-- A list of parser names, or "all" (the five listed parsers should always be installed)
9
-
ensure_installed = {"javascript","typescript","python","rust","c", "lua", "vim", "vimdoc" },
7
+
local nvimt = require('nvim-treesitter')
10
8
11
-
-- Install parsers synchronously (only applied to `ensure_installed`)
12
-
sync_install = false,
13
-
14
-
-- Automatically install missing parsers when entering buffer
15
-
-- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
16
-
auto_install = true,
17
-
indent = {
18
-
enable = true
19
-
},
20
-
21
-
highlight = {
22
-
enable = true,
23
-
24
-
additional_vim_regex_highlighting = false,
25
-
},
26
-
})
9
+
nvimt.install({"javascript",
10
+
"typescript",
11
+
"python",
12
+
"rust",
13
+
"c",
14
+
"lua",
15
+
"vim",
16
+
"vimdoc",
17
+
"toml",
18
+
"query",
19
+
"markdown",
20
+
"markdown_inline",
21
+
'doxygen' })
27
22
end}