From 42e4ed0625505b2fe1abbb0a9d74d671fc3bd218 Mon Sep 17 00:00:00 2001 From: Grace Petryk Date: Fri, 9 Feb 2024 17:06:38 -0800 Subject: [PATCH] grace-rose-pine -> rose-pine --- colors/grace-rose-pine-dawn.lua | 1 - colors/grace-rose-pine-main.lua | 1 - colors/grace-rose-pine-moon.lua | 1 - colors/grace-rose-pine.lua | 3 --- colors/rose-pine-dawn.lua | 1 + colors/rose-pine-main.lua | 1 + colors/rose-pine-moon.lua | 1 + colors/rose-pine.lua | 3 +++ .../themes/{grace-rose-pine-alt.lua => rose-pine-alt.lua} | 2 +- lua/lualine/themes/{grace-rose-pine.lua => rose-pine.lua} | 4 ++-- lua/{grace-rose-pine.lua => rose-pine.lua} | 6 +++--- lua/{grace-rose-pine => rose-pine}/config.lua | 0 lua/{grace-rose-pine => rose-pine}/palette.lua | 2 +- lua/{grace-rose-pine => rose-pine}/plugins/bufferline.lua | 4 ++-- lua/{grace-rose-pine => rose-pine}/plugins/galaxyline.lua | 4 ++-- lua/{grace-rose-pine => rose-pine}/plugins/markid.lua | 4 ++-- lua/{grace-rose-pine => rose-pine}/plugins/toggleterm.lua | 2 +- lua/{grace-rose-pine => rose-pine}/theme.lua | 4 ++-- lua/{grace-rose-pine => rose-pine}/util.lua | 2 +- 19 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 colors/grace-rose-pine-dawn.lua delete mode 100644 colors/grace-rose-pine-main.lua delete mode 100644 colors/grace-rose-pine-moon.lua delete mode 100644 colors/grace-rose-pine.lua create mode 100644 colors/rose-pine-dawn.lua create mode 100644 colors/rose-pine-main.lua create mode 100644 colors/rose-pine-moon.lua create mode 100644 colors/rose-pine.lua rename lua/lualine/themes/{grace-rose-pine-alt.lua => rose-pine-alt.lua} (93%) rename lua/lualine/themes/{grace-rose-pine.lua => rose-pine.lua} (91%) rename lua/{grace-rose-pine.lua => rose-pine.lua} (63%) rename lua/{grace-rose-pine => rose-pine}/config.lua (100%) rename lua/{grace-rose-pine => rose-pine}/palette.lua (96%) rename lua/{grace-rose-pine => rose-pine}/plugins/bufferline.lua (97%) rename lua/{grace-rose-pine => rose-pine}/plugins/galaxyline.lua (71%) rename lua/{grace-rose-pine => rose-pine}/plugins/markid.lua (66%) rename lua/{grace-rose-pine => rose-pine}/plugins/toggleterm.lua (85%) rename lua/{grace-rose-pine => rose-pine}/theme.lua (99%) rename lua/{grace-rose-pine => rose-pine}/util.lua (96%) diff --git a/colors/grace-rose-pine-dawn.lua b/colors/grace-rose-pine-dawn.lua deleted file mode 100644 index 654d3c0..0000000 --- a/colors/grace-rose-pine-dawn.lua +++ /dev/null @@ -1 +0,0 @@ -require('grace-rose-pine').colorscheme({ variant = 'dawn' }) diff --git a/colors/grace-rose-pine-main.lua b/colors/grace-rose-pine-main.lua deleted file mode 100644 index cdab871..0000000 --- a/colors/grace-rose-pine-main.lua +++ /dev/null @@ -1 +0,0 @@ -require('grace-rose-pine').colorscheme({ variant = 'main' }) diff --git a/colors/grace-rose-pine-moon.lua b/colors/grace-rose-pine-moon.lua deleted file mode 100644 index ca33534..0000000 --- a/colors/grace-rose-pine-moon.lua +++ /dev/null @@ -1 +0,0 @@ -require('grace-rose-pine').colorscheme({ variant = 'moon' }) diff --git a/colors/grace-rose-pine.lua b/colors/grace-rose-pine.lua deleted file mode 100644 index 0c379d4..0000000 --- a/colors/grace-rose-pine.lua +++ /dev/null @@ -1,3 +0,0 @@ -package.loaded['grace-rose-pine.palette'] = nil - -require('grace-rose-pine').colorscheme() diff --git a/colors/rose-pine-dawn.lua b/colors/rose-pine-dawn.lua new file mode 100644 index 0000000..b4482c0 --- /dev/null +++ b/colors/rose-pine-dawn.lua @@ -0,0 +1 @@ +require('rose-pine').colorscheme({ variant = 'dawn' }) diff --git a/colors/rose-pine-main.lua b/colors/rose-pine-main.lua new file mode 100644 index 0000000..6951634 --- /dev/null +++ b/colors/rose-pine-main.lua @@ -0,0 +1 @@ +require('rose-pine').colorscheme({ variant = 'main' }) diff --git a/colors/rose-pine-moon.lua b/colors/rose-pine-moon.lua new file mode 100644 index 0000000..57e6a68 --- /dev/null +++ b/colors/rose-pine-moon.lua @@ -0,0 +1 @@ +require('rose-pine').colorscheme({ variant = 'moon' }) diff --git a/colors/rose-pine.lua b/colors/rose-pine.lua new file mode 100644 index 0000000..fd735a8 --- /dev/null +++ b/colors/rose-pine.lua @@ -0,0 +1,3 @@ +package.loaded['rose-pine.palette'] = nil + +require('rose-pine').colorscheme() diff --git a/lua/lualine/themes/grace-rose-pine-alt.lua b/lua/lualine/themes/rose-pine-alt.lua similarity index 93% rename from lua/lualine/themes/grace-rose-pine-alt.lua rename to lua/lualine/themes/rose-pine-alt.lua index 1674948..1e1ee36 100644 --- a/lua/lualine/themes/grace-rose-pine-alt.lua +++ b/lua/lualine/themes/rose-pine-alt.lua @@ -1,4 +1,4 @@ -local p = require('grace-rose-pine.palette') +local p = require('rose-pine.palette') return { normal = { diff --git a/lua/lualine/themes/grace-rose-pine.lua b/lua/lualine/themes/rose-pine.lua similarity index 91% rename from lua/lualine/themes/grace-rose-pine.lua rename to lua/lualine/themes/rose-pine.lua index 27eb028..239f353 100644 --- a/lua/lualine/themes/grace-rose-pine.lua +++ b/lua/lualine/themes/rose-pine.lua @@ -1,5 +1,5 @@ -local p = require('grace-rose-pine.palette') -local blend = require('grace-rose-pine.util').blend +local p = require('rose-pine.palette') +local blend = require('rose-pine.util').blend local mix = 0.08 diff --git a/lua/grace-rose-pine.lua b/lua/rose-pine.lua similarity index 63% rename from lua/grace-rose-pine.lua rename to lua/rose-pine.lua index 14e0883..bbfadb1 100644 --- a/lua/grace-rose-pine.lua +++ b/lua/rose-pine.lua @@ -1,4 +1,4 @@ -local config = require('grace-rose-pine.config') +local config = require('rose-pine.config') local M = {} ---@param options Config|nil @@ -12,9 +12,9 @@ function M.colorscheme(options) end vim.opt.termguicolors = true - vim.g.colors_name = 'grace-rose-pine' + vim.g.colors_name = 'rose-pine' - require('grace-rose-pine.theme')._load(config.options) + require('rose-pine.theme')._load(config.options) end M.setup = config.setup diff --git a/lua/grace-rose-pine/config.lua b/lua/rose-pine/config.lua similarity index 100% rename from lua/grace-rose-pine/config.lua rename to lua/rose-pine/config.lua diff --git a/lua/grace-rose-pine/palette.lua b/lua/rose-pine/palette.lua similarity index 96% rename from lua/grace-rose-pine/palette.lua rename to lua/rose-pine/palette.lua index 36ac7e8..397cd2c 100644 --- a/lua/grace-rose-pine/palette.lua +++ b/lua/rose-pine/palette.lua @@ -1,4 +1,4 @@ -local options = require('grace-rose-pine.config').options +local options = require('rose-pine.config').options local variants = { main = { diff --git a/lua/grace-rose-pine/plugins/bufferline.lua b/lua/rose-pine/plugins/bufferline.lua similarity index 97% rename from lua/grace-rose-pine/plugins/bufferline.lua rename to lua/rose-pine/plugins/bufferline.lua index cd86774..db722cf 100644 --- a/lua/grace-rose-pine/plugins/bufferline.lua +++ b/lua/rose-pine/plugins/bufferline.lua @@ -2,10 +2,10 @@ --- https://github.com/akinsho/bufferline.nvim --- --- @usage ---- local highlights = require('grace-rose-pine.plugins.bufferline') +--- local highlights = require('rose-pine.plugins.bufferline') --- require('bufferline').setup({ highlights = highlights }) -local p = require('grace-rose-pine.palette') +local p = require('rose-pine.palette') return { -- fill = { diff --git a/lua/grace-rose-pine/plugins/galaxyline.lua b/lua/rose-pine/plugins/galaxyline.lua similarity index 71% rename from lua/grace-rose-pine/plugins/galaxyline.lua rename to lua/rose-pine/plugins/galaxyline.lua index 1f04141..348559a 100644 --- a/lua/grace-rose-pine/plugins/galaxyline.lua +++ b/lua/rose-pine/plugins/galaxyline.lua @@ -2,9 +2,9 @@ --- https://github.com/NTBBloodbath/galaxyline.nvim --- --- @usage ---- local highlights = require('grace-rose-pine.plugins.galaxyline') +--- local highlights = require('rose-pine.plugins.galaxyline') -local p = require('grace-rose-pine.palette') +local p = require('rose-pine.palette') return { bg = p.surface, diff --git a/lua/grace-rose-pine/plugins/markid.lua b/lua/rose-pine/plugins/markid.lua similarity index 66% rename from lua/grace-rose-pine/plugins/markid.lua rename to lua/rose-pine/plugins/markid.lua index c660135..9279adb 100644 --- a/lua/grace-rose-pine/plugins/markid.lua +++ b/lua/rose-pine/plugins/markid.lua @@ -2,9 +2,9 @@ --- https://github.com/David-Kunz/markid --- --- @usage ---- local highlights = require('grace-rose-pine.plugins.markid') +--- local highlights = require('rose-pine.plugins.markid') --- require("nvim-treesitter.configs").setup({ markid = { enable = true, colors = highlights } }) -local p = require('grace-rose-pine.palette') +local p = require('rose-pine.palette') return { p.foam, p.rose, p.iris } diff --git a/lua/grace-rose-pine/plugins/toggleterm.lua b/lua/rose-pine/plugins/toggleterm.lua similarity index 85% rename from lua/grace-rose-pine/plugins/toggleterm.lua rename to lua/rose-pine/plugins/toggleterm.lua index 97ecfb6..38924f9 100644 --- a/lua/grace-rose-pine/plugins/toggleterm.lua +++ b/lua/rose-pine/plugins/toggleterm.lua @@ -2,7 +2,7 @@ --- https://github.com/akinsho/toggleterm.nvim --- --- @usage ---- local highlights = require('grace-rose-pine.plugins.toggleterm') +--- local highlights = require('rose-pine.plugins.toggleterm') --- require('toggleterm').setup({ highlights = highlights }) return { diff --git a/lua/grace-rose-pine/theme.lua b/lua/rose-pine/theme.lua similarity index 99% rename from lua/grace-rose-pine/theme.lua rename to lua/rose-pine/theme.lua index 8dec893..b9b5327 100644 --- a/lua/grace-rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -2,8 +2,8 @@ local M = {} ---@param options Config function M._load(options) - local h = require('grace-rose-pine.util').highlight - local p = require('grace-rose-pine.palette') + local h = require('rose-pine.util').highlight + local p = require('rose-pine.palette') local groups = options.groups or {} local maybe = { diff --git a/lua/grace-rose-pine/util.lua b/lua/rose-pine/util.lua similarity index 96% rename from lua/grace-rose-pine/util.lua rename to lua/rose-pine/util.lua index 8755da0..f8b84f9 100644 --- a/lua/grace-rose-pine/util.lua +++ b/lua/rose-pine/util.lua @@ -22,7 +22,7 @@ local function parse_color(color) color = color:lower() if not color:find('#') and color ~= 'none' then - color = require('grace-rose-pine.palette')[color] + color = require('rose-pine.palette')[color] or vim.api.nvim_get_color_by_name(color) end