From f245d3399f19790b1e375260c334cb849d9a1fb7 Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@lillianviolet.dev>
Date: Sat, 27 Apr 2024 14:20:06 +0200
Subject: [PATCH] This seems to compile, so let's try this

---
 flake.nix                        |  3 ---
 home-manager/desktop/default.nix | 30 ++++++++++++++++--------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/flake.nix b/flake.nix
index ccff2d2..e183a9f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,9 +20,6 @@
     # catpuccin theme
     catppuccin.url = "github:catppuccin/nix";
 
-    # catpuccin flakehub for vscode
-    catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz";
-
     # Conduit fork without all the fuss and drama
     conduit = {
       url = "github:girlbossceo/conduwuit";
diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix
index b7cbd05..4c76a93 100644
--- a/home-manager/desktop/default.nix
+++ b/home-manager/desktop/default.nix
@@ -23,7 +23,6 @@
   nixpkgs = {
     # You can add overlays here
     overlays = [
-      inputs.catppuccin-vsc.overlays.default
       # You can also add overlays exported from other flakes:
       # neovim-nightly-overlay.overlays.default
 
@@ -33,6 +32,19 @@
       #     patches = [ ./change-hello-to-hi.patch ];
       #   });
       # })
+      (final: prev: {
+        catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: {
+          accent = "lavender";
+          boldKeywords = true;
+          italicComments = true;
+          italicKeywords = true;
+          extraBordersEnabled = false;
+          workbenchMode = "default";
+          bracketMode = "rainbow";
+          colorOverrides = {};
+          customUIColors = {};
+        });
+      })
     ];
     # Configure your nixpkgs instance
     config = {
@@ -91,8 +103,8 @@
     # Theming:
     catppuccin-cursors
     (catppuccin-kde.override {
-      flavour = "macchiato";
-      accents = "lavender";
+      flavour = ["macchiato"];
+      accents = ["lavender"];
     })
     catppuccin-sddm-corners
 
@@ -107,17 +119,7 @@
     extensions = with pkgs.vscode-extensions; [
       #arrterian.nix-env-selector
       #ban.spellright
-      (catppuccin-vsc.override {
-        accent = "lavender";
-        boldKeywords = true;
-        italicComments = true;
-        italicKeywords = true;
-        extraBordersEnabled = false;
-        workbenchMode = "default";
-        bracketMode = "rainbow";
-        colorOverrides = {};
-        customUIColors = {};
-      })
+      catppuccin.catppuccin-vsc
       catppuccin.catppuccin-vsc-icons
       charliermarsh.ruff
       # dracula-theme.theme-dracula