From d05a1cc9506e6e11caea318a8815a1c2e26f427c Mon Sep 17 00:00:00 2001 From: Cheick Diarra Date: Wed, 8 May 2024 15:35:52 +0200 Subject: [PATCH] replace github with modus --- lazy-lock.json | 2 +- lua/plugins/color-scheme.lua | 83 ++++++++++++++++++------------------ 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index f766710..0faa41f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,7 +13,6 @@ "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" }, "flit.nvim": { "branch": "main", "commit": "56490317983218b09698f8c960c3669958b12b32" }, "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" }, - "github-nvim-theme": { "branch": "main", "commit": "66dcec1bd3d12f8b0bf3c885069888551a650049" }, "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, @@ -27,6 +26,7 @@ "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, "mini.pairs": { "branch": "main", "commit": "5c975d8f68dc1e11bf4b20ced71e7987ed782513" }, "mini.surround": { "branch": "main", "commit": "0f528eb2e1bab420c0569d9e52615144c51db920" }, + "modus-themes.nvim": { "branch": "master", "commit": "705ea8debb9d9afe4e631166fcc6121782dd0b32" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, "neoconf.nvim": { "branch": "main", "commit": "d4a48c2a6fdeec138605cee4eb6f8c6fafd0b3ed" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, diff --git a/lua/plugins/color-scheme.lua b/lua/plugins/color-scheme.lua index 50e0829..f1de14a 100644 --- a/lua/plugins/color-scheme.lua +++ b/lua/plugins/color-scheme.lua @@ -1,48 +1,49 @@ return { - "projekt0n/github-nvim-theme", - lazy = false, -- make sure we load this during startup if it is your main colorscheme - priority = 1000, -- make sure to load this before all the other start plugins + "miikanissi/modus-themes.nvim", + lazy = false, + priority = 1000, config = function() - require("github-theme").setup({ - options = { - transparent = true, - dim_inactive = false, - }, - palettes = { - github_light_default = { - orange = "#F8F9FA", - }, - }, - specs = { - github_light = { - -- bg0 = "#FF0000", -- works, set leader menu - -- bg1 = "#FF0000", -- works, sets status line - -- bg3 = "#FF0000", -- works, set cursor line - syntax = { -- Syntax works without anything in addition - builtin1 = "#C92785", - -- builtin0 = "#C92785", - -- builtin2 = "#C92785", - type = "#707174", - const = "#C92785", - string = "#B31512", - -- field = "#00FF00", - -- ident = "#00FF00", - -- variable = "#00FF00", - -- bracket = "#309331", - func = "#202124", - keyword = "#175ABC", -- This works - comment = "#137333", -- This works - }, - }, - }, - groups = { - github_light = { - -- Normal = { bg = "#F8F9FA" }, - -- NormalFloat = { bg = "#FFFFFF" }, - }, + -- Default options + require("modus-themes").setup({ + -- Theme comes in two styles `modus_operandi` and `modus_vivendi` + -- `auto` will automatically set style based on background set with vim.o.background + style = "auto", + variant = "default", -- Theme comes in four variants `default`, `tinted`, `deuteranopia`, and `tritanopia` + transparent = true, -- Transparent background (as supported by the terminal) + dim_inactive = false, -- "non-current" windows are dimmed + styles = { + -- Style to be applied to different syntax groups + -- Value is any valid attr-list value for `:help nvim_set_hl` + comments = { italic = true }, + keywords = { italic = true }, + functions = {}, + variables = {}, }, + + --- You can override specific color groups to use other groups or a hex color + --- function will be called with a ColorScheme table + ---@param colors ColorScheme + on_colors = function(colors) + colors.bg_active = "#ffffff" -- changed from #e0e0e0, we also like #f8f9fa + colors.visual = "#72f64a" + end, + + --- You can override specific highlights to use other groups or a hex color + --- function will be called with a Highlights and ColorScheme table + ---@param highlights Highlights + ---@param colors ColorScheme + on_highlights = function(highlights, colors) + highlights.Pmenu = { bg = colors.bg_alt } + highlights.PmenuSel = { bg = colors.bg_hl_line } + highlights.PmenuExtra = { bg = colors.bg_alt } + highlights.FloatBorder = { bg = colors.bg_alt } + highlights.NormalFloat = { bg = "#f8f9fa" } + highlights.CursorLine = { bg = "#effaff" } + highlights.Directory = { fg = "#000000" } + end, }) - vim.cmd("colorscheme github_light") + + vim.cmd("colorscheme modus") vim.cmd("set nolist") end, }