This commit is contained in:
dedal.qq 2024-11-19 00:30:27 +03:00
parent 4bc4118cb8
commit 6a2c2ddc61
13 changed files with 165 additions and 156 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
lazy-lock.json

View File

@ -1,4 +1,3 @@
require("config.lazy")
require("config.options")
require("config.keymaping")

View File

@ -1,8 +1,11 @@
local map = vim.keymap.set
-- neo-tree
map("n", "<leader>e", ":Neotree<CR>", { desc = "nvimtree focus window" })
-- telescope
map("n", "<leader>ff", "<cmd>Telescope live_grep<CR>", { desc = "telescope live grep" })
map("n", "<leader>gr", "<cmd>Telescope lsp_references<CR>", { desc = "telescope lsp references" })
map("n", "<leader>ff", ":Telescope live_grep<CR>", { desc = "telescope live grep" })
map("n", "<leader>gr", ":Telescope lsp_references<cr>", { desc = "telescope lsp references" })
map("n", "<tab>", ":BufferNext<CR>", { desc = "Next tab" })
map("n", "<S-tab>", ":BufferPrevious<CR>", { desc = "Previous tab" })

View File

@ -4,6 +4,8 @@ local g = vim.g
g.mapleader = " "
opt.tabstop = 4
o.laststatus = 3
o.showmode = false

View File

@ -12,6 +12,11 @@ return {
opts = {
-- lazy.nvim will automatically call setup for you. put your options here, anything missing will use the default:
animation = true,
gitsigns = {
added = { enabled = true, icon = "+" },
changed = { enabled = true, icon = "~" },
deleted = { enabled = true, icon = "-" },
},
insert_at_start = true,
auto_hide = true,
sidebar_filetypes = {

View File

@ -1,3 +1,5 @@
local api = vim.api
return {
"stevearc/conform.nvim",
--opts = {},
@ -8,7 +10,7 @@ return {
},
})
vim.api.nvim_create_autocmd("BufWritePre", {
api.nvim_create_autocmd("BufWritePre", {
pattern = "*",
callback = function(args)
require("conform").format({ bufnr = args.buf })

View File

@ -1,16 +1,17 @@
return {
-- Main LSP Configuration
'neovim/nvim-lspconfig',
"neovim/nvim-lspconfig",
dependencies = {
-- Automatically install LSPs and related tools to stdpath for Neovim
{
'williamboman/mason.nvim', config = true,
"williamboman/mason.nvim",
config = true,
}, -- NOTE: Must be loaded before dependants
'williamboman/mason-lspconfig.nvim',
"williamboman/mason-lspconfig.nvim",
--'WhoIsSethDaniel/mason-tool-installer.nvim',
--{ 'j-hui/fidget.nvim', opts = {} },
'hrsh7th/cmp-nvim-lsp',
"hrsh7th/cmp-nvim-lsp",
},
config = function()
@ -21,7 +22,7 @@ return {
gopls = {},
}
require('mason').setup()
require("mason").setup()
--local ensure_installed = vim.tbl_keys(servers or {})
--vim.list_extend(ensure_installed, {
@ -30,21 +31,17 @@ return {
--require('mason-tool-installer').setup { ensure_installed = ensure_installed }
require('mason-lspconfig').setup {
require("mason-lspconfig").setup({
handlers = {
function(server_name)
local capabilities = require('cmp_nvim_lsp').default_capabilities()
local capabilities = require("cmp_nvim_lsp").default_capabilities()
local server = servers[server_name] or {}
server.capabilities = capabilities
-- server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
require('lspconfig')[server_name].setup(server)
require("lspconfig")[server_name].setup(server)
end,
},
}
})
end,
}

View File

@ -1,7 +1,7 @@
return {
'nvim-lualine/lualine.nvim',
dependencies = { 'nvim-tree/nvim-web-devicons' },
"nvim-lualine/lualine.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" },
config = function()
require('lualine').setup()
end
require("lualine").setup()
end,
}

View File

@ -6,5 +6,5 @@ return {
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
"MunifTanjim/nui.nvim",
-- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
}
},
}

View File

@ -39,7 +39,7 @@ return {
-- },
},
config = function()
local cmp = require('cmp')
local cmp = require("cmp")
-- snippet = {
-- REQUIRED - you must specify a snippet engine
-- expand = function(args)
@ -57,14 +57,14 @@ return {
documentation = cmp.config.window.bordered(),
},
mapping = cmp.mapping.preset.insert({
['<C-Space>'] = cmp.mapping.complete(),
['<CR>'] = cmp.mapping.confirm({ select = true }),
["<C-Space>"] = cmp.mapping.complete(),
["<CR>"] = cmp.mapping.confirm({ select = true }),
}),
sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = "nvim_lsp" },
}),
})
end
end,
--opts = function()
-- return require "nvchad.configs.cmp"
--end,

View File

@ -1,6 +1,6 @@
return {
"navarasu/onedark.nvim",
config = function()
require('onedark').load()
require("onedark").load()
end,
}