From d4e24fbbb972dcac49380f4db29c2b7cb65c6778 Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Wed, 7 Aug 2024 15:30:05 +0530 Subject: [PATCH 1/3] Add dadbod-ui --- README.md | 14 ++++++++++++++ doc/catppuccin.txt | 14 +++++++++----- lua/catppuccin/groups/integrations/dadbod_ui.lua | 11 +++++++++++ lua/catppuccin/types.lua | 1 + 4 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 lua/catppuccin/groups/integrations/dadbod_ui.lua diff --git a/README.md b/README.md index d70e6132..b7f997d4 100644 --- a/README.md +++ b/README.md @@ -477,6 +477,20 @@ colorful_winsep = { + + + + dadbod-ui + + +```lua +dadbod_ui = true +``` + + + + + diff --git a/doc/catppuccin.txt b/doc/catppuccin.txt index 58a51482..8798940c 100644 --- a/doc/catppuccin.txt +++ b/doc/catppuccin.txt @@ -118,7 +118,7 @@ options and settings. -- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations) }, }) - + -- setup must be called before loading vim.cmd.colorscheme "catppuccin" < @@ -388,6 +388,10 @@ colorful-winsep.nvim>lua } < +dadbod-ui>lua + dadbod_ui = true +< + dashboard-nvim>lua dashboard = true < @@ -409,9 +413,9 @@ Update your Feline config to use the Catppuccin components: >lua local ctp_feline = require('catppuccin.groups.integrations.feline') - + ctp_feline.setup() - + require("feline").setup({ components = ctp_feline.get(), }) @@ -426,7 +430,7 @@ Here are the defaults: local clrs = require("catppuccin.palettes").get_palette() local ctp_feline = require('catppuccin.groups.integrations.feline') local U = require "catppuccin.utils.colors" - + ctp_feline.setup({ assets = { left_separator = "", @@ -676,7 +680,7 @@ Special ~ >lua local sign = vim.fn.sign_define - + sign("DapBreakpoint", { text = "●", texthl = "DapBreakpoint", linehl = "", numhl = ""}) sign("DapBreakpointCondition", { text = "●", texthl = "DapBreakpointCondition", linehl = "", numhl = ""}) sign("DapLogPoint", { text = "◆", texthl = "DapLogPoint", linehl = "", numhl = ""}) diff --git a/lua/catppuccin/groups/integrations/dadbod_ui.lua b/lua/catppuccin/groups/integrations/dadbod_ui.lua new file mode 100644 index 00000000..db569bb6 --- /dev/null +++ b/lua/catppuccin/groups/integrations/dadbod_ui.lua @@ -0,0 +1,11 @@ +local M = {} + +function M.get() + return { + NotificationInfo = { fg = C.blue, bg = C.mantle }, + NotificationWarning = { fg = C.yellow, bg = C.mantle }, + NotificationError = { fg = C.red, bg = C.mantle }, + } +end + +return M diff --git a/lua/catppuccin/types.lua b/lua/catppuccin/types.lua index d0cc86c6..0e7ff5af 100644 --- a/lua/catppuccin/types.lua +++ b/lua/catppuccin/types.lua @@ -132,6 +132,7 @@ -- sign("DapBreakpointCondition", { text = "●", texthl = "DapBreakpointCondition", linehl = "", numhl = ""}) -- sign("DapLogPoint", { text = "◆", texthl = "DapLogPoint", linehl = "", numhl = ""}) -- ``` +---@field dadbod_ui boolean? ---@field dap boolean? ---@field dap_ui boolean? ---@field dashboard boolean? From 5b382d402dd30ad0a2f94400853e22a04595e1a1 Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Fri, 9 Aug 2024 05:12:59 +0530 Subject: [PATCH 2/3] Address review cmts --- README.md | 2 +- doc/catppuccin.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b7f997d4..ea15d7cc 100644 --- a/README.md +++ b/README.md @@ -484,7 +484,7 @@ colorful_winsep = { ```lua -dadbod_ui = true +dadbod_ui = false ``` diff --git a/doc/catppuccin.txt b/doc/catppuccin.txt index 8798940c..d010aeed 100644 --- a/doc/catppuccin.txt +++ b/doc/catppuccin.txt @@ -389,7 +389,7 @@ colorful-winsep.nvim>lua < dadbod-ui>lua - dadbod_ui = true + dadbod_ui = false < dashboard-nvim>lua From c59487c5e3ff4cadbaf77549dc1665ce7b8ad98a Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Fri, 9 Aug 2024 17:56:15 +0530 Subject: [PATCH 3/3] Address second review cmt --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index ea15d7cc..d6246396 100644 --- a/README.md +++ b/README.md @@ -477,20 +477,6 @@ colorful_winsep = { - - - - dadbod-ui - - -```lua -dadbod_ui = false -``` - - - - - @@ -1482,6 +1468,20 @@ let g:clap_theme = 'catppuccin' + + + + vim-dadbod-ui + + +```lua +dadbod_ui = false +``` + + + + +