From 91e2adfa2c663b1b879aecf61ba57a49c8dc5bd7 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 9 Oct 2021 17:30:15 +0800 Subject: [PATCH] neovim -> neobones --- README.md | 2 +- .../{neovim_dark.vim => neobones_dark.vim} | 0 .../{neovim_light.vim => neobones_light.vim} | 0 colors/neobones.lua | 10 ++++++++ colors/neovim.lua | 10 -------- colors/rosebones.lua | 2 +- doc/zenbones.md | 2 +- doc/zenbones.txt | 2 +- .../{neovim_dark.yml => neobones_dark.yml} | 2 +- .../{neovim_light.yml => neobones_light.yml} | 2 +- ....itermcolors => neobones_dark.itermcolors} | 0 ...itermcolors => neobones_light.itermcolors} | 0 .../{neovim_dark.conf => neobones_dark.conf} | 4 ++-- ...{neovim_light.conf => neobones_light.conf} | 4 ++-- .../{neovim_dark.tmux => neobones_dark.tmux} | 0 ...{neovim_light.tmux => neobones_light.tmux} | 0 .../{Neovim_dark.toml => Neobones_dark.toml} | 2 +- ...{Neovim_light.toml => Neobones_light.toml} | 2 +- .../{neovim_dark.lua => neobones_dark.lua} | 0 .../{neovim_light.lua => neobones_light.lua} | 0 lua/lualine/themes/neovim.lua | 3 --- lua/zenbones/build.lua | 24 +++++++++---------- lua/zenbones/{neovim => neobones}/init.lua | 2 +- lua/zenbones/{neovim => neobones}/palette.lua | 0 lua/zenbones/{neovim => neobones}/term.lua | 2 +- 25 files changed, 36 insertions(+), 39 deletions(-) rename autoload/lightline/colorscheme/{neovim_dark.vim => neobones_dark.vim} (100%) rename autoload/lightline/colorscheme/{neovim_light.vim => neobones_light.vim} (100%) create mode 100644 colors/neobones.lua delete mode 100644 colors/neovim.lua rename extras/alacritty/{neovim_dark.yml => neobones_dark.yml} (94%) rename extras/alacritty/{neovim_light.yml => neobones_light.yml} (94%) rename extras/iterm/{neovim_dark.itermcolors => neobones_dark.itermcolors} (100%) rename extras/iterm/{neovim_light.itermcolors => neobones_light.itermcolors} (100%) rename extras/kitty/{neovim_dark.conf => neobones_dark.conf} (93%) rename extras/kitty/{neovim_light.conf => neobones_light.conf} (93%) rename extras/tmux/{neovim_dark.tmux => neobones_dark.tmux} (100%) rename extras/tmux/{neovim_light.tmux => neobones_light.tmux} (100%) rename extras/wezterm/{Neovim_dark.toml => Neobones_dark.toml} (96%) rename extras/wezterm/{Neovim_light.toml => Neobones_light.toml} (96%) rename lua/lualine/themes/{neovim_dark.lua => neobones_dark.lua} (100%) rename lua/lualine/themes/{neovim_light.lua => neobones_light.lua} (100%) delete mode 100644 lua/lualine/themes/neovim.lua rename lua/zenbones/{neovim => neobones}/init.lua (92%) rename lua/zenbones/{neovim => neobones}/palette.lua (100%) rename lua/zenbones/{neovim => neobones}/term.lua (93%) diff --git a/README.md b/README.md index 321d47f..2a104f3 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ colorscheme zenbones-lush colorscheme zenflesh-lush " https://neovim.io flavor -colorscheme neovim +colorscheme neobones " Rosé Pine flavor - https://rosepinetheme.com colorscheme rosebones ``` diff --git a/autoload/lightline/colorscheme/neovim_dark.vim b/autoload/lightline/colorscheme/neobones_dark.vim similarity index 100% rename from autoload/lightline/colorscheme/neovim_dark.vim rename to autoload/lightline/colorscheme/neobones_dark.vim diff --git a/autoload/lightline/colorscheme/neovim_light.vim b/autoload/lightline/colorscheme/neobones_light.vim similarity index 100% rename from autoload/lightline/colorscheme/neovim_light.vim rename to autoload/lightline/colorscheme/neobones_light.vim diff --git a/colors/neobones.lua b/colors/neobones.lua new file mode 100644 index 0000000..4448bff --- /dev/null +++ b/colors/neobones.lua @@ -0,0 +1,10 @@ +vim.g.colors_name = "neobones" + +-- reset specs +package.loaded["zenbones.neobones"] = nil + +-- include our theme file and pass it to lush to apply +require "lush"(require "zenbones.neobones") + +local base_name = require("zenbones.util").bg_to_base_name() +require("zenbones.neobones.term").setup(base_name) diff --git a/colors/neovim.lua b/colors/neovim.lua deleted file mode 100644 index 104a149..0000000 --- a/colors/neovim.lua +++ /dev/null @@ -1,10 +0,0 @@ -vim.g.colors_name = "neovim" - --- reset specs -package.loaded["zenbones.neovim"] = nil - --- include our theme file and pass it to lush to apply -require "lush"(require "zenbones.neovim") - -local base_name = require("zenbones.util").bg_to_base_name() -require("zenbones.neovim.term").setup(base_name) diff --git a/colors/rosebones.lua b/colors/rosebones.lua index a40798b..6c161aa 100644 --- a/colors/rosebones.lua +++ b/colors/rosebones.lua @@ -10,4 +10,4 @@ local base_name = util.bg_to_base_name() require "lush"(require "zenbones.rosebones") local base_name = require("zenbones.util").bg_to_base_name() -require("zenbones.neovim.term").setup(base_name) +require("zenbones.rosebones.term").setup(base_name) diff --git a/doc/zenbones.md b/doc/zenbones.md index e72eff7..95fc23e 100644 --- a/doc/zenbones.md +++ b/doc/zenbones.md @@ -21,7 +21,7 @@ colorscheme zenbones-lush colorscheme zenflesh-lush " https://neovim.io flavor -colorscheme neovim +colorscheme neobones " Rosé Pine flavor - https://rosepinetheme.com colorscheme rosebones ``` diff --git a/doc/zenbones.txt b/doc/zenbones.txt index bb22fc9..180e80c 100644 --- a/doc/zenbones.txt +++ b/doc/zenbones.txt @@ -33,7 +33,7 @@ If you want to make use of the lua version: colorscheme zenflesh-lush " https://neovim.io flavor - colorscheme neovim + colorscheme neobones " Rosé Pine flavor - https://rosepinetheme.com colorscheme rosebones < diff --git a/extras/alacritty/neovim_dark.yml b/extras/alacritty/neobones_dark.yml similarity index 94% rename from extras/alacritty/neovim_dark.yml rename to extras/alacritty/neobones_dark.yml index c17d00e..7220d00 100644 --- a/extras/alacritty/neovim_dark.yml +++ b/extras/alacritty/neobones_dark.yml @@ -1,5 +1,5 @@ # This file is auto-generated from lua/zenbones/template/alacritty.lua -# neovim_dark alacritty colors +# neobones_dark alacritty colors colors: # Default colors primary: diff --git a/extras/alacritty/neovim_light.yml b/extras/alacritty/neobones_light.yml similarity index 94% rename from extras/alacritty/neovim_light.yml rename to extras/alacritty/neobones_light.yml index 92e1351..16f6e79 100644 --- a/extras/alacritty/neovim_light.yml +++ b/extras/alacritty/neobones_light.yml @@ -1,5 +1,5 @@ # This file is auto-generated from lua/zenbones/template/alacritty.lua -# neovim_light alacritty colors +# neobones_light alacritty colors colors: # Default colors primary: diff --git a/extras/iterm/neovim_dark.itermcolors b/extras/iterm/neobones_dark.itermcolors similarity index 100% rename from extras/iterm/neovim_dark.itermcolors rename to extras/iterm/neobones_dark.itermcolors diff --git a/extras/iterm/neovim_light.itermcolors b/extras/iterm/neobones_light.itermcolors similarity index 100% rename from extras/iterm/neovim_light.itermcolors rename to extras/iterm/neobones_light.itermcolors diff --git a/extras/kitty/neovim_dark.conf b/extras/kitty/neobones_dark.conf similarity index 93% rename from extras/kitty/neovim_dark.conf rename to extras/kitty/neobones_dark.conf index 5114ed7..0aaec3d 100644 --- a/extras/kitty/neovim_dark.conf +++ b/extras/kitty/neobones_dark.conf @@ -1,9 +1,9 @@ # This file is auto-generated from lua/zenbones/template/kitty.lua # vim:ft=kitty -## name: neovim_dark +## name: neobones_dark ## license: MIT ## author: Michael Chris Lopez -## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/neovim_dark.conf +## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/neobones_dark.conf background #0F191F foreground #C6D5CF diff --git a/extras/kitty/neovim_light.conf b/extras/kitty/neobones_light.conf similarity index 93% rename from extras/kitty/neovim_light.conf rename to extras/kitty/neobones_light.conf index fc619e2..7d6891d 100644 --- a/extras/kitty/neovim_light.conf +++ b/extras/kitty/neobones_light.conf @@ -1,9 +1,9 @@ # This file is auto-generated from lua/zenbones/template/kitty.lua # vim:ft=kitty -## name: neovim_light +## name: neobones_light ## license: MIT ## author: Michael Chris Lopez -## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/neovim_light.conf +## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/neobones_light.conf background #E5EDE6 foreground #202E18 diff --git a/extras/tmux/neovim_dark.tmux b/extras/tmux/neobones_dark.tmux similarity index 100% rename from extras/tmux/neovim_dark.tmux rename to extras/tmux/neobones_dark.tmux diff --git a/extras/tmux/neovim_light.tmux b/extras/tmux/neobones_light.tmux similarity index 100% rename from extras/tmux/neovim_light.tmux rename to extras/tmux/neobones_light.tmux diff --git a/extras/wezterm/Neovim_dark.toml b/extras/wezterm/Neobones_dark.toml similarity index 96% rename from extras/wezterm/Neovim_dark.toml rename to extras/wezterm/Neobones_dark.toml index 4c1aba5..5406d5b 100644 --- a/extras/wezterm/Neovim_dark.toml +++ b/extras/wezterm/Neobones_dark.toml @@ -1,5 +1,5 @@ # This file is auto-generated from lua/zenbones/template/wezterm.lua -# Neovim_dark +# Neobones_dark [colors] foreground = "#C6D5CF" background = "#0F191F" diff --git a/extras/wezterm/Neovim_light.toml b/extras/wezterm/Neobones_light.toml similarity index 96% rename from extras/wezterm/Neovim_light.toml rename to extras/wezterm/Neobones_light.toml index e31325a..874f71f 100644 --- a/extras/wezterm/Neovim_light.toml +++ b/extras/wezterm/Neobones_light.toml @@ -1,5 +1,5 @@ # This file is auto-generated from lua/zenbones/template/wezterm.lua -# Neovim_light +# Neobones_light [colors] foreground = "#202E18" background = "#E5EDE6" diff --git a/lua/lualine/themes/neovim_dark.lua b/lua/lualine/themes/neobones_dark.lua similarity index 100% rename from lua/lualine/themes/neovim_dark.lua rename to lua/lualine/themes/neobones_dark.lua diff --git a/lua/lualine/themes/neovim_light.lua b/lua/lualine/themes/neobones_light.lua similarity index 100% rename from lua/lualine/themes/neovim_light.lua rename to lua/lualine/themes/neobones_light.lua diff --git a/lua/lualine/themes/neovim.lua b/lua/lualine/themes/neovim.lua deleted file mode 100644 index 3f1e7d9..0000000 --- a/lua/lualine/themes/neovim.lua +++ /dev/null @@ -1,3 +0,0 @@ -local background = vim.opt.background:get() - -return require("lualine.themes.neovim_" .. background) diff --git a/lua/zenbones/build.lua b/lua/zenbones/build.lua index 156c077..2e95a71 100644 --- a/lua/zenbones/build.lua +++ b/lua/zenbones/build.lua @@ -57,25 +57,25 @@ local function build() ) vim.api.nvim_del_var "zenflesh_darkness" - -- neovim light - package.loaded["zenbones.neovim"] = nil + -- neobones light + package.loaded["zenbones.neobones"] = nil vim.opt.background = "light" util.build( - "neovim_light", - require "zenbones.neovim", - require "zenbones.neovim.palette", - require("zenbones.neovim.term").colors.zenbones, + "neobones_light", + require "zenbones.neobones", + require "zenbones.neobones.palette", + require("zenbones.neobones.term").colors.zenbones, { exclude = { "vim" } } ) - -- neovim dark - package.loaded["zenbones.neovim"] = nil + -- neobones dark + package.loaded["zenbones.neobones"] = nil vim.opt.background = "dark" util.build( - "neovim_dark", - require "zenbones.neovim", - require "zenbones.neovim.palette", - require("zenbones.neovim.term").colors.zenflesh, + "neobones_dark", + require "zenbones.neobones", + require "zenbones.neobones.palette", + require("zenbones.neobones.term").colors.zenflesh, { exclude = { "vim" } } ) end diff --git a/lua/zenbones/neovim/init.lua b/lua/zenbones/neobones/init.lua similarity index 92% rename from lua/zenbones/neovim/init.lua rename to lua/zenbones/neobones/init.lua index ac6582d..4f37079 100644 --- a/lua/zenbones/neovim/init.lua +++ b/lua/zenbones/neobones/init.lua @@ -3,7 +3,7 @@ local util = require "zenbones.util" local hsluv = lush.hsluv local base_name = util.bg_to_base_name() -local p = require("zenbones.neovim.palette")[base_name] +local p = require("zenbones.neobones.palette")[base_name] local specs = require(base_name .. ".specs").generate(p, util.resolve_config(base_name)) diff --git a/lua/zenbones/neovim/palette.lua b/lua/zenbones/neobones/palette.lua similarity index 100% rename from lua/zenbones/neovim/palette.lua rename to lua/zenbones/neobones/palette.lua diff --git a/lua/zenbones/neovim/term.lua b/lua/zenbones/neobones/term.lua similarity index 93% rename from lua/zenbones/neovim/term.lua rename to lua/zenbones/neobones/term.lua index a2fd297..3170b39 100644 --- a/lua/zenbones/neovim/term.lua +++ b/lua/zenbones/neobones/term.lua @@ -1,4 +1,4 @@ -local palette = require "zenbones.neovim.palette" +local palette = require "zenbones.neobones.palette" local M = { colors = {} }