From b054c3c93af2317f0d1f9850c131fde6292feb7e Mon Sep 17 00:00:00 2001 From: asep komarudin Date: Sat, 25 Feb 2023 00:17:26 +0700 Subject: [PATCH] update --- lazy-lock.json | 4 ++-- lua/core/init.lua | 3 ++- lua/custom/plugins/init.lua | 36 ++++++++++++++++++++++++++++++------ lua/user/lualine.lua | 2 +- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 6e7d34d..2249682 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -24,8 +24,9 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "93e58e100f37ef4fb0f897deeed20599dae9d128" }, "mason-null-ls.nvim": { "branch": "main", "commit": "29ce60f9a16fef3de682a9365ef635f24ae92bf9" }, "mason.nvim": { "branch": "main", "commit": "01dfdfd36be77cb1195b60d580315bf4e2d8e62c" }, + "material.nvim": { "branch": "main", "commit": "c5f6a24d526a8ddcd651c5d1291de89a51f923fa" }, "mini.animate": { "branch": "main", "commit": "b0c717ed5513b5f23e7c48615449c7dc9fabd05b" }, - "mini.indentscope": { "branch": "main", "commit": "d8938d056c5d4154fd7faef5cf0b0e86ea587a27" }, + "mini.indentscope": { "branch": "main", "commit": "ff1e68b5c01426f9dfff3278dd1b10c9b5f000a1" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, "null-ls.nvim": { "branch": "main", "commit": "689cdd78f70af20a37b5309ebc287ac645ae4f76" }, "nvim-autopairs": { "branch": "master", "commit": "4fc96c8f3df89b6d23e5092d31c866c53a346347" }, @@ -42,7 +43,6 @@ "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" }, "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, "nvim-web-devicons": { "branch": "master", "commit": "4709a504d2cd2680fb511675e64ef2790d491d36" }, - "onedark.nvim": { "branch": "master", "commit": "1fe908fb4acdcee26573e9ccde0de94ec77e5e84" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "smart-splits.nvim": { "branch": "master", "commit": "b38431f1f68bc43d6bf9d1edb21c2bcb06b1197c" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index 165799d..b9d0f1e 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -9,4 +9,5 @@ require("user.keymaps") -- require("user.bufferline") -- require("user.chat_gpt") -- vim.cmd("colorscheme onedark") -vim.cmd("colorscheme dracula") +-- vim.cmd("colorscheme dracula") +vim.cmd("colorscheme material") diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index caa17ae..5a95d6f 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -6,15 +6,39 @@ return { -- { "arcticicestudio/nord-vim" }, -- { "sainnhe/sonokai" }, -- { "RRethy/nvim-base16" }, + -- { + -- "navarasu/onedark.nvim", + -- priority = 1000, + -- config = function() + -- -- Lua + -- require("onedark").setup({ + -- style = "darker", + -- }) + -- require("onedark").load() + -- end, + -- }, { - "navarasu/onedark.nvim", - priority = 1000, + "marko-cerovac/material.nvim", config = function() - -- Lua - require("onedark").setup({ - style = "darker", + vim.g.material_style = "palenight" + require("material").setup({ + lualine_style = "stealth", }) - require("onedark").load() end, }, + -- { + -- "linrongbin16/lsp-progress.nvim", + -- branch = "main", + -- event = { "VimEnter" }, + -- config = function() + -- require("lsp-progress").setup({ + -- format = function(client_messages) + -- local sign = "" -- nf-fa-gear \uf013 + -- return #client_messages > 0 and (sign .. " " .. table.concat(client_messages, " ")) or sign + -- end, + -- }) + -- end, + -- -- }, + -- { "arkav/lualine-lsp-progress", event = "BufRead" }, + -- { "j-hui/fidget.nvim", enabled = false }, } diff --git a/lua/user/lualine.lua b/lua/user/lualine.lua index 3fe46ed..a6da13c 100644 --- a/lua/user/lualine.lua +++ b/lua/user/lualine.lua @@ -201,7 +201,7 @@ lualine.setup({ sections = { lualine_a = { branch }, lualine_b = { mode }, - lualine_c = { diagnostics, lsp_info }, + lualine_c = { diagnostics, lsp_info, "lsp_progress" }, -- lualine_c = { file_name, lsp_info }, -- lualine_x = { "encoding", "fileformat", "filetype" }, lualine_x = { diff, spaces, "encoding", filetype },