Desktop: use new fonts format

This reverts commit 0d6bdf7d94.

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";
+				};
 			};
 		};
 	};

roles/desktop/configuration.nix

@@ -9,7 +9,7 @@
 	users.users.toast.extraGroups = [ "scanner" ];
 
 	# Set up fonts
-	fonts.fonts = [ 
+	fonts.packages = [
 		( pkgs.nerdfonts.override { fonts = [ "Hack" "JetBrainsMono" ]; } )
 	];