diff --git a/.config/nvim/after/plugin/dap.lua b/.config/nvim/after/plugin/dap.lua index 3a3bb43..b1ec257 100644 --- a/.config/nvim/after/plugin/dap.lua +++ b/.config/nvim/after/plugin/dap.lua @@ -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" } } } diff --git a/.config/nvim/after/plugin/lspconfig.lua b/.config/nvim/after/plugin/lspconfig.lua index 1e5555c..a03fb4a 100644 --- a/.config/nvim/after/plugin/lspconfig.lua +++ b/.config/nvim/after/plugin/lspconfig.lua @@ -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()]] diff --git a/.config/nvim/after/plugin/merginal.lua b/.config/nvim/after/plugin/merginal.lua deleted file mode 100644 index 88e3f7d..0000000 --- a/.config/nvim/after/plugin/merginal.lua +++ /dev/null @@ -1 +0,0 @@ -vim.keymap.set("n", "gr", ":Merginal") diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index add9241..d8bbeee 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -11,6 +11,7 @@ require('telescope').load_extension('ui-select') local builtin = require('telescope.builtin') vim.keymap.set('n', 'pf', builtin.find_files, {}) vim.keymap.set('n', 'p', builtin.git_files, {}) +vim.keymap.set('n', 'sw', 'Telescope lsp_workspace_symbols', {}) vim.keymap.set('n', 'ps', function() builtin.grep_string({ search = vim.fn.input("Grep > ") }); end) diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua index 2b621c2..4d18b1e 100644 --- a/.config/nvim/after/plugin/treesitter.lua +++ b/.config/nvim/after/plugin/treesitter.lua @@ -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" }, + } } diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 3cc23d8..405618c 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -5,25 +5,25 @@ "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "everforest-nvim": { "branch": "main", "commit": "d2936185a6d266def29fd7b523d296384580ef08" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazy.nvim": { "branch": "main", "commit": "59334064f8604ca073791c25dcc5c9698865406e" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "f760507df8c49a4bf46a4d12e1fc616797508979" }, - "mason.nvim": { "branch": "main", "commit": "b3689a41dd77e5294498dba9757fb22cc80cbebd" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, "neogit": { "branch": "master", "commit": "90dcfa7b2bd5f3f35d1a7afe24dde9e2bc482cd4" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" }, - "nvim-dap-python": { "branch": "master", "commit": "bfe572e4458e0ac876b9539a1e9f301c72db8ea0" }, + "nvim-dap": { "branch": "master", "commit": "881f7dc17c0b4204a1d844732f95539575350e5b" }, + "nvim-dap-python": { "branch": "master", "commit": "64652d1ae1db80870d9aac7132d76e37acd86a26" }, "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, - "nvim-lspconfig": { "branch": "master", "commit": "a844e89ea0e0e4b207ec550c3b51fb6e471881a4" }, + "nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" }, - "odoo-neovim": { "branch": "main-default-whe", "commit": "24f06b2eb090086d888e44d229dc2b422014b2f8" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "smear-cursor.nvim": { "branch": "main", "commit": "4b86df8a0c5f46e708616b21a02493bb0e47ecbd" }, + "smear-cursor.nvim": { "branch": "main", "commit": "abfa5835920b1d76c0e24e1465a618ad914be90a" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" }, "vim-merginal": { "branch": "develop", "commit": "3dca10fd8bce10edbc2024651db4ffb6dd2d89de" }, + "vim-projectionist": { "branch": "master", "commit": "5ff7bf79a6ef741036d2038a226bcb5f8b1cd296" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } } diff --git a/.config/nvim/lua/wicked/lazy.lua b/.config/nvim/lua/wicked/lazy.lua index 5181d67..5e1c0f1 100644 --- a/.config/nvim/lua/wicked/lazy.lua +++ b/.config/nvim/lua/wicked/lazy.lua @@ -29,15 +29,22 @@ require("lazy").setup({ end }, - 'macocianradu/odoo-neovim', + { + dir = '/home/odoo/Projects/odoo-neovim', + lazy = false, + }, + --{ + -- 'macocianradu/odoo-neovim', + -- branch = "Nvim_Plugin", + --}, 'nvim-treesitter/nvim-treesitter', 'theprimeagen/harpoon', 'mbbill/undotree', 'tpope/vim-surround', 'nvim-telescope/telescope-ui-select.nvim', - 'idanarye/vim-merginal', 'sphamba/smear-cursor.nvim', 'williamboman/mason.nvim', + 'tpope/vim-projectionist', 'williamboman/mason-lspconfig.nvim', { "NeogitOrg/neogit", @@ -56,12 +63,13 @@ require("lazy").setup({ 'hrsh7th/nvim-cmp', 'L3MON4D3/LuaSnip', { - 'mfussenegger/nvim-dap', + 'mfussenegger/nvim-dap-python', dependencies = { - 'mfussenegger/nvim-dap-python', + 'mfussenegger/nvim-dap', 'rcarriga/nvim-dap-ui', 'nvim-neotest/nvim-nio' - } + }, + build = false, } }, -- Configure any other settings here. See the documentation for more details. diff --git a/.config/nvim/lua/wicked/remap.lua b/.config/nvim/lua/wicked/remap.lua index 2cd9b59..5459519 100644 --- a/.config/nvim/lua/wicked/remap.lua +++ b/.config/nvim/lua/wicked/remap.lua @@ -39,3 +39,5 @@ vim.keymap.set("n", "j", "lprevzz") vim.keymap.set("n", "s", [[:%s/\<\>//gi]]) vim.keymap.set("n", "x", "!chmod _x %", { silent = true}) + +vim.keymap.set('n', ';', ':A', { desc = 'Alternate file' })