diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 862b6f37..de4997d8 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "LazyVim": { "branch": "main", "commit": "c433ea7aa842c446edc2b1570998bf5440c68188" }, "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, - "SchemaStore.nvim": { "branch": "main", "commit": "2579aef95ffa497314ce871626a6145bc70da51d" }, + "SchemaStore.nvim": { "branch": "main", "commit": "85009f1efcea501d40fb7f575319516d5f93feaf" }, "actions-preview.nvim": { "branch": "master", "commit": "dd63df1a4ed0ffe1458945ee50ecb1dd02b605ab" }, "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, @@ -16,7 +16,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "codeium.vim": { "branch": "main", "commit": "c272d8d164c7757b40bbd009065244440eb3fbc5" }, + "codeium.vim": { "branch": "main", "commit": "04e5f9dfb11d3bbcc28b4685378c1e6d2963fd1e" }, "comment-box.nvim": { "branch": "main", "commit": "6394c872257bdbf60ae31aa6096c4b86b6f4b844" }, "compiler.nvim": { "branch": "main", "commit": "4a44a63b2d5bad828d1a29a28a2a9a04119e01a8" }, "conform.nvim": { "branch": "master", "commit": "d99b75b4aedf0e912f41c5740a7267de739cddac" }, @@ -33,7 +33,7 @@ "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" }, "garbage-day.nvim": { "branch": "main", "commit": "957499b8a493974bd7002b68b1f15f7d285e0dd1" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, - "gitsigns.nvim": { "branch": "main", "commit": "fb9fd5312476b51a42a98122616e1c448d823d5c" }, + "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, "go.nvim": { "branch": "master", "commit": "24d2fa373d55d9900cd4b502a88214dc17e6fab6" }, "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" }, @@ -68,7 +68,7 @@ "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" }, "neotest": { "branch": "master", "commit": "73043d666780e35185a77589e01bec96a52db910" }, "neotest-bash": { "branch": "main", "commit": "2eaad2ae4577fadf4af1eec32ec169d0fb2698bb" }, - "neotest-go": { "branch": "main", "commit": "d29d20d912aca81a07c50022d880cc66f0d26542" }, + "neotest-go": { "branch": "main", "commit": "22513619bcb156939c22ea7cd1a99f754fcb1fde" }, "neotest-jest": { "branch": "main", "commit": "a394106cf053eef86d65ae04c4b93a1a7bd60aef" }, "neotest-mocha": { "branch": "main", "commit": "68f0e9768a94c3ebd4d5e67b2765e6a5df017d99" }, "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, @@ -94,12 +94,12 @@ "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, "nvim-numbertoggle": { "branch": "main", "commit": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" }, "nvim-origami": { "branch": "main", "commit": "4ec426ce4b0aad0303af44909f86e075dd65c615" }, - "nvim-puppeteer": { "branch": "main", "commit": "048c819c8033e5febe0a04e63b98e74a5d0f8de6" }, + "nvim-puppeteer": { "branch": "main", "commit": "697518d8624da9e2aed5edcb113b1b8edfa729da" }, "nvim-recorder": { "branch": "main", "commit": "bf9efe10bff3ae8461568eee7f0d6c8750b01569" }, "nvim-regexplainer": { "branch": "main", "commit": "78fff711edcb986a05a03253c28a90e32c4ce31f" }, "nvim-scissors": { "branch": "main", "commit": "6f928de59253c270d7f6b58bb49c9322cebfcdbe" }, "nvim-spectre": { "branch": "master", "commit": "d958cc3ea8b3fb2f0922dff6177630a40751a3a9" }, - "nvim-treesitter": { "branch": "master", "commit": "e0edcbb1d27b679a0f48f2557db655855ba5434c" }, + "nvim-treesitter": { "branch": "master", "commit": "6f586875e35e2b02358efa467317634c766fd1d4" }, "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, @@ -120,7 +120,8 @@ "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "35530b4ad48f01bdaa852da34e4de9930fb54c89" }, + "py-requirements.nvim": { "branch": "main", "commit": "1cfdd53cf80398c577a66e717079b04990d6d206" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "8908741c5039fd337594448c0088459450277aef" }, "refactoring.nvim": { "branch": "master", "commit": "aff2e21e2f1a19d302adceb4e7d0fafbb3ae59a9" }, "rest.nvim": { "branch": "main", "commit": "2d7bd3d398940ce2692941e6cd052c072207b9f9" }, "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" }, @@ -142,7 +143,7 @@ "telescope-luasnip.nvim": { "branch": "master", "commit": "2ef7da3a363890686dbaad18ddbf59177cfe4f78" }, "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "1bfbb1fb5c56d2dbe33216fcb2ebe82e499aa06c" }, + "telescope.nvim": { "branch": "master", "commit": "2f3857c25bbd00ed7ac593c9d4071906369e4d20" }, "text-case.nvim": { "branch": "main", "commit": "6bc91cde614bbec6f0befbaf7fcd302415d803fb" }, "theme-loader.nvim": { "branch": "master", "commit": "ad8774ec8267a447d469b4e6603b43f49b946e53" }, "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, @@ -157,7 +158,7 @@ "venv-selector.nvim": { "branch": "main", "commit": "fcb30164f2c4f8a34a305ead3247954a1fd8634f" }, "vim-be-good": { "branch": "master", "commit": "c290810728a4f75e334b07dc0f3a4cdea908d351" }, "vim-carbon-now-sh": { "branch": "master", "commit": "31a18d26fc27e7bd5786da092ed886273b4cf639" }, - "vim-dadbod": { "branch": "master", "commit": "738cfc2ea6a1510fe23cba9006fef9291be70f7b" }, + "vim-dadbod": { "branch": "master", "commit": "9d3e3ce74a264642a41e8ae126be5afd095ef107" }, "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" }, "vim-dadbod-ui": { "branch": "master", "commit": "165699c573469e6a95b48d35052f848c340c5911" }, "vim-floaterm": { "branch": "master", "commit": "3f01a623376957437f9376327637491b74719e38" }, diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json index f017b13a..51be1f7b 100644 --- a/config/nvim/lazyvim.json +++ b/config/nvim/lazyvim.json @@ -41,6 +41,7 @@ "plugins.extras.editor.oil", "plugins.extras.editor.outline", "plugins.extras.editor.package-info", + "plugins.extras.editor.py-requirements", "plugins.extras.editor.regex", "plugins.extras.editor.rest-client", "plugins.extras.editor.search-replace", diff --git a/config/nvim/lua/plugins/extras/editor/py-requirements.lua b/config/nvim/lua/plugins/extras/editor/py-requirements.lua new file mode 100644 index 00000000..c1d1ef56 --- /dev/null +++ b/config/nvim/lua/plugins/extras/editor/py-requirements.lua @@ -0,0 +1,20 @@ +return { + "hrsh7th/nvim-cmp", + dependencies = { + "MeanderingProgrammer/py-requirements.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + }, + opts = function() + require("py-requirements").setup({}) + require("nvim-treesitter.configs").setup({ + ensure_installed = { + "requirements", + }, + }) + end, + }, + opts = function(_, opts) + table.insert(opts.sources, { name = "py-requirements" }) + end, +} diff --git a/config/nvim/lua/plugins/extras/lang/web/php.lua b/config/nvim/lua/plugins/extras/lang/web/php.lua index 84593983..2a9fea8f 100644 --- a/config/nvim/lua/plugins/extras/lang/web/php.lua +++ b/config/nvim/lua/plugins/extras/lang/web/php.lua @@ -4,6 +4,7 @@ return { opts = function(_, opts) vim.list_extend(opts.ensure_installed, { "php", + "phpdoc", }) end, }, @@ -12,6 +13,8 @@ return { opts = function(_, opts) vim.list_extend(opts.ensure_installed, { "phpactor", + "php-cs-fixer", + "phpcs", }) end, }, @@ -23,6 +26,14 @@ return { }, }, }, + { + "mfussenegger/nvim-lint", + opts = function(_, opts) + opts.linters_by_ft.php = opts.linters_by_ft.php or {} + table.insert(opts.linters_by_ft.php, "phpcs") + return opts + end, + }, { "mfussenegger/nvim-dap", optional = true, @@ -56,6 +67,14 @@ return { }, }, }, + { + "stevearc/conform.nvim", + opts = function(_, opts) + opts.formatters_by_ft.php = opts.formatters_by_ft.php or {} + table.insert(opts.formatters_by_ft.php, "php_cs_fixer") + return opts + end, + }, { "luckasRanarison/nvim-devdocs", optional = true,