From afd4c1e2c41da5411253377f34ce66f0887fae02 Mon Sep 17 00:00:00 2001 From: Woccz Date: Thu, 15 Feb 2024 23:35:33 +1300 Subject: [PATCH] update colour theme --- init.lua | 28 +++++++++++++++---- lazy-lock.json | 2 ++ .../{todo-comments.lua => plugins.lua} | 3 ++ lua/custom/plugins/vim-visual-multi.lua | 3 -- 4 files changed, 27 insertions(+), 9 deletions(-) rename lua/custom/plugins/{todo-comments.lua => plugins.lua} (92%) delete mode 100644 lua/custom/plugins/vim-visual-multi.lua diff --git a/init.lua b/init.lua index 68e0a100..6354e4cb 100644 --- a/init.lua +++ b/init.lua @@ -201,16 +201,32 @@ require('lazy').setup({ }, { - -- Theme inspired by Atom - 'navarasu/onedark.nvim', + 'loctvl842/monokai-pro.nvim', priority = 1000, lazy = false, config = function() - require('onedark').setup { - -- Set a style preset. 'dark' is default. - style = 'dark', -- dark, darker, cool, deep, warm, warmer, light + require('monokai-pro').setup { + overridePalette = function(filter) + return { + dark2 = "#101014", + dark1 = "#16161E", + background = "#36393F", + text = "#f8f8f0", + accent1 = "#ff3f4f", + accent2 = "#ffb65e", + accent3 = "#FFE26E", + accent4 = "#5fff5f", + accent5 = "#19d1e5", + accent6 = "#7ca4ee", + dimmed1 = "#bab6c0", + dimmed2 = "#f8f8f0", + dimmed3 = "#5c6370", + dimmed4 = "#4c525c", + dimmed5 = "#1e1e2b", + } + end, } - require('onedark').load() + require('monokai-pro').load() end, }, diff --git a/lazy-lock.json b/lazy-lock.json index 2f369883..c51adc22 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -12,6 +12,7 @@ "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, + "monokai-pro.nvim": { "branch": "master", "commit": "1b9b086df95ad9a6b946c56f65fa2d048297c00b" }, "neodev.nvim": { "branch": "main", "commit": "a09881379ac7abddb8091c5edd292805a53ccf18" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-lspconfig": { "branch": "master", "commit": "41f40dc4b86f3e166cf08115f621001972565a20" }, @@ -25,5 +26,6 @@ "vim-fugitive": { "branch": "master", "commit": "9f92ff14d9d1169e08f197a2250fcaea88e9c767" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, + "vim-visual-multi": { "branch": "master", "commit": "e67f7fa011c98fc5426352d3bb06362a0f70af3c" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/custom/plugins/todo-comments.lua b/lua/custom/plugins/plugins.lua similarity index 92% rename from lua/custom/plugins/todo-comments.lua rename to lua/custom/plugins/plugins.lua index 55729c66..67764395 100644 --- a/lua/custom/plugins/todo-comments.lua +++ b/lua/custom/plugins/plugins.lua @@ -11,5 +11,8 @@ return { -- or leave it empty to use the default settings -- refer to the configuration section below } + }, + { + "mg979/vim-visual-multi", } } diff --git a/lua/custom/plugins/vim-visual-multi.lua b/lua/custom/plugins/vim-visual-multi.lua deleted file mode 100644 index 174aa595..00000000 --- a/lua/custom/plugins/vim-visual-multi.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "mg979/vim-visual-multi" -} \ No newline at end of file