From 637aa23eb672201af4935c6f1b597b8d25a0414f Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Mon, 27 Nov 2023 11:05:12 +0100
Subject: [PATCH] Revert "Bat: use old theme syntax"

This reverts commit 0d6bdf7d94a79070d3fe03d89bbbe4d092f159d5.
---
 roles/common/programs/bat.nix | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/roles/common/programs/bat.nix b/roles/common/programs/bat.nix
index 207887e..2075753 100644
--- a/roles/common/programs/bat.nix
+++ b/roles/common/programs/bat.nix
@@ -1,17 +1,5 @@
 { config, pkgs, ... }:
-let
-	# Home manager on 23.05 doesn't understand the new format, so I'll use the old one until 23.11 becomes stable
-	newformat = {
-		src = pkgs.fetchFromGitHub {
-			owner = "catppuccin";
-			repo = "bat";
-			rev = "master";
-			hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-		};
-		file = "Catppuccin-mocha.tmTheme";
-	};
-	oldformat = builtins.readFile (newformat.src + "/${newformat.file}");
-in
+
 {
 	home-manager = {
 		users.toast.programs.bat = {
@@ -20,7 +8,15 @@ in
 				theme = "catppuccin-mocha";
 			};
 			themes = {
-				catppuccin-mocha = oldformat;
+				catppuccin-mocha = {
+					src = pkgs.fetchFromGitHub {
+						owner = "catppuccin";
+						repo = "bat";
+						rev = "master";
+						hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
+					};
+					file = "Catppuccin-mocha.tmTheme";
+				};
 			};
 		};
 	};