From d442f9da9393b653798272d5f5536c711ba4df87 Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Mon, 10 Jun 2024 15:37:03 -0700 Subject: [PATCH] re-add catppuccin vscode (broken from kernel regression??) --- flake.nix | 5 +---- modules/desktop/themes/catppuccin/default.nix | 19 +++++++++---------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index 485bae5..ed965f2 100644 --- a/flake.nix +++ b/flake.nix @@ -37,10 +37,7 @@ config.allowAliases = false; overlays = extraOverlays ++ (lib.attrValues self.overlays); }; - pkgs = mkPkgs nixpkgs [ - self.overlays.default - #inputs.catppuccin-vsc.overlays.default - ]; + pkgs = mkPkgs nixpkgs [ self.overlays.default inputs.catppuccin-vsc.overlays.default ]; lib = nixpkgs.lib.extend (final: prev: { my = import ./lib { diff --git a/modules/desktop/themes/catppuccin/default.nix b/modules/desktop/themes/catppuccin/default.nix index d7258de..519c31b 100644 --- a/modules/desktop/themes/catppuccin/default.nix +++ b/modules/desktop/themes/catppuccin/default.nix @@ -46,16 +46,15 @@ in { vscode = { colorTheme = { name = "Catppuccin Mocha"; - extension = pkgs.vscode-extensions.catppuccin.catppuccin-vsc; - #extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override { - # accent = accent; - # boldKeywords = false; - # italicComments = false; - # italicKeywords = false; - # extraBordersEnabled = false; - # workbenchMode = "flat"; - # bracketMode = "rainbow"; - #}); + extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override { + accent = accent; + boldKeywords = false; + italicComments = false; + italicKeywords = false; + extraBordersEnabled = false; + workbenchMode = "flat"; + bracketMode = "rainbow"; + }); }; iconTheme = { name = "material-icon-theme";