From 496274c0a52742af06ff426e9660054416fa6127 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Thu, 6 Mar 2025 22:12:46 +1100
Subject: [PATCH] user/neovim: use correct colors for signify

---
 modules/user/neovim.nix |  4 ++--
 res/config.lua          | 21 +++++++--------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/modules/user/neovim.nix b/modules/user/neovim.nix
index d679b5c..4c74919 100644
--- a/modules/user/neovim.nix
+++ b/modules/user/neovim.nix
@@ -2,8 +2,8 @@
 let
   luaconf = pkgs.writeText "config.lua"
     (lib.replaceStrings
-      ["{{OMNISHARP_PATH}}" "{{DART_PATH}}"]
-      ["${pkgs.omnisharp-roslyn}/bin/OmniSharp" "${pkgs.dart}/bin/dart"]
+      ["{{OMNISHARP_PATH}}" "{{DART_PATH}}" "{{CATPPUCCIN_FLAVOUR}}"]
+      ["${pkgs.omnisharp-roslyn}/bin/OmniSharp" "${pkgs.dart}/bin/dart" config.catppuccin.nvim.flavor]
       (builtins.readFile ../../res/config.lua));
 in {
   systemd.user.tmpfiles.rules = [
diff --git a/res/config.lua b/res/config.lua
index e9f30a9..349ed15 100644
--- a/res/config.lua
+++ b/res/config.lua
@@ -50,24 +50,17 @@ vim.g.vimtex_view_method = "zathura"
 
 -- Theming
 vim.api.nvim_command("syntax enable")
--- require("tokyonight").setup({
---     style = "night"
--- })
--- vim.cmd[[
---     syntax enable
---     colorscheme tokyonight
--- ]]
--- local colors = require("tokyonight.colors").setup {}
--- vim.cmd("highlight SignifySignAdd             guifg="..colors.green)
--- vim.cmd("highlight SignifySignChange          guifg="..colors.orange)
--- vim.cmd("highlight SignifySignDelete          guifg="..colors.red)
--- vim.cmd("highlight SignifySignDeleteFirstLine guifg="..colors.red)
--- vim.cmd("highlight SignifySignChangeDelete    guifg="..colors.red)
+local colors = require("catppuccin.palettes").get_palette "{{CATPPUCCIN_FLAVOUR}}"
+vim.cmd("highlight SignifySignAdd             guifg="..colors.green)
+vim.cmd("highlight SignifySignChange          guifg="..colors.peach)
+vim.cmd("highlight SignifySignDelete          guifg="..colors.red)
+vim.cmd("highlight SignifySignDeleteFirstLine guifg="..colors.red)
+vim.cmd("highlight SignifySignChangeDelete    guifg="..colors.red)
 
 -- Set this specific highlight group in rust
 -- Shown when using #[cfg] directives, entire chunks of disabled code has squiggly lines and I don't want
 -- to see it
--- vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.comment)
+vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.overlay2)
 
 -- Plugins
 require('nvim-treesitter.configs').setup {