Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(catppuccin): enable catppuccin integrations automatically #457

Merged
merged 1 commit into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lua/astrocommunity/bars-and-lines/dropbar-nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,9 @@ return {
optional = true,
opts = function(_, opts) opts.winbar = nil end,
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { dropbar = { enabled = true } } },
},
}
15 changes: 11 additions & 4 deletions lua/astrocommunity/bars-and-lines/vim-illuminate/init.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
return {
"RRethy/vim-illuminate",
event = "User AstroFile",
opts = {},
config = function(_, opts) require("illuminate").configure(opts) end,
{
"RRethy/vim-illuminate",
event = "User AstroFile",
opts = {},
config = function(_, opts) require("illuminate").configure(opts) end,
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { illuminate = true } },
},
}
5 changes: 5 additions & 0 deletions lua/astrocommunity/code-runner/overseer-nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,9 @@ return {
},
opts = {},
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { overseer = true } },
},
}
15 changes: 11 additions & 4 deletions lua/astrocommunity/color/headlines-nvim/init.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
return {
"lukas-reineke/headlines.nvim",
dependencies = "nvim-treesitter/nvim-treesitter",
ft = { "markdown", "norg", "org", "rmd" },
opts = {},
{
"lukas-reineke/headlines.nvim",
dependencies = "nvim-treesitter/nvim-treesitter",
ft = { "markdown", "norg", "org", "rmd" },
opts = {},
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { headlines = true } },
},
}
13 changes: 10 additions & 3 deletions lua/astrocommunity/color/mini-hipatterns/init.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
return {
"echasnovski/mini.hipatterns",
event = "User AstroFile",
opts = {},
{
"echasnovski/mini.hipatterns",
event = "User AstroFile",
opts = {},
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { mini = true } },
},
}
9 changes: 8 additions & 1 deletion lua/astrocommunity/colorscheme/mini-base16/init.lua
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
return { "echasnovski/mini.base16" }
return {
"echasnovski/mini.base16",
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { mini = true } },
},
}
5 changes: 5 additions & 0 deletions lua/astrocommunity/comment/mini-comment/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,9 @@ return {
},
},
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { mini = true } },
},
}
5 changes: 5 additions & 0 deletions lua/astrocommunity/diagnostics/trouble-nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,9 @@ return {
table.insert(opts.bottom, "Trouble")
end,
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { lsp_trouble = true } },
},
}
13 changes: 10 additions & 3 deletions lua/astrocommunity/editing-support/mini-splitjoin/init.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
return {
"echasnovski/mini.splitjoin",
event = "User AstroFile",
opts = {},
{
"echasnovski/mini.splitjoin",
event = "User AstroFile",
opts = {},
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { mini = true } },
},
}
45 changes: 26 additions & 19 deletions lua/astrocommunity/editing-support/nvim-ts-rainbow/init.lua
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
return {
"nvim-treesitter/nvim-treesitter",
dependencies = {
"mrjones2014/nvim-ts-rainbow",
init = function()
require("astronvim.utils").notify(
"`nvim-ts-rainbow` is deprecated!\nPlease use `rainbow-delimiters`",
vim.log.levels.WARN
)
end,
config = function()
-- HACK: https://github.com/p00f/nvim-ts-rainbow/issues/112#issuecomment-1310835936
vim.api.nvim_create_autocmd({ "BufWritePost", "FocusGained" }, {
callback = function()
vim.cmd "TSDisable rainbow"
vim.cmd "TSEnable rainbow"
end,
})
end,
{
"nvim-treesitter/nvim-treesitter",
dependencies = {
"mrjones2014/nvim-ts-rainbow",
init = function()
require("astronvim.utils").notify(
"`nvim-ts-rainbow` is deprecated!\nPlease use `rainbow-delimiters`",
vim.log.levels.WARN
)
end,
config = function()
-- HACK: https://github.com/p00f/nvim-ts-rainbow/issues/112#issuecomment-1310835936
vim.api.nvim_create_autocmd({ "BufWritePost", "FocusGained" }, {
callback = function()
vim.cmd "TSDisable rainbow"
vim.cmd "TSEnable rainbow"
end,
})
end,
},
opts = { rainbow = { enable = true } },
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { ts_rainbow = true } },
},
opts = { rainbow = { enable = true } },
}
27 changes: 17 additions & 10 deletions lua/astrocommunity/editing-support/nvim-ts-rainbow2/init.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
return {
"nvim-treesitter/nvim-treesitter",
dependencies = {
"HiPhish/nvim-ts-rainbow2",
init = function()
require("astronvim.utils").notify(
"`nvim-ts-rainbow2` is deprecated!\nPlease use `rainbow-delimiters`",
vim.log.levels.WARN
)
end,
{
"nvim-treesitter/nvim-treesitter",
dependencies = {
"HiPhish/nvim-ts-rainbow2",
init = function()
require("astronvim.utils").notify(
"`nvim-ts-rainbow2` is deprecated!\nPlease use `rainbow-delimiters`",
vim.log.levels.WARN
)
end,
},
opts = { rainbow = { enable = true } },
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { ts_rainbow2 = true } },
},
opts = { rainbow = { enable = true } },
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
return {
"HiPhish/rainbow-delimiters.nvim",
dependencies = "nvim-treesitter/nvim-treesitter",
event = "User AstroFile",
config = function(_, opts) require "rainbow-delimiters.setup"(opts) end,
{
"HiPhish/rainbow-delimiters.nvim",
dependencies = "nvim-treesitter/nvim-treesitter",
event = "User AstroFile",
config = function(_, opts) require "rainbow-delimiters.setup"(opts) end,
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { rainbow_delimiters = true } },
},
}
5 changes: 5 additions & 0 deletions lua/astrocommunity/file-explorer/mini-files/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,9 @@ return {
},
opts = {},
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { mini = true } },
},
}
129 changes: 68 additions & 61 deletions lua/astrocommunity/git/octo-nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,75 +14,82 @@ maps.n[prefix .. "e"] = { desc = "Reaction" }
maps.n[prefix .. "s"] = { desc = "Review" }
require("astronvim.utils").set_mappings(maps)
return {
"pwntester/octo.nvim",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-telescope/telescope.nvim",
"nvim-tree/nvim-web-devicons",
},
cmd = { "Octo" },
opts = {
use_diagnostic_signs = true,
mappings = {},
},
keys = {
{ prefix .. "ca", "<cmd>Octo comment add<CR>", desc = "Add a new comment" },
{ prefix .. "cd", "<cmd>Octo comment delete<CR>", desc = "Delete a comment" },
{
"pwntester/octo.nvim",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-telescope/telescope.nvim",
"nvim-tree/nvim-web-devicons",
},
cmd = { "Octo" },
opts = {
use_diagnostic_signs = true,
mappings = {},
},
keys = {
{ prefix .. "ca", "<cmd>Octo comment add<CR>", desc = "Add a new comment" },
{ prefix .. "cd", "<cmd>Octo comment delete<CR>", desc = "Delete a comment" },

{ prefix .. "ta", "<cmd>Octo thread resolve<CR>", desc = "Mark thread as resolved" },
{ prefix .. "td", "<cmd>Octo thread unresolve<CR>", desc = "Mark thread as unresolved" },
{ prefix .. "ta", "<cmd>Octo thread resolve<CR>", desc = "Mark thread as resolved" },
{ prefix .. "td", "<cmd>Octo thread unresolve<CR>", desc = "Mark thread as unresolved" },

{ prefix .. "ic", "<cmd>Octo issue close<CR>", desc = "Close current issue" },
{ prefix .. "ir", "<cmd>Octo issue reopen<CR>", desc = "Reopen current issue" },
{ prefix .. "il", "<cmd>Octo issue list<CR>", desc = "List open issues" },
{ prefix .. "iu", "<cmd>Octo issue url<CR>", desc = "Copies URL of current issue" },
{ prefix .. "io", "<cmd>Octo issue browser<CR>", desc = "Open current issue in browser" },
{ prefix .. "ic", "<cmd>Octo issue close<CR>", desc = "Close current issue" },
{ prefix .. "ir", "<cmd>Octo issue reopen<CR>", desc = "Reopen current issue" },
{ prefix .. "il", "<cmd>Octo issue list<CR>", desc = "List open issues" },
{ prefix .. "iu", "<cmd>Octo issue url<CR>", desc = "Copies URL of current issue" },
{ prefix .. "io", "<cmd>Octo issue browser<CR>", desc = "Open current issue in browser" },

{ prefix .. "pp", "<cmd>Octo pr checkout<CR>", desc = "Checkout PR" },
{ prefix .. "pmm", "<cmd>Octo pr merge commit<CR>", desc = "Merge commit PR" },
{ prefix .. "pms", "<cmd>Octo pr merge squash<CR>", desc = "Squash merge PR" },
{ prefix .. "pmd", "<cmd>Octo pr merge delete<CR>", desc = "Delete merge PR" },
{ prefix .. "pmr", "<cmd>Octo pr merge rebase<CR>", desc = "Rebase merge PR" },
{ prefix .. "pc", "<cmd>Octo pr close<CR>", desc = "Close current PR" },
{ prefix .. "pn", "<cmd>Octo pr create<CR>", desc = "Create PR for current branch" },
{ prefix .. "pd", "<cmd>Octo pr diff<CR>", desc = "Show PR diff" },
{ prefix .. "ps", "<cmd>Octo pr list<CR>", desc = "List open PRs" },
{ prefix .. "pr", "<cmd>Octo pr ready<CR>", desc = "Mark draft as ready for review" },
{ prefix .. "po", "<cmd>Octo pr browser<CR>", desc = "Open current PR in browser" },
{ prefix .. "pu", "<cmd>Octo pr url<CR>", desc = "Copies URL of current PR" },
{ prefix .. "pt", "<cmd>Octo pr commits<CR>", desc = "List PR commits" },
{ prefix .. "pl", "<cmd>Octo pr commits<CR>", desc = "List changed files in PR" },
{ prefix .. "pp", "<cmd>Octo pr checkout<CR>", desc = "Checkout PR" },
{ prefix .. "pmm", "<cmd>Octo pr merge commit<CR>", desc = "Merge commit PR" },
{ prefix .. "pms", "<cmd>Octo pr merge squash<CR>", desc = "Squash merge PR" },
{ prefix .. "pmd", "<cmd>Octo pr merge delete<CR>", desc = "Delete merge PR" },
{ prefix .. "pmr", "<cmd>Octo pr merge rebase<CR>", desc = "Rebase merge PR" },
{ prefix .. "pc", "<cmd>Octo pr close<CR>", desc = "Close current PR" },
{ prefix .. "pn", "<cmd>Octo pr create<CR>", desc = "Create PR for current branch" },
{ prefix .. "pd", "<cmd>Octo pr diff<CR>", desc = "Show PR diff" },
{ prefix .. "ps", "<cmd>Octo pr list<CR>", desc = "List open PRs" },
{ prefix .. "pr", "<cmd>Octo pr ready<CR>", desc = "Mark draft as ready for review" },
{ prefix .. "po", "<cmd>Octo pr browser<CR>", desc = "Open current PR in browser" },
{ prefix .. "pu", "<cmd>Octo pr url<CR>", desc = "Copies URL of current PR" },
{ prefix .. "pt", "<cmd>Octo pr commits<CR>", desc = "List PR commits" },
{ prefix .. "pl", "<cmd>Octo pr commits<CR>", desc = "List changed files in PR" },

{ prefix .. "rl", "<cmd>Octo repo list<CR>", desc = "List repo user stats" },
{ prefix .. "rf", "<cmd>Octo repo fork<CR>", desc = "Fork repo" },
{ prefix .. "ro", "<cmd>Octo repo open<CR>", desc = "Open current repo in browser" },
{ prefix .. "ru", "<cmd>Octo repo url<CR>", desc = "Copies URL of current repo" },
{ prefix .. "rl", "<cmd>Octo repo list<CR>", desc = "List repo user stats" },
{ prefix .. "rf", "<cmd>Octo repo fork<CR>", desc = "Fork repo" },
{ prefix .. "ro", "<cmd>Octo repo open<CR>", desc = "Open current repo in browser" },
{ prefix .. "ru", "<cmd>Octo repo url<CR>", desc = "Copies URL of current repo" },

{ prefix .. "aa", "<cmd> Octo assignee add<CR>", desc = "Assign a user" },
{ prefix .. "ar", "<cmd> Octo assignee remove<CR>", desc = "Remove a user" },
{ prefix .. "ap", "<cmd> Octo reviewer add<CR>", desc = "Assign a PR reviewer" },
{ prefix .. "aa", "<cmd> Octo assignee add<CR>", desc = "Assign a user" },
{ prefix .. "ar", "<cmd> Octo assignee remove<CR>", desc = "Remove a user" },
{ prefix .. "ap", "<cmd> Octo reviewer add<CR>", desc = "Assign a PR reviewer" },

{ prefix .. "la", "<cmd> Octo label add<CR>", desc = "Assign a label" },
{ prefix .. "lr", "<cmd> Octo label remove<CR>", desc = "Remove a label" },
{ prefix .. "lc", "<cmd> Octo label create<CR>", desc = "Create a label" },
{ prefix .. "la", "<cmd> Octo label add<CR>", desc = "Assign a label" },
{ prefix .. "lr", "<cmd> Octo label remove<CR>", desc = "Remove a label" },
{ prefix .. "lc", "<cmd> Octo label create<CR>", desc = "Create a label" },

{ prefix .. "e1", "<cmd>Octo reaction thumbs_up<CR>", desc = "Add 👍 reaction" },
{ prefix .. "e2", "<cmd>Octo reaction thumbs_down<CR>", desc = "Add 👎 reaction" },
{ prefix .. "e3", "<cmd>Octo reaction eyes<CR>", desc = "Add 👀 reaction" },
{ prefix .. "e4", "<cmd>Octo reaction laugh<CR>", desc = "Add 😄 reaction" },
{ prefix .. "e5", "<cmd>Octo reaction confused<CR>", desc = "Add 😕 reaction" },
{ prefix .. "e6", "<cmd>Octo reaction rocket<CR>", desc = "Add 🚀 reaction" },
{ prefix .. "e7", "<cmd>Octo reaction heart<CR>", desc = "Add ❤️ reaction" },
{ prefix .. "e8", "<cmd>Octo reaction party<CR>", desc = "Add 🎉 reaction" },
{ prefix .. "e1", "<cmd>Octo reaction thumbs_up<CR>", desc = "Add 👍 reaction" },
{ prefix .. "e2", "<cmd>Octo reaction thumbs_down<CR>", desc = "Add 👎 reaction" },
{ prefix .. "e3", "<cmd>Octo reaction eyes<CR>", desc = "Add 👀 reaction" },
{ prefix .. "e4", "<cmd>Octo reaction laugh<CR>", desc = "Add 😄 reaction" },
{ prefix .. "e5", "<cmd>Octo reaction confused<CR>", desc = "Add 😕 reaction" },
{ prefix .. "e6", "<cmd>Octo reaction rocket<CR>", desc = "Add 🚀 reaction" },
{ prefix .. "e7", "<cmd>Octo reaction heart<CR>", desc = "Add ❤️ reaction" },
{ prefix .. "e8", "<cmd>Octo reaction party<CR>", desc = "Add 🎉 reaction" },

{ prefix .. "x", "<cmd>Octo actions<CR>", desc = "Run an action" },
{ prefix .. "x", "<cmd>Octo actions<CR>", desc = "Run an action" },

{ prefix .. "ss", "<cmd> Octo review start<CR>", desc = "Start review" },
{ prefix .. "sf", "<cmd> Octo review submit<CR>", desc = "Submit review" },
{ prefix .. "sr", "<cmd> Octo review resume<CR>", desc = "Submit resume" },
{ prefix .. "sd", "<cmd> Octo review discard<CR>", desc = "Delete pending review" },
{ prefix .. "sc", "<cmd> Octo review comments<CR>", desc = "View pending comments" },
{ prefix .. "sp", "<cmd> Octo review commit<CR>", desc = "Select commit to review" },
{ prefix .. "sc", "<cmd> Octo review close<CR>", desc = "Return to PR" },
{ prefix .. "ss", "<cmd> Octo review start<CR>", desc = "Start review" },
{ prefix .. "sf", "<cmd> Octo review submit<CR>", desc = "Submit review" },
{ prefix .. "sr", "<cmd> Octo review resume<CR>", desc = "Submit resume" },
{ prefix .. "sd", "<cmd> Octo review discard<CR>", desc = "Delete pending review" },
{ prefix .. "sc", "<cmd> Octo review comments<CR>", desc = "View pending comments" },
{ prefix .. "sp", "<cmd> Octo review commit<CR>", desc = "Select commit to review" },
{ prefix .. "sc", "<cmd> Octo review close<CR>", desc = "Return to PR" },
},
},
{
"catppuccin/nvim",
optional = true,
opts = { integrations = { octo = true } },
},
}
Loading