fix(home-manager): correctly set btop's theme

catppuccin · Oct 30, 2023 · b343648 · b343648
1 parent 5713b47
commit b343648
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/modules/home-manager/btop.nix b/modules/home-manager/btop.nix
@@ -8,7 +8,8 @@ let
   cfg = config.programs.btop.catppuccin;
   enable = cfg.enable && config.programs.btop.enable;
 
-  themePath = "/themes/catppuccin_${cfg.flavour}.theme";
+  themeFile = "catppuccin_${cfg.flavour}.theme";
+  themePath = "/themes/${themeFile}";
   theme =
     pkgs.fetchFromGitHub
       {
@@ -23,15 +24,14 @@ in
   options.programs.btop.catppuccin =
     lib.ctp.mkCatppuccinOpt "btop" config;
 
-  # xdg is required for this to work
-  config =
+  config = mkIf enable
     {
-      xdg.enable = mkIf enable (lib.mkForce true);
+      xdg = {
+        # xdg is required for this to work
+        enable = lib.mkForce true;
+        configFile."btop${themePath}".source = theme;
+      };
 
-      programs.btop.settings.color_theme =
-        mkIf enable "${config.xdg.configHome + "/btop/${themePath}"}";
-    }
-    // (lib.mkIf enable {
-      xdg.configFile."btop${themePath}".source = theme;
-    });
+      programs.btop.settings.color_theme = themeFile;
+    };
 }