From a1ef029e3fd981b45c476c5dbaac7e3c574686b3 Mon Sep 17 00:00:00 2001 From: isabel Date: Sat, 4 Jan 2025 22:47:41 +0000 Subject: [PATCH 1/2] fix(home-manager/zed): correctly enable & select accent --- modules/home-manager/zed-editor.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/home-manager/zed-editor.nix b/modules/home-manager/zed-editor.nix index 6ca06064..0b598f8f 100644 --- a/modules/home-manager/zed-editor.nix +++ b/modules/home-manager/zed-editor.nix @@ -5,6 +5,9 @@ let inherit (config.catppuccin) sources; cfg = config.catppuccin.zed; + enable = cfg.enable && config.programs.zed-editor.enable; + + accent = if cfg.accent == "muave" then "" else " (${cfg.accent})"; in { @@ -19,22 +22,18 @@ in }; }; - config = lib.mkIf cfg.enable { + config = lib.mkIf enable { programs.zed-editor = { userSettings.theme = { light = "Catppuccin " + catppuccinLib.mkUpper cfg.flavor - + " (" - + cfg.accent - + ")" + + accent + lib.optionalString (!cfg.italics) " - No Italics"; dark = "Catppuccin " + catppuccinLib.mkUpper cfg.flavor - + " (" - + cfg.accent - + ")" + + accent + lib.optionalString (!cfg.italics) " - No Italics"; }; }; From bd6179da31df7729c91d7de084a686dac1cd0b25 Mon Sep 17 00:00:00 2001 From: Isabel Date: Sun, 5 Jan 2025 09:11:37 +0000 Subject: [PATCH 2/2] fix(home-manager/zed): mauve typo Co-authored-by: seth --- modules/home-manager/zed-editor.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home-manager/zed-editor.nix b/modules/home-manager/zed-editor.nix index 0b598f8f..63f9a6da 100644 --- a/modules/home-manager/zed-editor.nix +++ b/modules/home-manager/zed-editor.nix @@ -7,7 +7,7 @@ let cfg = config.catppuccin.zed; enable = cfg.enable && config.programs.zed-editor.enable; - accent = if cfg.accent == "muave" then "" else " (${cfg.accent})"; + accent = if cfg.accent == "mauve" then "" else " (${cfg.accent})"; in {