From bef4f0e666af8cd45f7ff60eedcc049cc1a24474 Mon Sep 17 00:00:00 2001 From: Daniel Fichtinger Date: Wed, 11 Dec 2024 01:00:02 -0500 Subject: [PATCH] AutoYADM commit: 2024-12-11 01:00:02 --- .config/nvim/lazy-lock.json | 2 +- .config/nvim/lua/plugins/ashen.lua | 10 +- .config/nvim/lua/plugins/lualine.lua | 14 +- .config/nvim/lua/plugins/noirbuddy.lua | 242 ++++++++++++------------- 4 files changed, 138 insertions(+), 130 deletions(-) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index f4864725..7b3f2491 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -2,6 +2,7 @@ "CopilotChat.nvim": { "branch": "main", "commit": "db95d18a4f645ec6b745ef9db91adf4665824f22" }, "LazyVim": { "branch": "main", "commit": "3c605f547c594b509d83f8677bb7609c005edea5" }, "SchemaStore.nvim": { "branch": "main", "commit": "f8c2a0f5d51b800ea4625808e243d9e8f7c5e1df" }, + "ashen.nvim": { "branch": "main", "commit": "3bc0acf0faf1643945259906a7c1cb2b9f8b7dbf" }, "bufferline.nvim": { "branch": "main", "commit": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76" }, "catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" }, "clangd_extensions.nvim": { "branch": "main", "commit": "8f7b72100883e0e34400d9518d40a03f21e4d0a6" }, @@ -10,7 +11,6 @@ "cmp-git": { "branch": "main", "commit": "ec049036e354ed8ed0215f2427112882e1ea7051" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "colorbuddy.nvim": { "branch": "master", "commit": "8b968581e5c19d22a861d5f3fe5dbd83394fa681" }, "conform.nvim": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "c810500b69cb8bcea58f2be635cb1340011714b5" }, diff --git a/.config/nvim/lua/plugins/ashen.lua b/.config/nvim/lua/plugins/ashen.lua index 7720667d..6d743d63 100644 --- a/.config/nvim/lua/plugins/ashen.lua +++ b/.config/nvim/lua/plugins/ashen.lua @@ -1,5 +1,13 @@ return { "ficcdaf/ashen.nvim", - enabled = false, + enabled = true, dev = true, + { + "LazyVim/LazyVim", + opts = { + colorscheme = function() + require("ashen").setup() + end, + }, + }, } diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index b21ec73e..0271a9bc 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -86,13 +86,13 @@ local sections = { } return { "nvim-lualine/lualine.nvim", - dependencies = { - "jesseleite/nvim-noirbuddy", - }, + -- dependencies = { + -- "jesseleite/nvim-noirbuddy", + -- }, config = function() - local noirbuddy_lualine = require("noirbuddy.plugins.lualine") - local theme = noirbuddy_lualine.theme - local nb_inactive_sections = noirbuddy_lualine.inactive_sections + local ashen_lualine = require("ashen.plugins.lualine") + local theme = ashen_lualine.theme + local ashen_inactive_sections = ashen_lualine.inactive_sections -- vim.api.nvim_create_autocmd( -- { "TextChanged", "TextChangedI", "CursorHold" }, @@ -113,7 +113,7 @@ return { section_separators = { left = "", right = "" }, }, sections = sections, - inactive_sections = nb_inactive_sections, + inactive_sections = ashen_inactive_sections, }) end, } diff --git a/.config/nvim/lua/plugins/noirbuddy.lua b/.config/nvim/lua/plugins/noirbuddy.lua index 29161947..945d4675 100644 --- a/.config/nvim/lua/plugins/noirbuddy.lua +++ b/.config/nvim/lua/plugins/noirbuddy.lua @@ -1,121 +1,121 @@ --- #0f0f0f --- #933737 --- #A23D3D --- #994848 --- #7B7F80 --- #7C8080 --- #8D8D8D --- #d4d4d4 --- #949494 --- #933737 --- #A23D3D --- #994848 --- #7B7F80 --- #7C8080 --- #8D8D8D --- #d4d4d4 -return { - { - "jesseleite/nvim-noirbuddy", - lazy = false, - priority = 1000, - dependencies = { - { "tjdevries/colorbuddy.nvim" }, - }, - }, - { - "LazyVim/LazyVim", - opts = { - colorscheme = function() - local noiropts = { - -- preset = "miami-nights", - styles = { - italic = true, - bold = true, - underline = true, - undercurl = false, - }, - colors = { - secondary = "#BD4C4C", - primary = "#933737", - diagnostic_error = "#AC2020", - diagnostic_warning = "#ff7700", - diagnostic_info = "#d5d5d5", - diagnostic_hint = "#d5d5d5", - diff_add = "#f5f5f5", - diff_change = "#737373", - diff_delete = "#AC2020", - }, - } - require("noirbuddy").setup(noiropts) - local colorbuddy = require("colorbuddy") - - local Color = colorbuddy.Color - local colors = colorbuddy.colors - local Group = colorbuddy.Group - local groups = colorbuddy.groups - local styles = colorbuddy.styles - Color.new("error", "#AC2020") - Color.new("warn", "#f79000") - Color.new("warnborder", "#79491d") - Color.new("infoborder", "#215858") - Color.new("complement", "#379393") - -- Override specific highlight groups - -- Group.new("Type", colors.complement) - Group.new("DiagnosticOk", colors.diagnostic_info) - Group.new("Added", colors.diff_change) - Group.new("Removed", colors.primary) - Group.new("Changed", colors.complement) - Group.new("@markup.link", colors.secondary) - Group.new("@markup.list", colors.complement) - Group.new("@variable", colors.complement) - Group.new("@constant", colors.complement) - Group.new("@constant.builtin", colors.complement) - Group.new("@type.builtin", colors.primary) - Group.new("@number", colors.secondary) - Group.new("NonText", colors.noir_7) - Group.new("Comment", colors.noir_6) - Group.new("@comment", colors.noir_6) - Group.new("@boolean.go", colors.complement) - Group.new("@boolean", colors.complement) - Group.new("@keyword.return", colors.complement) - -- Group.new("gotype", colors.primary) - Group.new("Boolean", colors.complement) - Group.new("Constant", colors.complement) - -- TODO: change these groups to match Snacks instead... - -- Is that even needed actually? - Group.new("DashboardHeader", colors.primary) - Group.new("DashboardIcon", colors.primary) - Group.new("DashboardKey", colors.complement) - Group.new("NotifyINFOBorder", colors.infoborder) - Group.new("NotifyINFOTitle", colors.complement) - Group.new("NotifyINFOIcon", colors.complement) - Group.new("NotifyWARNBorder", colors.warnborder) - Group.new("NotifyWARNTitle", colors.warn) - Group.new("NotifyWARNIcon", colors.warn) - Group.new("NotifyERRORBorder", colors.error) - Group.new("NotifyERRORTitle", colors.error) - Group.new("NotifyERRORIcon", colors.error) - Group.new("ErrorMsg", colors.noir_1, colors.error) - Group.new("SpellBad", nil, nil, styles.undercurl) - Group.new("SpellCap", nil, nil, styles.undercurl) - Group.new("String", colors.primary, nil, nil) - Group.new("Title", colors.primary, nil, styles.bold) - local linkhl = require("link-hl") - linkhl.link(linkhl.go_map, "go") - -- minimap.nvim - -- vim.api.nvim_set_hl(0, "minimapRange", { - -- fg = "#FFFFFF", - -- bg = "#000000", - -- }) - -- Group.new("ObsidianExtLinkIcon", colors.primary, nil, styles.bold) - -- Group.new("ObsidianRef", colors.primary, nil, styles.underline + styles.bold) - -- Group.new("ObsidianRefText", colors.primary, nil, styles.underline + styles.bold) - -- Group.new("ObsidianBullet", colors.secondary, nil, styles.bold) - -- Group.new("ObsidianDone", colors.secondary, nil, styles.bold) - -- Group.new("ObsidianTodo", colors.secondary, nil, styles.bold) - -- Group.new("ObsidianTag", colors.secondary, nil, styles.italic) - end, - }, - }, -} +-- -- #0f0f0f +-- -- #933737 +-- -- #A23D3D +-- -- #994848 +-- -- #7B7F80 +-- -- #7C8080 +-- -- #8D8D8D +-- -- #d4d4d4 +-- -- #949494 +-- -- #933737 +-- -- #A23D3D +-- -- #994848 +-- -- #7B7F80 +-- -- #7C8080 +-- -- #8D8D8D +-- -- #d4d4d4 +-- return { +-- { +-- "jesseleite/nvim-noirbuddy", +-- lazy = false, +-- priority = 1000, +-- dependencies = { +-- { "tjdevries/colorbuddy.nvim" }, +-- }, +-- { +-- }, +-- "LazyVim/LazyVim", +-- opts = { +-- colorscheme = function() +-- local noiropts = { +-- -- preset = "miami-nights", +-- styles = { +-- italic = true, +-- bold = true, +-- underline = true, +-- undercurl = false, +-- }, +-- colors = { +-- secondary = "#BD4C4C", +-- primary = "#933737", +-- diagnostic_error = "#AC2020", +-- diagnostic_warning = "#ff7700", +-- diagnostic_info = "#d5d5d5", +-- diagnostic_hint = "#d5d5d5", +-- diff_add = "#f5f5f5", +-- diff_change = "#737373", +-- diff_delete = "#AC2020", +-- }, +-- } +-- require("noirbuddy").setup(noiropts) +-- local colorbuddy = require("colorbuddy") +-- +-- local Color = colorbuddy.Color +-- local colors = colorbuddy.colors +-- local Group = colorbuddy.Group +-- local groups = colorbuddy.groups +-- local styles = colorbuddy.styles +-- Color.new("error", "#AC2020") +-- Color.new("warn", "#f79000") +-- Color.new("warnborder", "#79491d") +-- Color.new("infoborder", "#215858") +-- Color.new("complement", "#379393") +-- -- Override specific highlight groups +-- -- Group.new("Type", colors.complement) +-- Group.new("DiagnosticOk", colors.diagnostic_info) +-- Group.new("Added", colors.diff_change) +-- Group.new("Removed", colors.primary) +-- Group.new("Changed", colors.complement) +-- Group.new("@markup.link", colors.secondary) +-- Group.new("@markup.list", colors.complement) +-- Group.new("@variable", colors.complement) +-- Group.new("@constant", colors.complement) +-- Group.new("@constant.builtin", colors.complement) +-- Group.new("@type.builtin", colors.primary) +-- Group.new("@number", colors.secondary) +-- Group.new("NonText", colors.noir_7) +-- Group.new("Comment", colors.noir_6) +-- Group.new("@comment", colors.noir_6) +-- Group.new("@boolean.go", colors.complement) +-- Group.new("@boolean", colors.complement) +-- Group.new("@keyword.return", colors.complement) +-- -- Group.new("gotype", colors.primary) +-- Group.new("Boolean", colors.complement) +-- Group.new("Constant", colors.complement) +-- -- TODO: change these groups to match Snacks instead... +-- -- Is that even needed actually? +-- Group.new("DashboardHeader", colors.primary) +-- Group.new("DashboardIcon", colors.primary) +-- Group.new("DashboardKey", colors.complement) +-- Group.new("NotifyINFOBorder", colors.infoborder) +-- Group.new("NotifyINFOTitle", colors.complement) +-- Group.new("NotifyINFOIcon", colors.complement) +-- Group.new("NotifyWARNBorder", colors.warnborder) +-- Group.new("NotifyWARNTitle", colors.warn) +-- Group.new("NotifyWARNIcon", colors.warn) +-- Group.new("NotifyERRORBorder", colors.error) +-- Group.new("NotifyERRORTitle", colors.error) +-- Group.new("NotifyERRORIcon", colors.error) +-- Group.new("ErrorMsg", colors.noir_1, colors.error) +-- Group.new("SpellBad", nil, nil, styles.undercurl) +-- Group.new("SpellCap", nil, nil, styles.undercurl) +-- Group.new("String", colors.primary, nil, nil) +-- Group.new("Title", colors.primary, nil, styles.bold) +-- local linkhl = require("link-hl") +-- linkhl.link(linkhl.go_map, "go") +-- -- minimap.nvim +-- -- vim.api.nvim_set_hl(0, "minimapRange", { +-- -- fg = "#FFFFFF", +-- -- bg = "#000000", +-- -- }) +-- -- Group.new("ObsidianExtLinkIcon", colors.primary, nil, styles.bold) +-- -- Group.new("ObsidianRef", colors.primary, nil, styles.underline + styles.bold) +-- -- Group.new("ObsidianRefText", colors.primary, nil, styles.underline + styles.bold) +-- -- Group.new("ObsidianBullet", colors.secondary, nil, styles.bold) +-- -- Group.new("ObsidianDone", colors.secondary, nil, styles.bold) +-- -- Group.new("ObsidianTodo", colors.secondary, nil, styles.bold) +-- -- Group.new("ObsidianTag", colors.secondary, nil, styles.italic) +-- end, +-- }, +-- }, +-- }