From bfe7dd9b6a72105b6d9ae49e86de0655f71e04a1 Mon Sep 17 00:00:00 2001 From: raring-coffee20 Date: Mon, 28 Oct 2024 10:14:10 +0700 Subject: [PATCH 1/9] update files --- README.md | 14 +++++++------- colors/vscode.lua | 2 +- lua/lualine/themes/vscode.lua | 2 +- lua/{vscode => vscode-theme}/colors.lua | 2 +- lua/{vscode => vscode-theme}/config.lua | 0 lua/{vscode => vscode-theme}/init.lua | 10 +++++----- lua/{vscode => vscode-theme}/theme.lua | 2 +- lua/{vscode => vscode-theme}/utils.lua | 0 8 files changed, 16 insertions(+), 16 deletions(-) rename lua/{vscode => vscode-theme}/colors.lua (99%) rename lua/{vscode => vscode-theme}/config.lua (100%) rename lua/{vscode => vscode-theme}/init.lua (78%) rename lua/{vscode => vscode-theme}/theme.lua (99%) rename lua/{vscode => vscode-theme}/utils.lua (100%) diff --git a/README.md b/README.md index a28b5e8..16774f4 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ The theme is manipulating the treesitter highlight queries as follows: ] @keyword.conditional ``` -this mimics the behavior of VSCode's default theme more closely. Be aware that +this mimics the behavior of VSCode's default theme more closely. Be aware that this is not a perfect solution but as far as we know, there is no better way to achieve this and most popular themes are doing the same thing. @@ -73,8 +73,8 @@ vim.o.background = 'dark' -- For light theme vim.o.background = 'light' -local c = require('vscode.colors').get_colors() -require('vscode').setup({ +local c = require('vscode-theme.colors').get_colors() +require('vscode-theme').setup({ -- Alternatively set style in setup -- style = 'light' @@ -102,7 +102,7 @@ require('vscode').setup({ Cursor = { fg=c.vscDarkBlue, bg=c.vscLightGreen, bold=true }, } }) --- require('vscode').load() +-- require('vscode-theme').load() -- load the theme without affecting devicon colors. vim.cmd.colorscheme "vscode" @@ -115,7 +115,7 @@ If you are using [`lualine`](https://github.com/hoob3rt/lualine.nvim), you can a require('lualine').setup({ options = { -- ... - theme = 'vscode', + theme = 'vscode-theme', -- ... }, }) @@ -189,8 +189,8 @@ require("bufferline").setup({ ## Switching theme ``` -:lua require('vscode').load('light') -:lua require('vscode').load('dark') +:lua require('vscode-theme').load('light') +:lua require('vscode-theme').load('dark') ``` ## 🍭 Extra folder diff --git a/colors/vscode.lua b/colors/vscode.lua index 5ef7f9e..6049969 100644 --- a/colors/vscode.lua +++ b/colors/vscode.lua @@ -1,2 +1,2 @@ -local vscode = require('vscode') +local vscode = require('vscode-theme') vscode.load() diff --git a/lua/lualine/themes/vscode.lua b/lua/lualine/themes/vscode.lua index d4d178a..fc6f312 100644 --- a/lua/lualine/themes/vscode.lua +++ b/lua/lualine/themes/vscode.lua @@ -1,6 +1,6 @@ -- Copyright (c) 2020-2021 Mofiqul Islam -- MIT license, see LICENSE for more details. -local config = require('vscode.config') +local config = require('vscode-theme.config') local vscode = {} local colors = {} diff --git a/lua/vscode/colors.lua b/lua/vscode-theme/colors.lua similarity index 99% rename from lua/vscode/colors.lua rename to lua/vscode-theme/colors.lua index c171261..363c6b6 100644 --- a/lua/vscode/colors.lua +++ b/lua/vscode-theme/colors.lua @@ -158,7 +158,7 @@ colors.get_colors = function() mycolors.vscPopupHighlightLightBlue = '#d7eafe' -- Extend the colors with overrides passed by `color_overrides` - local config = require('vscode.config') + local config = require('vscode-theme.config') if config.opts.color_overrides then mycolors = vim.tbl_extend('force', mycolors, config.opts.color_overrides) end diff --git a/lua/vscode/config.lua b/lua/vscode-theme/config.lua similarity index 100% rename from lua/vscode/config.lua rename to lua/vscode-theme/config.lua diff --git a/lua/vscode/init.lua b/lua/vscode-theme/init.lua similarity index 78% rename from lua/vscode/init.lua rename to lua/vscode-theme/init.lua index 6bacc0e..77d2316 100644 --- a/lua/vscode/init.lua +++ b/lua/vscode-theme/init.lua @@ -2,9 +2,9 @@ -- Lua port of https://github.com/tomasiser/vim-code-dark -- By http://github.com/mofiqul local vscode = {} -local config = require('vscode.config') -local theme = require('vscode.theme') -local utils = require('vscode.utils') +local config = require('vscode-theme.config') +local theme = require('vscode-theme.theme') +local utils = require('vscode-theme.utils') -- Pass setup to config module vscode.setup = config.setup @@ -18,9 +18,9 @@ vscode.load = function(style) end vim.o.termguicolors = true - vim.g.colors_name = 'vscode' + vim.g.colors_name = 'vscode-theme' if config.opts.terminal_colors then - utils.terminal(require('vscode.colors').get_colors()) + utils.terminal(require('vscode-theme.colors').get_colors()) end local background = style or config.opts.style diff --git a/lua/vscode/theme.lua b/lua/vscode-theme/theme.lua similarity index 99% rename from lua/vscode/theme.lua rename to lua/vscode-theme/theme.lua index b44c032..c753ab1 100644 --- a/lua/vscode/theme.lua +++ b/lua/vscode-theme/theme.lua @@ -2,7 +2,7 @@ local hl = vim.api.nvim_set_hl local theme = {} theme.set_highlights = function(opts) - local c = require('vscode.colors').get_colors() + local c = require('vscode-theme.colors').get_colors() local isDark = vim.o.background == 'dark' hl(0, 'Normal', { fg = c.vscFront, bg = c.vscBack }) diff --git a/lua/vscode/utils.lua b/lua/vscode-theme/utils.lua similarity index 100% rename from lua/vscode/utils.lua rename to lua/vscode-theme/utils.lua From 25a148a5a27175488c63af29cfd6d9ac25d56ec9 Mon Sep 17 00:00:00 2001 From: tuyenpm9 <> Date: Mon, 28 Oct 2024 12:40:57 +0700 Subject: [PATCH 2/9] update files --- colors/vscode.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/vscode.lua b/colors/vscode.lua index 6049969..5abf483 100644 --- a/colors/vscode.lua +++ b/colors/vscode.lua @@ -1,2 +1,2 @@ -local vscode = require('vscode-theme') -vscode.load() +local vscode-theme = require('vscode-theme') +vscode-theme.load() From fda80e6e3278e477c3e64c9695bb1664d81ad972 Mon Sep 17 00:00:00 2001 From: tuyenpm9 <> Date: Mon, 28 Oct 2024 12:46:18 +0700 Subject: [PATCH 3/9] update files --- lua/vscode-theme/init.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/vscode-theme/init.lua b/lua/vscode-theme/init.lua index 77d2316..1aff087 100644 --- a/lua/vscode-theme/init.lua +++ b/lua/vscode-theme/init.lua @@ -1,17 +1,17 @@ -- vscode.nvim color scheme -- Lua port of https://github.com/tomasiser/vim-code-dark -- By http://github.com/mofiqul -local vscode = {} +local vscode-theme = {} local config = require('vscode-theme.config') local theme = require('vscode-theme.theme') local utils = require('vscode-theme.utils') -- Pass setup to config module -vscode.setup = config.setup +vscode-theme.setup = config.setup -- Load colorscheme with a given or default style ---@param style? string -vscode.load = function(style) +vscode-theme.load = function(style) vim.cmd('hi clear') if vim.fn.exists('syntax_on') then vim.cmd('syntax reset') @@ -39,4 +39,4 @@ vscode.load = function(style) end end -return vscode +return vscode-theme From 90c68090e03df96f6edb80f84f7ba29cb20198d3 Mon Sep 17 00:00:00 2001 From: tuyenpm9 <> Date: Mon, 28 Oct 2024 12:52:19 +0700 Subject: [PATCH 4/9] update files --- lua/lualine/themes/vscode.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lua/lualine/themes/vscode.lua b/lua/lualine/themes/vscode.lua index fc6f312..b4b12ae 100644 --- a/lua/lualine/themes/vscode.lua +++ b/lua/lualine/themes/vscode.lua @@ -1,7 +1,7 @@ -- Copyright (c) 2020-2021 Mofiqul Islam -- MIT license, see LICENSE for more details. local config = require('vscode-theme.config') -local vscode = {} +local vscode-theme = {} local colors = {} if vim.o.background == 'dark' then @@ -28,45 +28,45 @@ else colors.pink = '#FFA3A3' end -vscode.normal = { +vscode-theme.normal = { a = { fg = vim.o.background == 'dark' and colors.fg or colors.bg, bg = colors.blue, gui = 'bold' }, b = { fg = colors.blue, bg = config.opts.transparent and 'NONE' or colors.bg2 }, c = { fg = colors.fg, bg = config.opts.transparent and 'NONE' or colors.bg }, } -vscode.visual = { +vscode-theme.visual = { a = { fg = colors.bg, bg = colors.yellow, gui = 'bold' }, b = { fg = colors.yellow, bg = config.opts.transparent and 'NONE' or colors.bg }, } -vscode.inactive = { +vscode-theme.inactive = { a = { fg = colors.fg, bg = colors.bg, gui = 'bold' }, b = { fg = colors.inactive, bg = config.opts.transparent and 'NONE' or colors.bg }, c = { fg = colors.inactive, bg = config.opts.transparent and 'NONE' or colors.bg }, } -vscode.replace = { +vscode-theme.replace = { a = { fg = vim.o.background == 'dark' and colors.bg or colors.fg, bg = colors.red, gui = 'bold' }, b = { fg = colors.red, bg = config.opts.transparent and 'NONE' or colors.bg2 }, c = { fg = colors.fg, bg = config.opts.transparent and 'NONE' or colors.bg }, } -vscode.insert = { +vscode-theme.insert = { a = { fg = colors.bg, bg = colors.green, gui = 'bold' }, b = { fg = colors.green, bg = config.opts.transparent and 'NONE' or colors.bg2 }, c = { fg = colors.fg, bg = config.opts.transparent and 'NONE' or colors.bg }, } -vscode.terminal = { +vscode-theme.terminal = { a = { fg = vim.o.background == 'dark' and colors.bg or colors.fg, bg = colors.green, gui = 'bold' }, b = { fg = colors.fg, bg = config.opts.transparent and 'NONE' or colors.bg2 }, c = { fg = colors.fg, bg = config.opts.transparent and 'NONE' or colors.bg }, } -vscode.command = { +vscode-theme.command = { a = { fg = vim.o.background == 'dark' and colors.bg or colors.fg, bg = colors.pink, gui = 'bold' }, b = { fg = colors.pink, bg = config.opts.transparent and 'NONE' or colors.bg2 }, c = { fg = colors.fg, bg = config.opts.transparent and 'NONE' or colors.bg }, } -return vscode +return vscode-theme From 232b184e54d9d159ebf13a0d971adb7de9d57eaf Mon Sep 17 00:00:00 2001 From: tuyenpm9 <> Date: Mon, 28 Oct 2024 12:56:25 +0700 Subject: [PATCH 5/9] update files --- colors/vscode.lua | 2 +- lua/lualine/themes/vscode.lua | 2 +- lua/vscode-theme/init.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/colors/vscode.lua b/colors/vscode.lua index 5abf483..7fc1fbe 100644 --- a/colors/vscode.lua +++ b/colors/vscode.lua @@ -1,2 +1,2 @@ -local vscode-theme = require('vscode-theme') +local vscode_theme = require('vscode-theme') vscode-theme.load() diff --git a/lua/lualine/themes/vscode.lua b/lua/lualine/themes/vscode.lua index b4b12ae..401464e 100644 --- a/lua/lualine/themes/vscode.lua +++ b/lua/lualine/themes/vscode.lua @@ -1,7 +1,7 @@ -- Copyright (c) 2020-2021 Mofiqul Islam -- MIT license, see LICENSE for more details. local config = require('vscode-theme.config') -local vscode-theme = {} +local vscode_theme = {} local colors = {} if vim.o.background == 'dark' then diff --git a/lua/vscode-theme/init.lua b/lua/vscode-theme/init.lua index 1aff087..ec07b55 100644 --- a/lua/vscode-theme/init.lua +++ b/lua/vscode-theme/init.lua @@ -1,7 +1,7 @@ -- vscode.nvim color scheme -- Lua port of https://github.com/tomasiser/vim-code-dark -- By http://github.com/mofiqul -local vscode-theme = {} +local vscode_theme = {} local config = require('vscode-theme.config') local theme = require('vscode-theme.theme') local utils = require('vscode-theme.utils') From 557fd53bb3ce2bd5e050f96ef8ad810d4375b928 Mon Sep 17 00:00:00 2001 From: tuyenpm9 <> Date: Mon, 28 Oct 2024 13:00:20 +0700 Subject: [PATCH 6/9] update files --- colors/vscode.lua | 2 +- lua/lualine/themes/vscode.lua | 16 ++++++++-------- lua/vscode-theme/init.lua | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/colors/vscode.lua b/colors/vscode.lua index 7fc1fbe..b117d59 100644 --- a/colors/vscode.lua +++ b/colors/vscode.lua @@ -1,2 +1,2 @@ local vscode_theme = require('vscode-theme') -vscode-theme.load() +vscode_theme.load() diff --git a/lua/lualine/themes/vscode.lua b/lua/lualine/themes/vscode.lua index 401464e..dd4142f 100644 --- a/lua/lualine/themes/vscode.lua +++ b/lua/lualine/themes/vscode.lua @@ -28,45 +28,45 @@ else colors.pink = '#FFA3A3' end -vscode-theme.normal = { +vscode_theme.normal = { a = { fg = vim.o.background == 'dark' and colors.fg or colors.bg, bg = colors.blue, gui = 'bold' }, b = { fg = colors.blue, bg = config.opts.transparent and 'NONE' or colors.bg2 }, c = { fg = colors.fg, bg = config.opts.transparent and 'NONE' or colors.bg }, } -vscode-theme.visual = { +vscode_theme.visual = { a = { fg = colors.bg, bg = colors.yellow, gui = 'bold' }, b = { fg = colors.yellow, bg = config.opts.transparent and 'NONE' or colors.bg }, } -vscode-theme.inactive = { +vscode_theme.inactive = { a = { fg = colors.fg, bg = colors.bg, gui = 'bold' }, b = { fg = colors.inactive, bg = config.opts.transparent and 'NONE' or colors.bg }, c = { fg = colors.inactive, bg = config.opts.transparent and 'NONE' or colors.bg }, } -vscode-theme.replace = { +vscode_theme.replace = { a = { fg = vim.o.background == 'dark' and colors.bg or colors.fg, bg = colors.red, gui = 'bold' }, b = { fg = colors.red, bg = config.opts.transparent and 'NONE' or colors.bg2 }, c = { fg = colors.fg, bg = config.opts.transparent and 'NONE' or colors.bg }, } -vscode-theme.insert = { +vscode_theme.insert = { a = { fg = colors.bg, bg = colors.green, gui = 'bold' }, b = { fg = colors.green, bg = config.opts.transparent and 'NONE' or colors.bg2 }, c = { fg = colors.fg, bg = config.opts.transparent and 'NONE' or colors.bg }, } -vscode-theme.terminal = { +vscode_theme.terminal = { a = { fg = vim.o.background == 'dark' and colors.bg or colors.fg, bg = colors.green, gui = 'bold' }, b = { fg = colors.fg, bg = config.opts.transparent and 'NONE' or colors.bg2 }, c = { fg = colors.fg, bg = config.opts.transparent and 'NONE' or colors.bg }, } -vscode-theme.command = { +vscode_theme.command = { a = { fg = vim.o.background == 'dark' and colors.bg or colors.fg, bg = colors.pink, gui = 'bold' }, b = { fg = colors.pink, bg = config.opts.transparent and 'NONE' or colors.bg2 }, c = { fg = colors.fg, bg = config.opts.transparent and 'NONE' or colors.bg }, } -return vscode-theme +return vscode_theme diff --git a/lua/vscode-theme/init.lua b/lua/vscode-theme/init.lua index ec07b55..cfec435 100644 --- a/lua/vscode-theme/init.lua +++ b/lua/vscode-theme/init.lua @@ -7,11 +7,11 @@ local theme = require('vscode-theme.theme') local utils = require('vscode-theme.utils') -- Pass setup to config module -vscode-theme.setup = config.setup +vscode_theme.setup = config.setup -- Load colorscheme with a given or default style ---@param style? string -vscode-theme.load = function(style) +vscode_theme.load = function(style) vim.cmd('hi clear') if vim.fn.exists('syntax_on') then vim.cmd('syntax reset') From 5d376076318e12f1240b4fcb7a9431fe05d20d48 Mon Sep 17 00:00:00 2001 From: tuyenpm9 <> Date: Mon, 28 Oct 2024 13:01:54 +0700 Subject: [PATCH 7/9] update files --- lua/vscode-theme/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/vscode-theme/init.lua b/lua/vscode-theme/init.lua index cfec435..fe32ae4 100644 --- a/lua/vscode-theme/init.lua +++ b/lua/vscode-theme/init.lua @@ -39,4 +39,4 @@ vscode_theme.load = function(style) end end -return vscode-theme +return vscode_theme From 0b53fe92c0476b1415cba0928bc9582ae2945974 Mon Sep 17 00:00:00 2001 From: tuyenpm9 <> Date: Mon, 28 Oct 2024 13:18:16 +0700 Subject: [PATCH 8/9] update files --- colors/{vscode.lua => vscode-theme.lua} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename colors/{vscode.lua => vscode-theme.lua} (100%) diff --git a/colors/vscode.lua b/colors/vscode-theme.lua similarity index 100% rename from colors/vscode.lua rename to colors/vscode-theme.lua From 30ed74f1f871a00ad43a4d474f956a28531ffd3a Mon Sep 17 00:00:00 2001 From: tuyenpm9 <> Date: Mon, 28 Oct 2024 13:34:53 +0700 Subject: [PATCH 9/9] update files --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 16774f4..8098329 100644 --- a/README.md +++ b/README.md @@ -90,22 +90,22 @@ require('vscode-theme').setup({ -- Disable nvim-tree background color disable_nvimtree_bg = true, - -- Override colors (see ./lua/vscode/colors.lua) + -- Override colors (see ./lua/vscode-theme/colors.lua) color_overrides = { vscLineNumber = '#FFFFFF', }, - -- Override highlight groups (see ./lua/vscode/theme.lua) + -- Override highlight groups (see ./lua/vscode-theme/theme.lua) group_overrides = { -- this supports the same val table as vim.api.nvim_set_hl - -- use colors from this colorscheme by requiring vscode.colors! + -- use colors from this colorscheme by requiring vscode-theme.colors! Cursor = { fg=c.vscDarkBlue, bg=c.vscLightGreen, bold=true }, } }) -- require('vscode-theme').load() -- load the theme without affecting devicon colors. -vim.cmd.colorscheme "vscode" +vim.cmd.colorscheme "vscode-theme" ```