fix!: move rename catppuccin colorscheme to catppuccin-nvim (#977)

* fix!: move rename `catppuccin` colorscheme to `catppuccin-nvim`

new builtin colorscheme name conflicts with the plugin name.
adding `-nvim` prefix to indicate the nvim port.

neovim/neovim@d436059

* doc: use new colorscheme name

* docs: auto generate vimdoc

Author: comfysage

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -88,6 +88,6 @@ body:
           root = root .. "/plugins",
         })
 
-        vim.cmd.colorscheme("catppuccin")
+        vim.cmd.colorscheme("catppuccin-nvim")
         -- add anything else here
       render: Lua

README.md

@@ -75,11 +75,11 @@ Plug 'catppuccin/nvim', { 'as': 'catppuccin' }
 ## Usage
 
 ```vim
-colorscheme catppuccin " catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha
+colorscheme catppuccin-nvim " catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha
 ```
 
 ```lua
-vim.cmd.colorscheme "catppuccin"
+vim.cmd.colorscheme "catppuccin-nvim"
 ```
 
 ## Configuration
@@ -160,7 +160,7 @@ require("catppuccin").setup({
 })
 
 -- setup must be called before loading
-vim.cmd.colorscheme "catppuccin"
+vim.cmd.colorscheme "catppuccin-nvim"
 ```
 
 ## Customization

colors/catppuccin.vim colors/catppuccin-nvim.vimcolors/catppuccin.vim renamed to colors/catppuccin-nvim.vim

@@ -53,11 +53,11 @@ vim-plug <https://github.com/junegunn/vim-plug>
 USAGE                                                       *catppuccin-usage*
 
 >vim
-    colorscheme catppuccin " catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha
+    colorscheme catppuccin-nvim " catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha
 <
 
 >lua
-    vim.cmd.colorscheme "catppuccin"
+    vim.cmd.colorscheme "catppuccin-nvim"
 <
 
 
@@ -140,7 +140,7 @@ options and settings.
     })
 
     -- setup must be called before loading
-    vim.cmd.colorscheme "catppuccin"
+    vim.cmd.colorscheme "catppuccin-nvim"
 <
 
 

doc/catppuccin.txt

@@ -253,7 +253,7 @@ vim.api.nvim_create_user_command("CatppuccinCompile", function()
 	end
 	M.compile()
 	vim.notify("Catppuccin (info): compiled cache!", vim.log.levels.INFO)
-	vim.cmd.colorscheme "catppuccin"
+	vim.cmd.colorscheme "catppuccin-nvim"
 end, {})
 
 if vim.g.catppuccin_debug then

lua/catppuccin/init.lua

@@ -9,7 +9,7 @@ end
 describe("set background to", function()
 	before_each(function()
 		reload()
-		vim.cmd.colorscheme "catppuccin"
+		vim.cmd.colorscheme "catppuccin-nvim"
 	end)
 	it("light", function()
 		vim.o.background = "light"
@@ -25,12 +25,12 @@ describe("respect vim.o.background =", function()
 	before_each(function() reload() end)
 	it("light", function()
 		vim.o.background = "light"
-		vim.cmd.colorscheme "catppuccin"
+		vim.cmd.colorscheme "catppuccin-nvim"
 		assert.equals("catppuccin-latte", vim.g.colors_name)
 	end)
 	it("dark", function()
 		vim.o.background = "dark"
-		vim.cmd.colorscheme "catppuccin"
+		vim.cmd.colorscheme "catppuccin-nvim"
 		assert.equals("catppuccin-mocha", vim.g.colors_name)
 	end)
 end)
@@ -59,22 +59,22 @@ describe("respect setup flavour =", function()
 	before_each(function() reload() end)
 	it("latte", function()
 		require("catppuccin").setup { flavour = "latte" }
-		vim.cmd.colorscheme "catppuccin"
+		vim.cmd.colorscheme "catppuccin-nvim"
 		assert.equals("catppuccin-latte", vim.g.colors_name)
 	end)
 	it("frappe", function()
 		require("catppuccin").setup { flavour = "frappe" }
-		vim.cmd.colorscheme "catppuccin"
+		vim.cmd.colorscheme "catppuccin-nvim"
 		assert.equals("catppuccin-frappe", vim.g.colors_name)
 	end)
 	it("macchiato", function()
 		require("catppuccin").setup { flavour = "macchiato" }
-		vim.cmd.colorscheme "catppuccin"
+		vim.cmd.colorscheme "catppuccin-nvim"
 		assert.equals("catppuccin-macchiato", vim.g.colors_name)
 	end)
 	it("mocha", function()
 		require("catppuccin").setup { flavour = "mocha" }
-		vim.cmd.colorscheme "catppuccin"
+		vim.cmd.colorscheme "catppuccin-nvim"
 		assert.equals("catppuccin-mocha", vim.g.colors_name)
 	end)
 end)
@@ -83,22 +83,22 @@ describe("(deprecated) respect vim.g.catppuccin_flavour =", function()
 	before_each(function() reload() end)
 	it("latte", function()
 		vim.g.catppuccin_flavour = "latte"
-		vim.cmd.colorscheme "catppuccin"
+		vim.cmd.colorscheme "catppuccin-nvim"
 		assert.equals("catppuccin-latte", vim.g.colors_name)
 	end)
 	it("frappe", function()
 		vim.g.catppuccin_flavour = "frappe"
-		vim.cmd.colorscheme "catppuccin"
+		vim.cmd.colorscheme "catppuccin-nvim"
 		assert.equals("catppuccin-frappe", vim.g.colors_name)
 	end)
 	it("macchiato", function()
 		vim.g.catppuccin_flavour = "macchiato"
-		vim.cmd.colorscheme "catppuccin"
+		vim.cmd.colorscheme "catppuccin-nvim"
 		assert.equals("catppuccin-macchiato", vim.g.colors_name)
 	end)
 	it("mocha", function()
 		vim.g.catppuccin_flavour = "mocha"
-		vim.cmd.colorscheme "catppuccin"
+		vim.cmd.colorscheme "catppuccin-nvim"
 		assert.equals("catppuccin-mocha", vim.g.colors_name)
 	end)
 end)

tests/flavour_spec.lua

@@ -20,7 +20,7 @@ local status, error = pcall(function()
 	})
 
 	require("catppuccin").setup()
-	vim.cmd.colorscheme "catppuccin"
+	vim.cmd.colorscheme "catppuccin-nvim"
 end)
 
 if error then print(error) end

tests/init.lua

@@ -4,7 +4,7 @@ try
 	call plug#end()
 
 	lua require("catppuccin").setup {}
-	colorscheme catppuccin
+  colorscheme catppuccin-nvim
 catch
 	echo v:exception
 	1cq