Skip to content

Commit 58995d3

Browse files
committed
merge nvim-lua#9
1 parent 2d7ee0f commit 58995d3

File tree

3 files changed

+48
-6
lines changed

3 files changed

+48
-6
lines changed

init.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ vim.api.nvim_set_keymap('n', '<leader>tc', ':tabclose<CR>', { noremap = true, de
3838
vim.api.nvim_set_keymap('n', '<leader>to', ':tabonly<CR>', { noremap = true, desc = 'Keep only this tab, remove others' })
3939
vim.api.nvim_set_keymap('n', '<leader>tn', ':tabn<CR>', { noremap = true, desc = 'Move to next Tab (right)' })
4040
vim.api.nvim_set_keymap('n', '<leader>tp', ':tabp<CR>', { noremap = true, desc = 'Move to previous tab (left)' })
41-
4241
-- move current tab to previous position
4342
vim.api.nvim_set_keymap('n', '<leader>tmp', ':-tabmove<CR>', { noremap = true, desc = "Move this tab's position left" })
4443
-- move current tab to next position
@@ -873,7 +872,7 @@ require('lazy').setup({
873872
'vim',
874873
'vimdoc',
875874
'xml',
876-
'yaml',
875+
'yaml'
877876
},
878877
-- Autoinstall languages that are not installed
879878
auto_install = true,

lua/custom/plugins/init.lua

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,52 @@
33
--
44
-- See the kickstart.nvim README for more information
55
return {
6+
{
7+
'nanozuki/tabby.nvim',
8+
event = 'VimEnter',
9+
dependencies = 'nvim-tree/nvim-web-devicons',
10+
config = function()
11+
local capabilities = require('cmp_nvim_lsp').default_capabilities()
12+
local lspconfig = require 'lspconfig'
13+
lspconfig.bashls.setup {
14+
capabilities = capabilities,
15+
}
16+
lspconfig.golangci_lint_ls.setup {
17+
capabilities = capabilities,
18+
}
19+
lspconfig.gopls.setup {
20+
capabilities = capabilities,
21+
}
22+
lspconfig.awk_ls.setup {
23+
capabilities = capabilities,
24+
}
25+
lspconfig.cssls.setup {
26+
capabilities = capabilities,
27+
}
28+
lspconfig.docker_compose_language_service.setup {
29+
capabilities = capabilities,
30+
}
31+
lspconfig.dockerls.setup {
32+
capabilities = capabilities,
33+
}
34+
lspconfig.perlpls.setup {
35+
capabilities = capabilities,
36+
}
37+
-- lspconfig.ltex.setup {
38+
-- capabilities = capabilities,
39+
-- }
40+
lspconfig.ltex.setup {
41+
settings = {
42+
ltex = {
43+
language = 'en',
44+
additionalRules = {
45+
languageModel = '~/.config/language-models/ngrams/',
46+
},
47+
},
48+
},
49+
}
50+
end,
51+
},
652
{
753
'nanozuki/tabby.nvim',
854
event = 'VimEnter',

lua/kickstart/plugins/lint.lua

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ return {
1010
dockerfile = { 'hadolint' },
1111
ruby = { 'ruby' },
1212
terraform = { 'tflint' },
13-
text = { 'vale' },
14-
-- cpp = { 'cpplint' },
15-
-- json = { 'jsonlint' },
16-
-- cpp = { 'cppcheck' },
13+
text = { 'vale' }
1714
}
1815

1916
-- To allow other plugins to add linters to require('lint').linters_by_ft,

0 commit comments

Comments
 (0)