home-manager: remove IFD from helix and yazi (#449)

* refactor(home-manager/helix): remove importTOML * refactor(home-manager/yazi): remove importTOML
catppuccin · Jan 5, 2025 · 8eada39 · 8eada39
1 parent f05d79d
commit 8eada39
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix
@@ -5,6 +5,7 @@ let
   inherit (config.catppuccin) sources;
 
   cfg = config.catppuccin.helix;
+  enable = cfg.enable && config.programs.helix.enable;
   subdir = if cfg.useItalics then "default" else "no_italics";
 in
 
@@ -38,15 +39,17 @@ in
       )
     ];
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf enable {
     programs.helix = {
       settings = {
         theme = "catppuccin-${cfg.flavor}";
         editor.color-modes = lib.mkDefault true;
       };
+    };
 
-      themes."catppuccin-${cfg.flavor}" =
-        lib.importTOML "${sources.helix}/${subdir}/catppuccin_${cfg.flavor}.toml";
+    xdg.configFile = {
+      "helix/themes/catppuccin-${cfg.flavor}.toml".source =
+        "${sources.helix}/${subdir}/catppuccin_${cfg.flavor}.toml";
     };
   };
 }
diff --git a/modules/home-manager/yazi.nix b/modules/home-manager/yazi.nix
@@ -25,11 +25,10 @@ in
   };
 
   config = lib.mkIf enable {
-    programs.yazi = {
-      theme = lib.importTOML "${sources.yazi}/${cfg.flavor}/catppuccin-${cfg.flavor}-${cfg.accent}.toml";
-    };
-
     xdg.configFile = {
+      "yazi/theme.toml".source =
+        "${sources.yazi}/${cfg.flavor}/catppuccin-${cfg.flavor}-${cfg.accent}.toml";
+
       "yazi/Catppuccin-${cfg.flavor}.tmTheme".source =
         "${sources.bat}/Catppuccin ${catppuccinLib.mkUpper cfg.flavor}.tmTheme";
     };