diff --git a/flake.nix b/flake.nix index ed965f2..485bae5 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,10 @@ 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 519c31b..d7258de 100644 --- a/modules/desktop/themes/catppuccin/default.nix +++ b/modules/desktop/themes/catppuccin/default.nix @@ -46,15 +46,16 @@ in { vscode = { colorTheme = { name = "Catppuccin Mocha"; - 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; + #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"; diff --git a/modules/desktop/waybar.nix b/modules/desktop/waybar.nix index 0c91d10..896dfe0 100644 --- a/modules/desktop/waybar.nix +++ b/modules/desktop/waybar.nix @@ -8,7 +8,8 @@ in { enable = mkEnableOption "Enable Waybar, a highly customizable wayland bar for wlroots compositors."; package = mkOption { type = types.package; - default = inputs.waybar.packages.${system}.default; + #default = inputs.waybar.packages.${system}.default; + default = pkgs.waybar; example = "pkgs.waybar"; }; };