From 27a64ec668ad99112c6f3a8eb1d4dd08e47c7f4c Mon Sep 17 00:00:00 2001 From: Conner Ow Date: Sat, 29 Nov 2025 09:46:10 -0600 Subject: [PATCH] wip: add FFF integration --- README.md | 2 ++ lua/osmium/groups/integrations/fff.lua | 21 +++++++++++++++++++++ lua/osmium/groups/integrations/init.lua | 3 +++ lua/osmium/init.lua | 1 + 4 files changed, 27 insertions(+) create mode 100644 lua/osmium/groups/integrations/fff.lua diff --git a/README.md b/README.md index 3de587a..977e6f2 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ require("osmium").setup({ gitsigns = false, telescope = false, indent_blankline = false, + fff = false }, transparent_bg = false, -- whether to use a transparent background show_end_of_buffer = false, -- whether to show the end of buffer @@ -50,6 +51,7 @@ require("osmium").setup({ - [gitsigns](https://github.com/lewis6991/gitsigns.nvim) - [telescope](https://github.com/nvim-telescope/telescope.nvim) - [indent_blankline](https://github.com/lukas-reineke/indent-blankline.nvim) +- [fff](https://github.com/dmtrKovalenko/fff.nvim) ## Contributing diff --git a/lua/osmium/groups/integrations/fff.lua b/lua/osmium/groups/integrations/fff.lua new file mode 100644 index 0000000..6a3be4f --- /dev/null +++ b/lua/osmium/groups/integrations/fff.lua @@ -0,0 +1,21 @@ +local combine = require("osmium.groups.utils").combine + +---@param highlights HighlightGroups +---@param colors Palette +return function(highlights, colors) + return combine(highlights, { + FFFGitUntracked = { bg = colors.greenBg, fg = colors.greenFg }, + FFFGitIgnored = { bg = colors.surface3, fg = colors.foreground2 }, + FFFGitModified = { bg = colors.yellowBg, fg = colors.yellowFg }, + FFFGitDeleted = { bg = colors.redBg, fg = colors.redFg }, + FFFGitRenamed = { bg = colors.purpleBg, fg = colors.purpleFg }, + FFFGitStaged = { bg = colors.greenBg, fg = colors.greenFg }, + + FFFGitSignUntracked = { bg = colors.greenBg, fg = colors.greenFg }, + FFFGitSignIgnored = { bg = colors.surface3, fg = colors.foreground2 }, + FFFGitSignModified = { bg = colors.yellowBg, fg = colors.yellowFg }, + FFFGitSignDeleted = { bg = colors.redBg, fg = colors.redFg }, + FFFGitSignRenamed = { bg = colors.purpleBg, fg = colors.purpleFg }, + FFFGitSignStaged = { bg = colors.greenBg, fg = colors.greenFg }, + }) +end diff --git a/lua/osmium/groups/integrations/init.lua b/lua/osmium/groups/integrations/init.lua index a88758e..7ca0c41 100644 --- a/lua/osmium/groups/integrations/init.lua +++ b/lua/osmium/groups/integrations/init.lua @@ -15,6 +15,9 @@ local function highlight_integrations(highlights, configs) if configs.integrations.indent_blankline then combined = require("osmium.groups.integrations.indent_blankline")(combined, configs.colors) end + if configs.integrations.fff then + combined = require("osmium.groups.integrations.fff")(combined, configs.colors) + end return combined end diff --git a/lua/osmium/init.lua b/lua/osmium/init.lua index 05b8856..d274922 100644 --- a/lua/osmium/init.lua +++ b/lua/osmium/init.lua @@ -2,6 +2,7 @@ ---@field gitsigns? boolean ---@field telescope? boolean ---@field indent_blankline? boolean +---@field fff? boolean ---@class OsmiumConfig ---@field italic_comment? boolean