From 5c0d6a205a443cfd101f0926beb51e745d7801a6 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Tue, 25 Oct 2022 16:40:11 -0500 Subject: [PATCH] refactor(nvim): move kanagawa config to configs dir --- .../config/lua/plugins/configs/kanagawa.lua | 113 ++++++++++++++++++ .../primary/config/lua/plugins/plugins.lua | 11 +- 2 files changed, 114 insertions(+), 10 deletions(-) create mode 100644 dots/.nvim-environments/primary/config/lua/plugins/configs/kanagawa.lua diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/kanagawa.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/kanagawa.lua new file mode 100644 index 00000000..6fb226a2 --- /dev/null +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/kanagawa.lua @@ -0,0 +1,113 @@ +local colors = require("kanagawa.colors").setup({}) +vim.opt.fillchars:append({ + horiz = "─", + horizup = "┴", + horizdown = "┬", + vert = "│", + vertleft = "┤", + vertright = "├", + verthoriz = "┼", +}) +require("kanagawa").setup({ + transparent = true, + dim_inactive = true, + globalStatus = true, + overrides = { + NeogitHunkHeader = { bg = colors.diff.text }, + NeogitHunkHeaderHighlight = { fg = colors.git.changed, bg = colors.diff.text }, + NeogitDiffContextHighlight = { bg = colors.diff.change }, + NeogitDiffDeleteHighlight = { fg = colors.git.removed, bg = colors.diff.delete }, + NeogitDiffAddHighlight = { fg = colors.git.added, bg = colors.diff.add }, + NeogitCommitViewHeader = { fg = colors.git.changed, bg = colors.diff.text }, + menuSel = { bg = colors.sumiInk0, fg = "NONE" }, + Pmenu = { fg = colors.fujiWhite, bg = colors.sumiInk2 }, + CmpItemAbbrDeprecated = { fg = colors.fujiGray, bg = "NONE" }, + CmpItemAbbrMatch = { fg = colors.crystalBlue, bg = "NONE" }, + CmpItemAbbrMatchFuzzy = { fg = colors.crystalBlue, bg = "NONE" }, + CmpItemMenu = { fg = colors.roninYellow, bg = "NONE" }, + CmpItemKindField = { fg = colors.fujiWhite, bg = colors.sakuraPink }, + CmpItemKindProperty = { fg = colors.fujiWhite, bg = colors.sakuraPink }, + CmpItemKindEvent = { fg = colors.fujiWhite, bg = colors.sakuraPink }, + + CmpItemKindText = { fg = colors.fujiWhite, bg = colors.dragonBlue }, + CmpItemKindEnum = { fg = colors.fujiWhite, bg = colors.crystalBlue }, + CmpItemKindKeyword = { fg = colors.fujiWhite, bg = colors.springBlue }, + + CmpItemKindConstant = { fg = colors.fujiWhite, bg = colors.crystalBlue }, + CmpItemKindConstructor = { fg = colors.fujiWhite, bg = colors.crystalBlue }, + CmpItemKindReference = { fg = colors.fujiWhite, bg = colors.crystalBlue }, + + CmpItemKindFunction = { fg = colors.fujiWhite, bg = colors.oniViolet }, + CmpItemKindStruct = { fg = colors.fujiWhite, bg = colors.oniViolet }, + CmpItemKindClass = { fg = colors.fujiWhite, bg = colors.oniViolet }, + CmpItemKindModule = { fg = colors.fujiWhite, bg = colors.oniViolet }, + CmpItemKindOperator = { fg = colors.fujiWhite, bg = colors.oniViolet }, + + CmpItemKindVariable = { fg = colors.fujiWhite, bg = colors.roninYellow }, + CmpItemKindFile = { fg = colors.fujiWhite, bg = colors.autumnYellow }, + + CmpItemKindUnit = { fg = colors.fujiWhite, bg = colors.autumnYellow }, + CmpItemKindSnippet = { fg = colors.fujiWhite, bg = colors.autumnYellow }, + CmpItemKindFolder = { fg = colors.fujiWhite, bg = colors.autumnYellow }, + + CmpItemKindMethod = { fg = colors.fujiWhite, bg = colors.autumnGreen }, + CmpItemKindValue = { fg = colors.fujiWhite, bg = colors.autumnGreen }, + CmpItemKindEnumMember = { fg = colors.fujiWhite, bg = colors.autumnGreen }, + + CmpItemKindInterface = { fg = colors.fujiWhite, bg = colors.waveRed }, + CmpItemKindColor = { fg = colors.fujiWhite, bg = colors.waveAqua2 }, + CmpItemKindTypeParameter = { fg = colors.fujiWhite, bg = colors.waveAqua2 }, + + CmpCustomSelectionBuffer = { fg = colors.fujiWhite, bg = colors.dragonBlue }, + CmpCustomSelectionPath = { fg = colors.fujiWhite, bg = colors.autumnYellow }, + CmpCustomSelectionCalculator = { fg = colors.fujiWhite, bg = colors.waveBlue2 }, + CmpCustomSelectionNeorg = { fg = colors.fujiWhite, bg = colors.waveAqua1 }, + CmpCustomSelectionEmoji = { fg = colors.fujiWhite, bg = colors.dragonBlue }, + CmpCustomSelectionZsh = { fg = colors.fujiWhite, bg = colors.springGreen }, + CmpCustomSelectionCrates = { fg = colors.fujiWhite, bg = colors.roninYellow }, + CmpCustomSelectionCmdHistory = { fg = colors.fujiWhite, bg = colors.waveBlue2 }, + CmpCustomSelectionRipgrep = { fg = colors.fujiWhite, bg = colors.dragonBlue }, + CmpCustomSelectionNpm = { fg = colors.fujiWhite, bg = colors.peachRed }, + CmpCustomSelectionCommit = { fg = colors.fujiWhite, bg = colors.peachRed }, + CmpCustomSelectionSpell = { fg = colors.fujiWhite, bg = colors.waveRed }, + + TelescopeNormal = { bg = colors.sumiInk1 }, + TelescopeBorder = { bg = colors.sumiInk1, fg = colors.sumiInk1 }, + TelescopePromptBorder = { bg = colors.sumiInk0, fg = colors.sumiInk0 }, + TelescopePromptTitle = { fg = colors.sumiInk0, bg = colors.oniViolet }, + TelescopePreviewTitle = { fg = colors.sumiInk0, bg = colors.sakuraPink }, + TelescopePreviewBorder = { bg = colors.sumiInk2, fg = colors.sumiInk2 }, + TelescopePreviewNormal = { bg = colors.sumiInk2 }, + TelescopeResultsTitle = { fg = "NONE", bg = "NONE" }, + + WinSeparator = { fg = colors.sumiInk4, bg = "NONE" }, + + MiniCursorword = { bg = colors.sumiInk3 }, + MiniCursorwordCurrent = { bg = colors.sumiInk3 }, + + rainbowcol1 = { fg = colors.oniViolet }, + rainbowcol2 = { fg = colors.crystalBlue }, + rainbowcol3 = { fg = colors.lightBlue }, + rainbowcol4 = { fg = colors.sakuraPink }, + rainbowcol5 = { fg = colors.springGreen }, + rainbowcol6 = { fg = colors.springViolet2 }, + rainbowcol7 = { fg = colors.carpYellow }, + + packerSuccess = { fg = colors.autumnGreen, bg = "NONE" }, + + WinBar = { fg = colors.fujiWhite, bg = colors.sumiInk1b }, + WinBarNC = { fg = colors.fujiWhite, bg = colors.sumiInk1b }, + + NeoTreeNormal = { bg = colors.sumiInk1b }, + NeoTreeNormalNC = { bg = colors.sumiInk1b }, + }, +}) + + +-- NOTE: Colors for SmoothCursor +vim.api.nvim_set_hl(0, "SmoothCursorCursor", { fg = colors.roninYellow }) +vim.api.nvim_set_hl(0, "SmoothCursorTrailBig1", { fg = colors.autumnYellow }) +vim.api.nvim_set_hl(0, "SmoothCursorTrailBig2", { fg = colors.crystalBlue }) +vim.api.nvim_set_hl(0, "SmoothCursorTrailMedium", { fg = colors.oniViolet }) +vim.api.nvim_set_hl(0, "SmoothCursorTrailSmall", { fg = colors.springBlue }) +vim.api.nvim_set_hl(0, "SmoothCursorTrailXSmall", { fg = colors.waveAqua2 }) diff --git a/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua b/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua index 095801f5..7585a735 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua @@ -744,17 +744,8 @@ return packer.startup({ -- Nice sidebar cursor goodies use({ "gen740/SmoothCursor.nvim", - requires = { - "rebelot/kanagawa.nvim", - }, + after = "kanagawa.nvim", config = function() - local kcolors = require("kanagawa.colors").setup({}) - vim.api.nvim_set_hl(0, "SmoothCursorCursor", { fg = kcolors.roninYellow }) - vim.api.nvim_set_hl(0, "SmoothCursorTrailBig1", { fg = kcolors.autumnYellow }) - vim.api.nvim_set_hl(0, "SmoothCursorTrailBig2", { fg = kcolors.crystalBlue }) - vim.api.nvim_set_hl(0, "SmoothCursorTrailMedium", { fg = kcolors.oniViolet }) - vim.api.nvim_set_hl(0, "SmoothCursorTrailSmall", { fg = kcolors.springBlue }) - vim.api.nvim_set_hl(0, "SmoothCursorTrailXSmall", { fg = kcolors.waveAqua2 }) require("smoothcursor").setup({ fancy = { enable = true,