diff --git a/flake.lock b/flake.lock
index 912c647..ec81013 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,21 +16,21 @@
         "type": "github"
       }
     },
-    "catppuccin-vsc": {
+    "catppuccin": {
       "inputs": {
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1742610849,
-        "narHash": "sha256-QrRM1wRBYs1g6D3nNw2IhjyxQUBCfrgXqd5qI0VMPrY=",
+        "lastModified": 1760953099,
+        "narHash": "sha256-sOKx2YcHa+lWEvaEOIGqLN2WWk1Wf5z6KM02tdfhMtw=",
         "owner": "catppuccin",
-        "repo": "vscode",
-        "rev": "cf3ea3eb4b7b9eebf38800d8d975d9818f688273",
+        "repo": "nix",
+        "rev": "f5b21876888265d2fee7fb0640d1b66a1c1c6503",
         "type": "github"
       },
       "original": {
         "owner": "catppuccin",
-        "repo": "vscode",
+        "repo": "nix",
         "type": "github"
       }
     },
@@ -422,11 +422,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732837521,
-        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
+        "lastModified": 1760524057,
+        "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
+        "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
         "type": "github"
       },
       "original": {
@@ -533,7 +533,7 @@
     },
     "root": {
       "inputs": {
-        "catppuccin-vsc": "catppuccin-vsc",
+        "catppuccin": "catppuccin",
         "fuzzel-catppuccin": "fuzzel-catppuccin",
         "hardware": "hardware",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
index 799cde9..2c0c78b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,14 +16,14 @@
     hyprlock.inputs.nixpkgs.follows = "nixpkgs";
     hypridle.url = "github:hyprwm/hypridle";
 
+    catppuccin.url = "github:catppuccin/nix";
+
     waybar-catppuccin.url = "github:catppuccin/waybar";
     waybar-catppuccin.flake = false;
     fuzzel-catppuccin.url = "github:catppuccin/fuzzel";
     fuzzel-catppuccin.flake = false;
     rofi-catppuccin.url = "github:catppuccin/rofi";
     rofi-catppuccin.flake = false;
-
-    catppuccin-vsc.url = "github:catppuccin/vscode";
   };
 
   outputs = inputs @ { self, nixpkgs, ... }:
@@ -40,7 +40,6 @@
         };
       pkgs = mkPkgs nixpkgs [
         self.overlays.default
-        inputs.catppuccin-vsc.overlays.default
         inputs.niri.overlays.niri
       ];
 
diff --git a/modules/desktop/themes/catppuccin/default.nix b/modules/desktop/themes/catppuccin/default.nix
index 0a127e9..1787a9e 100644
--- a/modules/desktop/themes/catppuccin/default.nix
+++ b/modules/desktop/themes/catppuccin/default.nix
@@ -1,4 +1,4 @@
-{ inputs, config, lib, pkgs, ... }:
+{ inputs, config, lib, pkgs, system, ... }:
 
 with lib;
 let
@@ -49,15 +49,17 @@ in {
         vscode = {
           colorTheme = {
             name = "Catppuccin ${pascalCase variant}";
-            extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override {
-              accent = accent;
-              boldKeywords = false;
-              italicComments = false;
-              italicKeywords = false;
-              extraBordersEnabled = false;
-              workbenchMode = "flat";
-              bracketMode = "rainbow";
-            });
+            extension = inputs.catppuccin.packages.${system}.vscode.override {
+              catppuccinOptions = {
+                accent = accent;
+                boldKeywords = false;
+                italicComments = false;
+                italicKeywords = false;
+                extraBordersEnabled = false;
+                workbenchMode = "flat";
+                bracketMode = "rainbow";
+              };
+            };
           };
           iconTheme = {
             name = "material-icon-theme";