feat!: move colorschemes to extras

rafi · May 17, 2024 · be015b0 · be015b0
1 parent d86231c
commit be015b0
Show file tree

Hide file tree

Showing 10 changed files with 155 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -523,14 +523,6 @@ _Note_ that 95% of the plugins are **lazy-loaded**.
 | [rafi/theme-loader.nvim] | Use last-used colorscheme
 | [rafi/neo-hybrid.vim] | Modern dark colorscheme, hybrid improved
 | [rafi/awesome-colorschemes] | Awesome color-schemes
-| [AlexvZyl/nordic.nvim] | Nord for Neovim, but warmer and darker
-| [folke/tokyonight.nvim] | Clean, dark Neovim theme
-| [rebelot/kanagawa.nvim] | Inspired by the colors of the famous painting by Katsushika Hokusai
-| [olimorris/onedarkpro.nvim] | OneDarkPro theme
-| [EdenEast/nightfox.nvim] | Highly customizable theme
-| [nyoom-engineering/oxocarbon.nvim] | Dark and light theme inspired by IBM Carbon
-| [ribru17/bamboo.nvim] | Warm green theme
-| [catppuccin/nvim] | Soothing pastel theme
 
 ### Git Plugins
 
@@ -641,14 +633,6 @@ _Note_ that 95% of the plugins are **lazy-loaded**.
 [rafi/theme-loader.nvim]: https://github.com/rafi/theme-loader.nvim
 [rafi/neo-hybrid.vim]: https://github.com/rafi/neo-hybrid.vim
 [rafi/awesome-colorschemes]: https://github.com/rafi/awesome-vim-colorschemes
-[AlexvZyl/nordic.nvim]: https://github.com/AlexvZyl/nordic.nvim
-[folke/tokyonight.nvim]: https://github.com/folke/tokyonight.nvim
-[rebelot/kanagawa.nvim]: https://github.com/rebelot/kanagawa.nvim
-[olimorris/onedarkpro.nvim]: https://github.com/olimorris/onedarkpro.nvim
-[EdenEast/nightfox.nvim]: https://github.com/EdenEast/nightfox.nvim
-[nyoom-engineering/oxocarbon.nvim]: https://github.com/nyoom-engineering/oxocarbon.nvim
-[ribru17/bamboo.nvim]: https://github.com/ribru17/bamboo.nvim
-[catppuccin/nvim]: https://github.com/catppuccin/nvim
 
 [lewis6991/gitsigns.nvim]: https://github.com/lewis6991/gitsigns.nvim
 [sindrets/diffview.nvim]: https://github.com/sindrets/diffview.nvim
@@ -737,6 +721,30 @@ Spec: `rafi.plugins.extras.coding.<name>`
 [danymat/neogen]: https://github.com/danymat/neogen
 [machakann/vim-sandwich]: https://github.com/machakann/vim-sandwich
 
+### Extra Plugins: Colorscheme
+
+Spec: `rafi.plugins.extras.colorscheme.<name>`
+
+| Name | Repository | Description
+| -------------- | -------------- | ----------------------
+| `nordic` | [AlexvZyl/nordic.nvim] | Nord for Neovim, but warmer and darker
+| `tokyonight` | [folke/tokyonight.nvim] | Clean, dark Neovim theme
+| `kanagawa` | [rebelot/kanagawa.nvim] | Inspired by the colors of the famous painting by Katsushika Hokusai
+| `onedarkpro` | [olimorris/onedarkpro.nvim] | OneDarkPro theme
+| `nightfox` | [EdenEast/nightfox.nvim] | Highly customizable theme
+| `oxocarbon` | [nyoom-engineering/oxocarbon.nvim] | Dark and light theme inspired by IBM Carbon
+| `bamboo` | [ribru17/bamboo.nvim] | Warm green theme
+| `catppuccin` | [catppuccin/nvim] | Soothing pastel theme
+
+[AlexvZyl/nordic.nvim]: https://github.com/AlexvZyl/nordic.nvim
+[folke/tokyonight.nvim]: https://github.com/folke/tokyonight.nvim
+[rebelot/kanagawa.nvim]: https://github.com/rebelot/kanagawa.nvim
+[olimorris/onedarkpro.nvim]: https://github.com/olimorris/onedarkpro.nvim
+[EdenEast/nightfox.nvim]: https://github.com/EdenEast/nightfox.nvim
+[nyoom-engineering/oxocarbon.nvim]: https://github.com/nyoom-engineering/oxocarbon.nvim
+[ribru17/bamboo.nvim]: https://github.com/ribru17/bamboo.nvim
+[catppuccin/nvim]: https://github.com/catppuccin/nvim
+
 ### Extra Plugins: Editor
 
 Spec: `rafi.plugins.extras.editor.<name>`

