diff --git a/lua/basic.lua b/lua/basic.lua index 9a131bd..74c20ca 100644 --- a/lua/basic.lua +++ b/lua/basic.lua @@ -10,8 +10,8 @@ M.load_default_options = function() fileencoding = "utf-8", -- the encoding written to a file foldmethod = "manual", -- folding, set to "expr" for treesitter based folding foldexpr = "", -- set to "nvim_treesitter#foldexpr()" for treesitter based folding - guifont = "Menlo:h17", -- the font used in graphical neovim applications - background = "dark", -- set the background to light or dark + guifont = "Menlo:h20", -- the font used in graphical neovim applications + background = "light", -- set the background to light or dark hidden = true, -- required to keep multiple buffers and open multiple buffers hlsearch = true, -- highlight all matches on previous search pattern ignorecase = true, -- ignore case in search patterns @@ -64,6 +64,8 @@ M.load_default_options = function() for k, v in pairs(let_options) do vim.g[k] = v end + + vim.cmd("colorscheme melange") end return M diff --git a/lua/keybindings.lua b/lua/keybindings.lua index 2bfd76d..f693f2c 100644 --- a/lua/keybindings.lua +++ b/lua/keybindings.lua @@ -121,6 +121,7 @@ wk.register({ name = "+Lsp", i = { ":LspInstall", "Install lsp" }, I = { ":MasonInstall ", "Install any" }, + r = { ":LspRestart", "Lsp restart" }, l = { ":Mason", "Mason info" }, u = { ":MasonUninstall", "Uninstall lsp" }, U = { ":MasonUninstallAll", "Unistall all" }, diff --git a/lua/plugin-config/lua_line.lua b/lua/plugin-config/lua_line.lua index b1960d4..ab267c6 100644 --- a/lua/plugin-config/lua_line.lua +++ b/lua/plugin-config/lua_line.lua @@ -20,7 +20,7 @@ require("lualine").setup({ sections = { lualine_a = { "mode" }, lualine_b = { "branch", "diff", "diagnostics" }, - lualine_c = { "filename" }, + lualine_c = { "require'lsp-status'.status()" }, lualine_x = { "encoding", "fileformat", "filetype" }, lualine_y = { "progress" }, lualine_z = { "location" }, diff --git a/lua/plugins.lua b/lua/plugins.lua index 5dc4415..84e6ca9 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -17,12 +17,10 @@ return require("packer").startup(function() use({ "navarasu/onedark.nvim", - config = function() - require("onedark").setup({ style = "darker" }) - require("onedark").load() - end, }) + use("savq/melange") + -- a good terminal -- 一个好的nvim内终端 use({ "akinsho/toggleterm.nvim", tag = "*" }) @@ -172,11 +170,8 @@ return require("packer").startup(function() "jose-elias-alvarez/null-ls.nvim", }) - -- nlsp-settings - -- 方便的lsp配置插件 - -- use { - -- "tamago324/nlsp-settings.nvim" - -- } + -- lsp-status + use("nvim-lua/lsp-status.nvim") -- 补全引擎 use("hrsh7th/nvim-cmp")