Refactor neovim config
This commit is contained in:
parent
ac9dd894cc
commit
caa5457b68
|
@ -20,11 +20,10 @@
|
||||||
"nvim-dap": { "branch": "master", "commit": "d17d1bba23ec72a157bd183c57840c39e323f515" },
|
"nvim-dap": { "branch": "master", "commit": "d17d1bba23ec72a157bd183c57840c39e323f515" },
|
||||||
"nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
|
"nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "dd11ba7b3c8f82d51b6d4dd7d68fce2d78bf78a0" },
|
"nvim-lspconfig": { "branch": "master", "commit": "dd11ba7b3c8f82d51b6d4dd7d68fce2d78bf78a0" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "a8ac8419c420f3564e5212ecbeba3283cfa9e78e" },
|
"nvim-treesitter": { "branch": "master", "commit": "7b04e8b67eec7d92daadf9f0717dd272ddfc81a3" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" },
|
"nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
|
"plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
|
||||||
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
|
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
|
||||||
"rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
|
"rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
|
||||||
"telescope.nvim": { "branch": "0.1.x", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
|
"telescope.nvim": { "branch": "0.1.x", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }
|
||||||
"typst.vim": { "branch": "main", "commit": "6a99324a138c2da69589a8ab2e49375774e43d77" }
|
|
||||||
}
|
}
|
|
@ -22,6 +22,17 @@ return {
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- File tree
|
||||||
|
{
|
||||||
|
"nvim-neo-tree/neo-tree.nvim",
|
||||||
|
branch = "v3.x",
|
||||||
|
dependencies = {
|
||||||
|
"nvim-lua/plenary.nvim",
|
||||||
|
"nvim-tree/nvim-web-devicons",
|
||||||
|
"MunifTanjim/nui.nvim",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
-- Telescope
|
-- Telescope
|
||||||
{
|
{
|
||||||
"nvim-telescope/telescope.nvim",
|
"nvim-telescope/telescope.nvim",
|
||||||
|
@ -38,6 +49,24 @@ return {
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- Git diffviewer
|
||||||
|
{
|
||||||
|
"sindrets/diffview.nvim",
|
||||||
|
dependencies = {
|
||||||
|
"nvim-lua/plenary.nvim",
|
||||||
|
"nvim-tree/nvim-web-devicons",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
-- Git signs
|
||||||
|
{
|
||||||
|
"lewis6991/gitsigns.nvim",
|
||||||
|
config = function()
|
||||||
|
local gitsigns = require("gitsigns")
|
||||||
|
gitsigns.setup()
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
-- Discord presence
|
-- Discord presence
|
||||||
{
|
{
|
||||||
"andweeb/presence.nvim",
|
"andweeb/presence.nvim",
|
||||||
|
@ -103,149 +132,131 @@ return {
|
||||||
|
|
||||||
-- Snippet engine
|
-- Snippet engine
|
||||||
{
|
{
|
||||||
"saadparwaiz1/cmp_luasnip",
|
"L3MON4D3/LuaSnip",
|
||||||
dependencies = {
|
version = "2.*",
|
||||||
"L3MON4D3/LuaSnip",
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
-- Completion
|
-- Completion
|
||||||
{
|
{
|
||||||
"hrsh7th/nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
config = require "configs/cmp",
|
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"hrsh7th/cmp-cmdline",
|
"hrsh7th/cmp-cmdline",
|
||||||
"hrsh7th/cmp-buffer",
|
"hrsh7th/cmp-buffer",
|
||||||
"hrsh7th/cmp-path",
|
"hrsh7th/cmp-path",
|
||||||
|
"hrsh7th/cmp-nvim-lsp",
|
||||||
"saadparwaiz1/cmp_luasnip",
|
"saadparwaiz1/cmp_luasnip",
|
||||||
},
|
},
|
||||||
|
config = require("configs/cmp"),
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"hrsh7th/cmp-nvim-lsp",
|
-- Debugger adapter support
|
||||||
},
|
|
||||||
-- DAP
|
|
||||||
{
|
{
|
||||||
"mfussenegger/nvim-dap",
|
"mfussenegger/nvim-dap",
|
||||||
config = function()
|
config = function()
|
||||||
local dap = require "dap"
|
local dap = require("dap")
|
||||||
vim.keymap.set('n', "<leader>b", dap.toggle_breakpoint)
|
vim.keymap.set('n', "<leader>b", dap.toggle_breakpoint)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- Debugger UI
|
||||||
{
|
{
|
||||||
"rcarriga/nvim-dap-ui",
|
"rcarriga/nvim-dap-ui",
|
||||||
config = require "configs/debugging",
|
config = require("configs/debugging"),
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"mfussenegger/nvim-dap",
|
"mfussenegger/nvim-dap",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
-- Mason
|
-- Mason
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"williamboman/mason.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("mason").setup()
|
local mason = require("mason")
|
||||||
|
mason.setup()
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- Automatic language server install
|
||||||
{
|
{
|
||||||
"williamboman/mason-lspconfig.nvim",
|
"williamboman/mason-lspconfig.nvim",
|
||||||
|
dependencies = {
|
||||||
|
"williamboman/mason.nvim",
|
||||||
|
"neovim/nvim-lspconfig",
|
||||||
|
},
|
||||||
config = function()
|
config = function()
|
||||||
local mason = require "mason-lspconfig"
|
local config = require("mason-lspconfig")
|
||||||
mason.setup({
|
config.setup({
|
||||||
automatic_installation = true,
|
automatic_installation = true,
|
||||||
|
-- NOTE
|
||||||
|
-- Haskell: Use GHCup installation instead of hls
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
"lua_ls", -- Lua
|
"lua_ls", -- Lua
|
||||||
"rust_analyzer", -- Rust
|
"rust_analyzer", -- Rust
|
||||||
-- "hls", -- use GHCup instead
|
|
||||||
"html", -- HTML
|
"html", -- HTML
|
||||||
"cssls", -- CSS / SCSS
|
"cssls", -- CSS / SCSS
|
||||||
"tsserver", -- TypeScript
|
"tsserver", -- TypeScript
|
||||||
"astro", -- Astro
|
"astro", -- Astro
|
||||||
"svelte", -- Svelte
|
"svelte", -- Svelte
|
||||||
"pyright", -- Python
|
"pyright", -- Python
|
||||||
"typst_lsp", -- Typst
|
|
||||||
"rnix", -- Nix
|
"rnix", -- Nix
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
local lsp = require "lspconfig"
|
local lspconfig = require("lspconfig")
|
||||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||||
mason.setup_handlers({
|
config.setup_handlers({
|
||||||
function(server)
|
function(server)
|
||||||
lsp[server].setup({
|
lspconfig[server].setup({
|
||||||
single_file_support = true,
|
single_file_support = true,
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
["lua_ls"] = function()
|
["lua_ls"] = function()
|
||||||
lsp.lua_ls.setup({
|
lspconfig.lua_ls.setup({
|
||||||
single_file_support = true,
|
single_file_support = true,
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
settings = {
|
settings = { Lua = { diagnostics = { globals = { "vim" } } } },
|
||||||
Lua = { diagnostics = { globals = { "vim" } } }
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
dependencies = {
|
|
||||||
"williamboman/mason.nvim",
|
|
||||||
"neovim/nvim-lspconfig",
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- Automatic debugger install
|
||||||
{
|
{
|
||||||
"jay-babu/mason-nvim-dap.nvim",
|
"jay-babu/mason-nvim-dap.nvim",
|
||||||
|
dependencies = {
|
||||||
|
"mfussenegger/nvim-dap",
|
||||||
|
"williamboman/mason.nvim",
|
||||||
|
},
|
||||||
config = function()
|
config = function()
|
||||||
require("mason-nvim-dap").setup({
|
local config = require("mason-nvim-dap")
|
||||||
|
config.setup({
|
||||||
automatic_installation = true,
|
automatic_installation = true,
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
"codelldb", -- Rust
|
"codelldb", -- Rust
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
dependencies = {
|
|
||||||
"mfussenegger/nvim-dap",
|
|
||||||
"williamboman/mason.nvim",
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
-- Rust tools
|
|
||||||
|
-- Tools for Rust
|
||||||
{
|
{
|
||||||
"simrat39/rust-tools.nvim",
|
"simrat39/rust-tools.nvim",
|
||||||
config = require "configs/rust-tools",
|
ft = "rust",
|
||||||
|
config = require("configs/rust-tools"),
|
||||||
},
|
},
|
||||||
-- Haskell tools
|
|
||||||
|
-- Tools for Haskell
|
||||||
{
|
{
|
||||||
"mrcjkb/haskell-tools.nvim",
|
"mrcjkb/haskell-tools.nvim",
|
||||||
|
branch = "1.x.x",
|
||||||
|
ft = "haskell",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
"nvim-telescope/telescope.nvim",
|
"nvim-telescope/telescope.nvim",
|
||||||
},
|
},
|
||||||
branch = "1.x.x",
|
|
||||||
},
|
|
||||||
-- Typst
|
|
||||||
{
|
|
||||||
"kaarmu/typst.vim",
|
|
||||||
ft = "typst",
|
|
||||||
},
|
|
||||||
-- File tree
|
|
||||||
{
|
|
||||||
"nvim-neo-tree/neo-tree.nvim",
|
|
||||||
branch = "v3.x",
|
|
||||||
dependencies = {
|
|
||||||
"nvim-lua/plenary.nvim",
|
|
||||||
"nvim-tree/nvim-web-devicons",
|
|
||||||
"MunifTanjim/nui.nvim",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- Git
|
|
||||||
{
|
|
||||||
"sindrets/diffview.nvim",
|
|
||||||
dependencies = {
|
|
||||||
"nvim-lua/plenary.nvim",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"lewis6991/gitsigns.nvim",
|
|
||||||
config = function()
|
|
||||||
require("gitsigns").setup()
|
|
||||||
end,
|
|
||||||
},
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue