- corrected ltex_lsp config and added nixd settings (still not working correctly)
- improved mini pairs behavior but still not perfect
This commit is contained in:
@@ -164,11 +164,18 @@ return { -- LSP Configuration & Plugins
|
|||||||
-- nvim 0.11 or above
|
-- nvim 0.11 or above
|
||||||
vim.lsp.config('vtsls', vtsls_config)
|
vim.lsp.config('vtsls', vtsls_config)
|
||||||
vim.lsp.config('vue_ls', vue_ls_config)
|
vim.lsp.config('vue_ls', vue_ls_config)
|
||||||
vim.lsp.enable({ 'vtsls', 'vue_ls' })
|
vim.lsp.config('nixd', {
|
||||||
vim.lsp.enable('nixd', {
|
|
||||||
settings = {
|
settings = {
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
expr = "import <nixpkgs> { }"
|
expr = "import <nixpkgs> { }"
|
||||||
|
},
|
||||||
|
options = {
|
||||||
|
nixos = {
|
||||||
|
expr = '(builtins.getFlake "/etc/nixos/").nixosConfigurations.pcerik.options',
|
||||||
|
},
|
||||||
|
home_manager = {
|
||||||
|
expr = '(builtins.getFlake "/etc/nixos").homeConfigurations.erik.options',
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -180,5 +187,6 @@ return { -- LSP Configuration & Plugins
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
vim.lsp.enable({ 'vtsls', 'vue_ls', 'ltex_plus', 'nixd' })
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
@@ -33,7 +33,21 @@ return {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
require("mini.tabline").setup()
|
require("mini.tabline").setup()
|
||||||
require("mini.pairs").setup()
|
require("mini.pairs").setup({
|
||||||
|
mappings = {
|
||||||
|
['('] = { action = 'open', pair = '()', neigh_pattern = '.[%s%z%)]' },
|
||||||
|
['['] = { action = 'open', pair = '[]', neigh_pattern = '.[%s%z%)}%]]' },
|
||||||
|
['{'] = { action = 'open', pair = '{}', neigh_pattern = '.[%s%z%)}%]]' },
|
||||||
|
|
||||||
|
[')'] = { action = 'close', pair = '()', neigh_pattern = '[^\\].' },
|
||||||
|
[']'] = { action = 'close', pair = '[]', neigh_pattern = '[^\\].' },
|
||||||
|
['}'] = { action = 'close', pair = '{}', neigh_pattern = '[^\\].' },
|
||||||
|
|
||||||
|
['"'] = { action = 'closeopen', pair = '""', neigh_pattern = '[^%w\\][^%w]', register = { cr = false } },
|
||||||
|
["'"] = { action = 'closeopen', pair = "''", neigh_pattern = '[^%w\\][^%w]', register = { cr = false } },
|
||||||
|
['`'] = { action = 'closeopen', pair = '``', neigh_pattern = '[^%w\\][^%w]', register = { cr = false } },
|
||||||
|
}
|
||||||
|
})
|
||||||
require("mini.colors").setup()
|
require("mini.colors").setup()
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
@@ -65,11 +65,11 @@ if vim.g.vscode then
|
|||||||
-- put vscode specific settings / keymaps here
|
-- put vscode specific settings / keymaps here
|
||||||
else
|
else
|
||||||
-- Keymaps
|
-- Keymaps
|
||||||
-- Copy
|
-- Paste
|
||||||
vim.api.nvim_set_keymap("n", "<C-v>", '"+gp', { noremap = true })
|
-- vim.api.nvim_set_keymap("n", "<C-v>", '"+gp', { noremap = true })
|
||||||
vim.api.nvim_set_keymap("i", "<C-v>", '<Esc>"+gp', { noremap = true })
|
vim.api.nvim_set_keymap("i", "<C-v>", '<Esc>"+gp', { noremap = true })
|
||||||
|
|
||||||
-- Paste
|
-- Copy
|
||||||
vim.api.nvim_set_keymap("v", "<C-c>", '"+y', { noremap = true })
|
vim.api.nvim_set_keymap("v", "<C-c>", '"+y', { noremap = true })
|
||||||
vim.api.nvim_set_keymap("n", "<C-c>", '"+yy', { noremap = true })
|
vim.api.nvim_set_keymap("n", "<C-c>", '"+yy', { noremap = true })
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user