change plugins

This commit is contained in:
gameloader 2023-07-12 16:20:13 +08:00
parent 625acf4080
commit 62ed453c7b
10 changed files with 122 additions and 100 deletions

View File

@ -17,9 +17,9 @@ require("plugin-config/nvim-autopairs")
require("plugin-config/lua_snip") require("plugin-config/lua_snip")
require("plugin-config/table-mode") require("plugin-config/table-mode")
require("plugin-config/mkdnflow") require("plugin-config/mkdnflow")
require("plugin-config/orgmode")
require("plugin-config/project") require("plugin-config/project")
-- require("plugin-config/dashboard") -- require("plugin-config/alpha")
require("plugin-config/dashboard")
require("plugin-config/hop") require("plugin-config/hop")
require("plugin-config/neotree") require("plugin-config/neotree")
require("plugin-config/live_command") require("plugin-config/live_command")
@ -30,6 +30,7 @@ require("plugin-config/lazygit")
require("autocmd") require("autocmd")
require("lsp") require("lsp")
require("lsp.flutter")
require("lsp.cmp") require("lsp.cmp")
-- require("lsp.coc") -- require("lsp.coc")
require("lsp.null-ls") require("lsp.null-ls")

View File

@ -17,10 +17,11 @@ end
function set_colorscheme() function set_colorscheme()
local colorschemes = vim.fn.getcompletion("", "color") local colorschemes = vim.fn.getcompletion("", "color")
local desired_colorscheme = "everforest" local desired_colorscheme = "material"
if vim.tbl_contains(colorschemes, desired_colorscheme) then if vim.tbl_contains(colorschemes, desired_colorscheme) then
vim.cmd("colorscheme " .. desired_colorscheme) vim.cmd("colorscheme " .. desired_colorscheme)
vim.g.material_style = "lighter"
else else
vim.cmd("colorscheme default") vim.cmd("colorscheme default")
end end

View File

@ -72,6 +72,12 @@ M.load_default_options = function()
for k, v in pairs(let_options) do for k, v in pairs(let_options) do
vim.g[k] = v vim.g[k] = v
end end
local colorschemes = vim.fn.getcompletion("", "color")
local desired_colorscheme = "material"
if vim.tbl_contains(colorschemes, desired_colorscheme) then
vim.g.material_style = "lighter"
end
end end
return M return M

View File

@ -0,0 +1 @@
return require("lsp.config.basic_config")

View File

