From 09202e9cc9fbe6546afaca7b8af433c0baf6d746 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Sun, 11 Jun 2023 16:39:41 +0200 Subject: [PATCH] Updated theme --- config/nvim/init.lua | 56 ++++--------------- .../lua/lualine/themes/nightly_cm.lua | 32 +++++------ nightly_cm.nvim/lua/nightly_cm/palette.lua | 27 --------- nightly_cm.nvim/lua/nightly_cm/theme.lua | 32 +++++------ 4 files changed, 44 insertions(+), 103 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 8b94599..e606208 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -77,22 +77,15 @@ vim.opt.rtp:prepend(lazypath) -- Plugin installation ------------------------------------------------------------------- require('lazy').setup({ - -- { - -- 'Alexis12119/nightly.nvim', - -- priority = 1000, - -- config = function() - -- vim.cmd.colorscheme 'nightly_cm' - -- end, - -- }, { - dir= "~/code_server/nightly_cm.nvim", + dir = "~/code_server/nightly_cm.nvim", priority = 1000, config = function() vim.cmd.colorscheme 'nightly_cm' end, }, - + { -- LSP Configuration & Plugins 'neovim/nvim-lspconfig', @@ -417,6 +410,10 @@ local cmp = require 'cmp' local luasnip = require 'luasnip' require('luasnip.loaders.from_vscode').lazy_load() luasnip.config.setup {} +local cmp_opts = { + border = "single", + winhighlight = 'Normal:Pmenu,FloatBorder:FloatBorder,Search:NONE,CursorLine:PmenuSel', +} cmp.setup { preselect = cmp.PreselectMode.None, @@ -424,16 +421,8 @@ cmp.setup { completion = { completeopt = 'menu,menuone,noinsert,noselect' }, }, window = { - -- completion = cmp.config.window.bordered(), - -- documentation = cmp.config.window.bordered(), - documentation = { - winhighlight = 'Normal:Pmenu,FloatBorder:Pmenu,Search:None', - -- border = "single", - }, - -- completion = { - -- winhighlight = 'Normal:Pmenu,FloatBorder:Pmenu,Search:None', - -- border = "single", - -- }, + completion = cmp.config.window.bordered(cmp_opts), + documentation = cmp.config.window.bordered(cmp_opts), }, snippet = { expand = function(args) @@ -488,16 +477,8 @@ cmp.setup { cmp.setup.cmdline({ '/', '?' }, { mapping = cmp.mapping.preset.cmdline(), window = { - -- completion = cmp.config.window.bordered(), - -- documentation = cmp.config.window.bordered(), - -- documentation = { - -- winhighlight = 'Normal:Pmenu,FloatBorder:Pmenu,Search:None', - -- border = "single", - -- }, - -- completion = { - -- winhighlight = 'Normal:Pmenu,FloatBorder:Pmenu,Search:None', - -- border = "single", - -- }, + completion = cmp.config.window.bordered(cmp_opts), + documentation = cmp.config.window.bordered(cmp_opts), }, sources = { { name = 'buffer' } @@ -507,16 +488,8 @@ cmp.setup.cmdline({ '/', '?' }, { cmp.setup.cmdline(':', { mapping = cmp.mapping.preset.cmdline(), window = { - -- completion = cmp.config.window.bordered(), - -- documentation = cmp.config.window.bordered(), - -- documentation = { - -- winhighlight = 'Normal:Pmenu,FloatBorder:Pmenu,Search:None', - -- border = "single", - -- }, - -- completion = { - -- winhighlight = 'Normal:Pmenu,FloatBorder:Pmenu,Search:None', - -- border = "single", - -- }, + completion = cmp.config.window.bordered(cmp_opts), + documentation = cmp.config.window.bordered(cmp_opts), }, sources = cmp.config.sources({ { name = 'path' } @@ -621,8 +594,3 @@ vim.keymap.set('n', '', ":make", { desc = 'Format code', silent = true vim.keymap.set('n', '', ":make clean", { desc = 'Format code', silent = true }) vim.keymap.set('n', 'n', ":tabnew", { desc = 'Format code', silent = true }) vim.keymap.set('n', 'c', ":tabclose", { desc = 'Format code', silent = true }) - --- Customization for Pmenu --- vim.api.nvim_set_hl(0, "PmenuSel", { bg = "#555555", fg = "NONE" }) --- vim.api.nvim_set_hl(0, "Pmenu", { fg = "#C5CDD9", bg = "#000000" }) --- vim.api.nvim_set_hl(0, "CmpItemAbbr", { fg = "#eeeeee", bg = "NONE" }) diff --git a/nightly_cm.nvim/lua/lualine/themes/nightly_cm.lua b/nightly_cm.nvim/lua/lualine/themes/nightly_cm.lua index 87a816e..bc8089c 100644 --- a/nightly_cm.nvim/lua/lualine/themes/nightly_cm.lua +++ b/nightly_cm.nvim/lua/lualine/themes/nightly_cm.lua @@ -1,39 +1,39 @@ local nightly = { normal = { - a = { bg = "NONE", fg = "#87afd7" }, - b = { bg = "NONE", fg = "#c6c6c6" }, - c = { bg = "NONE", fg = "#c6c6c6" }, + a = { bg = "#000000", fg = "#87afd7" }, + b = { bg = "#000000", fg = "#c6c6c6" }, + c = { bg = "#000000", fg = "#c6c6c6" }, }, insert = { - a = { bg = "NONE", fg = "#afd787" }, - b = { bg = "NONE", fg = "#c6c6c6" }, + a = { bg = "#000000", fg = "#afd787" }, + b = { bg = "#000000", fg = "#c6c6c6" }, }, command = { - a = { bg = "NONE", fg = "#d7af5f" }, - b = { bg = "NONE", fg = "#c6c6c6" }, + a = { bg = "#000000", fg = "#d7af5f" }, + b = { bg = "#000000", fg = "#c6c6c6" }, }, visual = { - a = { bg = "NONE", fg = "#87afd7" }, - b = { bg = "NONE", fg = "#c6c6c6" }, + a = { bg = "#000000", fg = "#87afd7" }, + b = { bg = "#000000", fg = "#c6c6c6" }, }, replace = { - a = { bg = "NONE", fg = "#d75f00" }, - b = { bg = "NONE", fg = "#c6c6c6" }, + a = { bg = "#000000", fg = "#d75f00" }, + b = { bg = "#000000", fg = "#c6c6c6" }, }, terminal = { - a = { bg = "NONE", fg = "#87afd7" }, - b = { bg = "NONE", fg = "#c6c6c6" }, + a = { bg = "#000000", fg = "#87afd7" }, + b = { bg = "#000000", fg = "#c6c6c6" }, }, inactive = { - a = { bg = "NONE", fg = "#c6c6c6" }, - b = { bg = "NONE", fg = "#c6c6c6" }, - c = { bg = "NONE", fg = "#c6c6c6" }, + a = { bg = "#000000", fg = "#c6c6c6" }, + b = { bg = "#000000", fg = "#c6c6c6" }, + c = { bg = "#000000", fg = "#c6c6c6" }, }, } return nightly diff --git a/nightly_cm.nvim/lua/nightly_cm/palette.lua b/nightly_cm.nvim/lua/nightly_cm/palette.lua index c101a52..5d5e686 100644 --- a/nightly_cm.nvim/lua/nightly_cm/palette.lua +++ b/nightly_cm.nvim/lua/nightly_cm/palette.lua @@ -27,32 +27,5 @@ M.dark_colors = { cursorline = "#303030", none = "NONE", } --- M.dark_colors = { --- color0 = "#232323", --- color1 = "#d75f00", --- color2 = "#afd787", --- color3 = "#d7d7af", --- color4 = "#87afd7", --- color5 = "#d7af5f", --- color6 = "#87afd7", --- color7 = "#B3b3b3", --- color8 = "#2D2d2d", --- color9 = "#d7d7af", --- color10 = "#afd787", --- color11 = "#d7af5f", --- color12 = "#87afd7", --- color13 = "#87afd7", --- color14 = "#87afd7", --- color15 = "#BDbdbd", --- color16 = "#0F0f0f", --- color17 = "#585858", --- color18 = "#303030", --- comment = "#444444", --- black = "#000000", --- background = "#262626", --- foreground = "#c6c6c6", --- cursorline = "#303030", --- none = "NONE", --- } return M diff --git a/nightly_cm.nvim/lua/nightly_cm/theme.lua b/nightly_cm.nvim/lua/nightly_cm/theme.lua index 946b146..dd17066 100644 --- a/nightly_cm.nvim/lua/nightly_cm/theme.lua +++ b/nightly_cm.nvim/lua/nightly_cm/theme.lua @@ -38,7 +38,7 @@ function theme.setup() ErrorMsg = { fg = p.color1, bg = p.background }, Exception = { fg = p.color6 }, Float = { fg = p.color5 }, - FloatBorder = { fg = p.color17 }, + FloatBorder = { fg = p.comment }, FoldColumn = { fg = p.color4, bg = p.background }, Folded = { fg = p.color4, bg = p.background }, Function = { fg = p.color6, style = options.styles.functions }, @@ -61,8 +61,8 @@ function theme.setup() NormalNC = { fg = p.foreground, bg = p.background }, Number = { fg = p.color3 }, Operator = { fg = p.color6 }, - Pmenu = { fg = p.color17, bg = p.color0 }, - PmenuSbar = { bg = p.color0 }, + Pmenu = { fg = p.foreground, bg = p.background }, + PmenuSbar = { bg = p.background }, PmenuSel = { fg = p.black, bg = p.color4 }, PmenuThumb = { bg = p.color2 }, PreCondit = { fg = p.color6 }, @@ -81,15 +81,15 @@ function theme.setup() SpellLocal = { fg = p.color4 }, SpellRare = { fg = p.color6 }, Statement = { fg = p.color6 }, - StatusLine = { fg = p.foreground, bg = p.background }, - StatusLineNC = { bg = p.background, fg = p.background }, + StatusLine = { fg = p.foreground, bg = p.color16 }, + StatusLineNC = { bg = p.background, fg = p.color16 }, Storage = { fg = p.color5 }, StorageClass = { fg = p.color7 }, String = { fg = p.color2 }, Structure = { fg = p.color6 }, Substitute = { fg = p.black, bg = p.color5 }, - TabLine = { fg = p.color2, bg = p.background }, - TabLineFill = { fg = p.foreground, bg = p.background }, + TabLine = { fg = p.color2, bg = p.color16 }, + TabLineFill = { fg = p.foreground, bg = p.color16 }, TabLineSel = { fg = p.foreground, bg = p.background }, Tag = { fg = p.color4 }, TermCursor = { fg = p.foreground, bg = p.foreground }, @@ -139,9 +139,9 @@ function theme.setup() -- LSP LspInfoFiletype = { fg = p.color15 }, - LspReferenceText = { bg = p.color18 }, - LspReferenceRead = { bg = p.color18 }, - LspReferenceWrite = { bg = p.color18 }, + LspReferenceText = { bg = p.color4 }, + LspReferenceRead = { bg = p.color4 }, + LspReferenceWrite = { bg = p.color4 }, LspInfoBorder = { link = "FloatBorder" }, -- lspsaga.nvim: https://github.com/glepnir/lspsaga.nvim @@ -178,12 +178,12 @@ function theme.setup() -- nvim-cmp: https://github.com/hrsh7th/nvim-cmp CmpDocumentationBorder = { fg = p.color17, bg = p.background }, - CmpItemAbbr = { fg = p.foreground, bg = p.background }, - CmpItemAbbrDeprecated = { fg = p.color2, bg = p.background }, - CmpItemAbbrMatch = { fg = p.color7, bg = p.background }, - CmpItemAbbrMatchFuzzy = { fg = p.color7, bg = p.background }, + CmpItemAbbr = { fg = p.foreground, bg = "NONE" }, + CmpItemAbbrDeprecated = { fg = p.color2, bg = "NONE" }, + CmpItemAbbrMatch = { fg = p.color2, bg = "NONE" }, + CmpItemAbbrMatchFuzzy = { fg = p.color2, bg = "NONE" }, CmpItemKind = { fg = p.color4, bg = p.background }, - CmpItemMenu = { fg = p.color2, bg = p.background }, + CmpItemMenu = { fg = p.color2, bg = "NONE" }, CmpItemKindFolder = { fg = p.color4 }, CmpItemKindFile = { fg = p.color2 }, CmpItemKindConstructor = { fg = p.color5 }, @@ -231,7 +231,7 @@ function theme.setup() NvimTreeOpenedFolderName = { fg = p.foreground }, NvimTreeRootFolder = { fg = p.color12 }, NvimTreeSpecialFile = { fg = p.color5 }, - NvimTreeStatusLineNC = { bg = p.background, fg = p.background }, + NvimTreeStatusLineNC = { bg = p.background, fg = p.color16 }, NvimTreeSymlink = { fg = p.color3 }, NvimTreeWinSeparator = { fg = p.background },