diff --git a/README.md b/README.md index a28b5e8..8098329 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' @@ -90,22 +90,22 @@ require('vscode').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').load() +-- require('vscode-theme').load() -- load the theme without affecting devicon colors. -vim.cmd.colorscheme "vscode" +vim.cmd.colorscheme "vscode-theme" ``` @@ -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-theme.lua b/colors/vscode-theme.lua new file mode 100644 index 0000000..b117d59 --- /dev/null +++ b/colors/vscode-theme.lua @@ -0,0 +1,2 @@ +local vscode_theme = require('vscode-theme') +vscode_theme.load() diff --git a/colors/vscode.lua b/colors/vscode.lua deleted file mode 100644 index 5ef7f9e..0000000 --- a/colors/vscode.lua +++ /dev/null @@ -1,2 +0,0 @@ -local vscode = require('vscode') -vscode.load() diff --git a/lua/lualine/themes/vscode.lua b/lua/lualine/themes/vscode.lua index d4d178a..dd4142f 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.config') -local vscode = {} +local config = require('vscode-theme.config') +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 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 68% rename from lua/vscode/init.lua rename to lua/vscode-theme/init.lua index 6bacc0e..fe32ae4 100644 --- a/lua/vscode/init.lua +++ b/lua/vscode-theme/init.lua @@ -1,26 +1,26 @@ -- vscode.nvim color scheme -- 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 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') 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 @@ -39,4 +39,4 @@ vscode.load = function(style) end end -return vscode +return vscode_theme 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