@ -5,7 +5,11 @@ return {
pylsp = { pylsp = {
plugins = { plugins = {
pycodestyle = { pycodestyle = {
ignore = { "E501" }, ignore = { "E501", "E265" },
},
jedi_completion = {
enabled = true,
fuzzy = true,
}, },
}, },
}, },

1
lua/lsp/flutter.lua Normal file
View File

@ -0,0 +1 @@
require("flutter-tools").setup({}) -- use defaults

View File

@ -14,9 +14,9 @@ local servers = {
omnisharp = require("lsp.config.csharp"), omnisharp = require("lsp.config.csharp"),
-- bashls = require("lsp.config.bash"), -- bashls = require("lsp.config.bash"),
pyright = require("lsp.config.pyright"), pyright = require("lsp.config.pyright"),
-- pylsp = require("lsp.config.pylsp"), marksman = require("lsp.config.marksman"),
pylsp = require("lsp.config.pylsp"),
volar = require("lsp.config.vue"), volar = require("lsp.config.vue"),
-- jedi_language_server = require("lsp.config.jedi"),
-- html = require("lsp.config.html"), -- html = require("lsp.config.html"),
-- cssls = require("lsp.config.css"), -- cssls = require("lsp.config.css"),
-- emmet_ls = require("lsp.config.emmet"), -- emmet_ls = require("lsp.config.emmet"),

View File

@ -1,81 +1,89 @@
-- local db = require("dashboard") local db = require("dashboard")
-- db.custom_header = { local function foot()
-- "", -- local total_plugins = #vim.tbl_keys(packer_plugins)
-- "┳┻| ", local function get_table_size(t)
-- "┻┳| ", local count = 0
-- "┳┻|ヘ ∧ ", for _, __ in pairs(t) do
-- "┻┳| ● w ● )", count = count + 1
-- "┳┻|⊂ノ ", end
-- "┻┳| ", return count
-- "", end
-- }
require("dashboard").setup{
custom_header = {
"",
"┳┻| ",
"┻┳| ",
"┳┻|ヘ ∧ ",
"┻┳| ● w ● )",
"┳┻|⊂ノ ",
"┻┳| ",
"",
},
custom_section = {
a = {
description = { " Find File " },
command = "Telescope find_files find_command=rg,--hidden,--files",
},
b = {
description = { " Recently Used Files" },
command = "Telescope oldfiles",
},
c = {
description = { " Find Word " },
command = "Telescope live_grep",
},
d = {
description = { "洛 New File " },
command = "DashboardNewFile",
},
e = {
description = { " Bookmarks " },
command = "Telescope marks",
},
f = {
description = { " Load Last Session " },
command = "SessionLoad",
},
},
custom_footer = {
"Neovim",
},
}
local opt, start = require("packer.plugin_utils").list_installed_plugins()
local plugin_count = get_table_size(opt) + get_table_size(start)
local datetime = os.date(" %d-%m-%Y  %H:%M:%S")
local version = vim.version()
local nvim_version_info = "  v" .. version.major .. "." .. version.minor .. "." .. version.patch
return datetime .. "" .. plugin_count .. " plugins" .. nvim_version_info
end
-- db.custom_center = { db.setup({
-- { theme = "doom",
-- icon = " ", config = {
-- desc = "Find File ", header = {
-- action = "Telescope find_files find_command=rg,--hidden,--files", " :*+++++********++=-:. ",
-- shortcut = "SPC f f", " #- =+*+",
-- }, " .% %",
-- { " ++ .#",
-- icon = " ", " -# #.",
-- desc = "Recently opened files ", " *= :# ",
-- action = "Telescope oldfiles", " .%. *- ",
-- shortcut = "SPC f r", " +* .% ",
-- }, " %- == ",
-- { " -@++++++++++======----::#. ",
-- icon = " ", " *- .....::::--** ",
-- desc = "Open Project ", " .% %= ",
-- action = "Telescope Project ", " ++ =%: ",
-- shortcut = "SPC f p", " .+++**+++%%##########%%%%%%%%%%%%%***-",
-- }, " .+ .* -+ ..:=+*%%%%%. ",
-- { " +: :+ *: :+%* ",
-- icon = " ", " % *. .+- *: ",
-- desc = "File Browser ", " =+ %==-::-===. .-=+* ",
-- action = "Telescope file_browser", " :%= #. .. .:--=+-:+:+ ",
-- shortcut = "SPC f b", " +%%%= +*---+----:* = :+: ",
-- }, "=%%%%%%= .==-*. .*:---=:. .... ",
-- } " ",
},
center = {
{
icon = "",
icon_hl = "Title",
desc = "Find File ",
desc_hl = "String",
key = "b",
keymap = "SPC f f",
key_hl = "Number",
action = "Telescope find_files find_command=rg,--hidden,--files",
},
{
icon = "",
desc = "Recently opened files ",
desc_hl = "String",
key = "a",
keymap = "SPC f r",
key_hl = "Number",
action = "Telescope oldfiles",
},
{
icon = "",
desc = "Open Project ",
desc_hl = "String",
key = "c",
keymap = "SPC f p",
key_hl = "Number",
action = "Telescope Project ",
},
{
icon = "",
desc = "File Browser ",
desc_hl = "String",
key = "d",
keymap = "SPC f b",
key_hl = "Number",
action = "Telescope file_browser",
},
},
footer = { foot() }, --your footer
},
})

View File

@ -33,6 +33,7 @@ require("lualine").setup({
tabline = 1000, tabline = 1000,
winbar = 1000, winbar = 1000,
}, },
theme = "material-nvim",
}, },
sections = { sections = {
lualine_a = { "mode" }, lualine_a = { "mode" },

View File

@ -13,6 +13,8 @@ return require("packer").startup(function()
use("folke/tokyonight.nvim") use("folke/tokyonight.nvim")
use("sainnhe/everforest") use("sainnhe/everforest")
use("marko-cerovac/material.nvim")
----------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------
-- a good terminal -- a good terminal
@ -40,7 +42,7 @@ return require("packer").startup(function()
-- orgmode support -- orgmode support
-- orgmode 支持 -- orgmode 支持
use({ "nvim-orgmode/orgmode" }) -- use({ "nvim-orgmode/orgmode" })
-- nvim-tree for file manage -- nvim-tree for file manage
-- use({ -- use({
@ -60,16 +62,10 @@ return require("packer").startup(function()
-- vim dashboard -- vim dashboard
-- vim 开始界面 -- vim 开始界面
-- use({ use({
-- "glepnir/dashboard-nvim", "glepnir/dashboard-nvim",
-- event = "VimEnter", requires = { "nvim-tree/nvim-web-devicons" },
-- -- config = function() })
-- -- require("dashboard").setup({
-- -- -- config
-- -- })
-- -- end,
-- requires = { "nvim-tree/nvim-web-devicons" },
-- })
-- smooth neovim scroll -- smooth neovim scroll
-- 顺滑的neovim滚动 -- 顺滑的neovim滚动
@ -79,9 +75,6 @@ return require("packer").startup(function()
-- 顶部状态栏 -- 顶部状态栏
use({ "akinsho/bufferline.nvim", tag = "v3.*", requires = "nvim-tree/nvim-web-devicons" }) use({ "akinsho/bufferline.nvim", tag = "v3.*", requires = "nvim-tree/nvim-web-devicons" })
-- 更方便的切换buffer
-- use({ "matbme/JABS.nvim" })
-- treesitter -- treesitter
use({ use({
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
@ -167,14 +160,20 @@ return require("packer").startup(function()
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
}) })
-- coc-nvim complete
-- use({ "neoclide/coc.nvim", branch = "release" })
-- null-ls for formatter and others -- null-ls for formatter and others
-- null-ls 用于格式化和其他 -- null-ls 用于格式化和其他
use({ use({
"jose-elias-alvarez/null-ls.nvim", "jose-elias-alvarez/null-ls.nvim",
}) })
-- flutter support
use({
"akinsho/flutter-tools.nvim",
requires = {
"nvim-lua/plenary.nvim",
"stevearc/dressing.nvim", -- optional for vim.ui.select
},
})
-- -- 补全引擎 -- -- 补全引擎
use("hrsh7th/nvim-cmp") use("hrsh7th/nvim-cmp")
-- Snippet 引擎 -- Snippet 引擎