mirror of
https://github.com/macocianradu/setup.git
synced 2026-03-18 21:00:04 +00:00
removed unused merginal
This commit is contained in:
@@ -38,7 +38,7 @@ dap.configurations.python = {
|
||||
args = {
|
||||
"--addons-path", "/home/odoo/Projects/odoo/enterprise/,/home/odoo/Projects/odoo/odoo/addons/",
|
||||
"--dev", "all",
|
||||
"-d", "rd-demo"
|
||||
"-d", "rd-pos"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,13 +4,26 @@ capabilities.textDocument.completion.completionItem.snippetSupport = true
|
||||
vim.lsp.config("*", {
|
||||
capabilities = capabilities
|
||||
})
|
||||
vim.lsp.config("ts_ls", {})
|
||||
-- vim.lsp.config("ts_ls", {})
|
||||
vim.lsp.config("ruff", {})
|
||||
vim.lsp.config("cssls", {})
|
||||
vim.lsp.config("lua_ls", {})
|
||||
vim.lsp.config("odoo_ls", {})
|
||||
vim.lsp.config("lemminx", {})
|
||||
vim.lsp.config("eslint", {
|
||||
cmd = { "vscode-eslint-language-server", "--stdio" },
|
||||
root_markers = { ".eslintrc", ".eslintrc.json", ".eslintrc.js", "package.json", ".git" },
|
||||
filetypes = { "javascript", "javascriptreact", "typescript", "typescriptreact", "vue", "svelte" },
|
||||
settings = {
|
||||
validate = "on",
|
||||
packageManager = "npm",
|
||||
workingDirectory = { mode = "auto" },
|
||||
debug = true,
|
||||
format = true,
|
||||
},
|
||||
})
|
||||
|
||||
vim.lsp.enable({"odoo_ls", "ts_ls", "ruff", "cssls", "lua_ls"})
|
||||
vim.lsp.enable({"odoo_ls", "ruff", "eslint", "cssls", "lua_ls", "lemminx"})
|
||||
|
||||
vim.api.nvim_create_autocmd('LspAttach', {
|
||||
group = vim.api.nvim_create_augroup('user_lsp_attach', { clear = true }),
|
||||
@@ -63,4 +76,13 @@ cmp.setup({
|
||||
},
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = "xml",
|
||||
callback = function()
|
||||
vim.bo.indentexpr = ""
|
||||
vim.bo.cindent = false
|
||||
vim.bo.smartindent = false
|
||||
end
|
||||
})
|
||||
|
||||
-- vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]]
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
vim.keymap.set("n", "<leader>gr", ":Merginal<CR>")
|
||||
@@ -11,6 +11,7 @@ require('telescope').load_extension('ui-select')
|
||||
local builtin = require('telescope.builtin')
|
||||
vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
|
||||
vim.keymap.set('n', '<C-p>p', builtin.git_files, {})
|
||||
vim.keymap.set('n', '<leader>sw', '<cmd>Telescope lsp_workspace_symbols<cr>', {})
|
||||
vim.keymap.set('n', '<leader>ps', function()
|
||||
builtin.grep_string({ search = vim.fn.input("Grep > ") });
|
||||
end)
|
||||
|
||||
@@ -21,4 +21,9 @@ require 'nvim-treesitter.configs'.setup {
|
||||
-- Instead of true it can also be a list of languages
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
|
||||
indent = {
|
||||
enable = true,
|
||||
disable = { "xml", "python" },
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user