diff --git a/lua/rafi/plugins/colorscheme.lua b/lua/rafi/plugins/colorscheme.lua
@@ -13,64 +13,5 @@ return {
 
  { 'rafi/neo-hybrid.vim', priority = 100, lazy = false },
  { 'rafi/awesome-vim-colorschemes', lazy = false },
- { 'AlexvZyl/nordic.nvim' },
- { 'folke/tokyonight.nvim', opts = { style = 'night' } },
- { 'rebelot/kanagawa.nvim' },
- { 'olimorris/onedarkpro.nvim' },
- { 'EdenEast/nightfox.nvim' },
- { 'nyoom-engineering/oxocarbon.nvim' },
 
- {
- 'ribru17/bamboo.nvim',
- config = function()
- require('bamboo').setup({})
- require('bamboo').load()
- end,
- },
-
- -- Soothing pastel theme
- {
- 'catppuccin/nvim',
- lazy = true,
- name = 'catppuccin',
- opts = {
- flavour = 'macchiato', -- latte, frappe, macchiato, mocha
- dim_inactive = { enabled = false },
- integrations = {
- aerial = true,
- alpha = true,
- cmp = true,
- dashboard = true,
- flash = true,
- gitsigns = true,
- headlines = true,
- illuminate = true,
- indent_blankline = { enabled = true },
- leap = true,
- lsp_trouble = true,
- mason = true,
- markdown = true,
- mini = true,
- native_lsp = {
- enabled = true,
- underlines = {
- errors = { 'undercurl' },
- hints = { 'undercurl' },
- warnings = { 'undercurl' },
- information = { 'undercurl' },
- },
- },
- navic = { enabled = true, custom_bg = 'lualine' },
- neotest = true,
- neotree = true,
- noice = true,
- notify = true,
- semantic_tokens = true,
- telescope = true,
- treesitter = true,
- treesitter_context = true,
- which_key = true,
- },
- },
- },
 }
diff --git a/lua/rafi/plugins/extras/colorscheme/bamboo.lua b/lua/rafi/plugins/extras/colorscheme/bamboo.lua
@@ -0,0 +1,9 @@
+return {
+
+ -- Warm green theme
+ {
+ 'ribru17/bamboo.nvim',
+ opts = {},
+ },
+
+}
diff --git a/lua/rafi/plugins/extras/colorscheme/catppuccin.lua b/lua/rafi/plugins/extras/colorscheme/catppuccin.lua
@@ -0,0 +1,49 @@
+return {
+
+ -- Soothing pastel theme
+ {
+ 'catppuccin/nvim',
+ lazy = false,
+ priority = 1000,
+ name = 'catppuccin',
+ opts = {
+ flavour = 'macchiato', -- latte, frappe, macchiato, mocha
+ dim_inactive = { enabled = false },
+ integrations = {
+ aerial = true,
+ alpha = true,
+ cmp = true,
+ dashboard = true,
+ flash = true,
+ gitsigns = true,
+ headlines = true,
+ illuminate = true,
+ indent_blankline = { enabled = true },
+ leap = true,
+ lsp_trouble = true,
+ mason = true,
+ markdown = true,
+ mini = true,
+ native_lsp = {
+ enabled = true,
+ underlines = {
+ errors = { 'undercurl' },
+ hints = { 'undercurl' },
+ warnings = { 'undercurl' },
+ information = { 'undercurl' },
+ },
+ },
+ navic = { enabled = true, custom_bg = 'lualine' },
+ neotest = true,
+ neotree = true,
+ noice = true,
+ notify = true,
+ semantic_tokens = true,
+ telescope = true,
+ treesitter = true,
+ treesitter_context = true,
+ which_key = true,
+ },
+ },
+ },
+}
diff --git a/lua/rafi/plugins/extras/colorscheme/cyberdream.lua b/lua/rafi/plugins/extras/colorscheme/cyberdream.lua
@@ -0,0 +1,15 @@
+return {
+
+ -- High-contrast, futuristic & vibrant colorsheme
+ {
+ 'scottmckendry/cyberdream.nvim',
+ priority = 1000,
+ opts = {
+ transparent = true,
+ italic_comments = true,
+ hide_fillchars = false,
+ borderless_telescope = true,
+ terminal_colors = true,
+ },
+ },
+}
diff --git a/lua/rafi/plugins/extras/colorscheme/github.lua b/lua/rafi/plugins/extras/colorscheme/github.lua
@@ -0,0 +1,9 @@
+return {
+
+ -- Github's Neovim themes
+ {
+ 'projekt0n/github-nvim-theme',
+ name = 'github-theme',
+ opts = {},
+ },
+}
diff --git a/lua/rafi/plugins/extras/colorscheme/juliana.lua b/lua/rafi/plugins/extras/colorscheme/juliana.lua
@@ -0,0 +1,8 @@
+return {
+
+ -- Port of Sublime's Mariana theme for short attention span developers.
+ {
+ 'kaiuri/nvim-juliana',
+ opts = {},
+ },
+}
diff --git a/lua/rafi/plugins/extras/colorscheme/kanagawa.lua b/lua/rafi/plugins/extras/colorscheme/kanagawa.lua
@@ -0,0 +1,8 @@
+return {
+
+ -- Colorscheme inspired by the colors of the famous painting by Katsushika
+ -- Hokusai.
+ {
+ 'rebelot/kanagawa.nvim',
+ },
+}
diff --git a/lua/rafi/plugins/extras/colorscheme/monokai-pro.lua b/lua/rafi/plugins/extras/colorscheme/monokai-pro.lua
@@ -0,0 +1,23 @@
+return {
+
+ -- Monokai Pro theme with multiple filters: Pro, Classic, Machine, Octagon,
+ -- Ristretto, Spectrum.
+ {
+ 'loctvl842/monokai-pro.nvim',
+ lazy = false,
+ priority = 1000,
+ opts = {
+ filter = 'pro', -- classic | octagon | pro | machine | ristretto | spectrum
+ plugins = {
+ bufferline = {
+ underline_selected = false,
+ underline_visible = false,
+ },
+ indent_blankline = {
+ context_highlight = 'pro', -- default | pro
+ context_start_underline = false,
+ },
+ },
+ },
+ },
+}
diff --git a/lua/rafi/plugins/extras/colorscheme/tokyonight.lua b/lua/rafi/plugins/extras/colorscheme/tokyonight.lua
@@ -0,0 +1,10 @@
+return {
+
+ -- A dark and light theme ported from the Visual Studio Code TokyoNight theme.
+ {
+ 'folke/tokyonight.nvim',
+ opts = {
+ style = 'night',
+ },
+ },
+}