Updated a bunch of configs
This commit is contained in:
14
init.lua
14
init.lua
@@ -41,13 +41,15 @@ vim.keymap.set('t', '<Esc>', [[<C-\><C-n>]])
|
|||||||
-- Setup language servers.
|
-- Setup language servers.
|
||||||
vim.lsp.enable('pyright')
|
vim.lsp.enable('pyright')
|
||||||
vim.lsp.enable('tsserver')
|
vim.lsp.enable('tsserver')
|
||||||
vim.lsp.enable('rust_analyzer')
|
-- Not needed here anymore because this stuff is already done by the rustacean plugin
|
||||||
vim.lsp.config('rust_analyzer', {
|
--vim.lsp.enable('rust_analyzer')
|
||||||
|
--vim.lsp.config('rust_analyzer', {
|
||||||
-- Server-specific settings. See `:help lspconfig-setup`
|
-- Server-specific settings. See `:help lspconfig-setup`
|
||||||
settings = {
|
-- settings = {
|
||||||
['rust-analyzer'] = {},
|
-- ['rust-analyzer'] = {
|
||||||
},
|
-- },
|
||||||
})
|
-- },
|
||||||
|
--})
|
||||||
|
|
||||||
-- Setup Treesitter
|
-- Setup Treesitter
|
||||||
require'nvim-treesitter'.setup {
|
require'nvim-treesitter'.setup {
|
||||||
|
|||||||
@@ -4,15 +4,13 @@
|
|||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
|
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
|
||||||
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
|
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
|
||||||
"crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
|
"crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
|
||||||
"hererocks": { "branch": "master", "commit": "3856f1b4fb69a9f683f1eb146a4cd49a67478419" },
|
|
||||||
"image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" },
|
|
||||||
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
||||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
|
"neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
|
||||||
"nightfly": { "branch": "master", "commit": "42f6c21fbe90fcf96b9139f3b970cc6415b73382" },
|
"nightfly": { "branch": "master", "commit": "3b48dc0c5921f899aeb1e6e61b77b9345888a2f7" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "85bbfad83f804f11688d1ab9486b459e699292d6" },
|
"nvim-cmp": { "branch": "main", "commit": "85bbfad83f804f11688d1ab9486b459e699292d6" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "92ee7d42320edfbb81f3cad851314ab197fa324a" },
|
"nvim-lspconfig": { "branch": "master", "commit": "92ee7d42320edfbb81f3cad851314ab197fa324a" },
|
||||||
"nvim-treesitter": { "branch": "main", "commit": "8aada0e3940c573e38b417a226b43bc8675f8958" },
|
"nvim-treesitter": { "branch": "main", "commit": "e75c007f2747050c2c620dc862c77b8f242551a8" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
|
"nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||||
"rustaceanvim": { "branch": "master", "commit": "88575b98bb9937fb9983ddec5e532b67e75ce677" },
|
"rustaceanvim": { "branch": "master", "commit": "88575b98bb9937fb9983ddec5e532b67e75ce677" },
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
return {{
|
return {{
|
||||||
"Saecki/crates.nvim",
|
"Saecki/crates.nvim",
|
||||||
event = { "BufRead Cargo.toml" },
|
--event = { "BufRead Cargo.toml" },
|
||||||
opts = {
|
--opts = {
|
||||||
src = {
|
-- src = {
|
||||||
cmp = { enabled = true },
|
-- cmp = { enabled = true },
|
||||||
},
|
-- },
|
||||||
},
|
--},
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ return {{
|
|||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
|
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
|
||||||
"MunifTanjim/nui.nvim",
|
"MunifTanjim/nui.nvim",
|
||||||
"3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
|
-- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
|
||||||
},
|
},
|
||||||
lazy = false
|
lazy = false
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -12,8 +12,10 @@ return {{
|
|||||||
"Saecki/crates.nvim",
|
"Saecki/crates.nvim",
|
||||||
event = { "BufRead Cargo.toml" },
|
event = { "BufRead Cargo.toml" },
|
||||||
opts = {
|
opts = {
|
||||||
src = {
|
completion = {
|
||||||
cmp = { enabled = true },
|
cmp = {
|
||||||
|
enabled = true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -4,7 +4,9 @@ return {{
|
|||||||
ft = { "rs" },
|
ft = { "rs" },
|
||||||
lazy = false,
|
lazy = false,
|
||||||
opts = {
|
opts = {
|
||||||
|
tools = {},
|
||||||
server = {
|
server = {
|
||||||
|
status_notify_level = false,
|
||||||
on_attach = function(_, bufnr)
|
on_attach = function(_, bufnr)
|
||||||
vim.keymap.set("n", "<leader>cR", function()
|
vim.keymap.set("n", "<leader>cR", function()
|
||||||
vim.cmd.RustLsp("codeAction")
|
vim.cmd.RustLsp("codeAction")
|
||||||
@@ -21,12 +23,14 @@ return {{
|
|||||||
loadOutDirsFromCheck = true,
|
loadOutDirsFromCheck = true,
|
||||||
runBuildScripts = true,
|
runBuildScripts = true,
|
||||||
},
|
},
|
||||||
-- Add clippy lints for Rust.
|
-- They changed the configuration, so it's only checkOnSave with a boolean
|
||||||
checkOnSave = {
|
-- # TODO: Figure out how we can enable clippy lints again
|
||||||
allFeatures = true,
|
--checkOnSave = {
|
||||||
command = "clippy",
|
-- allFeatures = true,
|
||||||
extraArgs = { "--no-deps" },
|
-- command = "clippy",
|
||||||
},
|
-- extraArgs = { "--no-deps" },
|
||||||
|
--},
|
||||||
|
checkOnSave = true,
|
||||||
procMacro = {
|
procMacro = {
|
||||||
enable = true,
|
enable = true,
|
||||||
ignored = {
|
ignored = {
|
||||||
|
|||||||
Reference in New Issue
Block a user