roles/common/programs/bat.nix

@@ -1,5 +1,17 @@
 { 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 = {
@@ -8,15 +20,7 @@
 				theme = "catppuccin-mocha";
 			};
 			themes = {
-				catppuccin-mocha = {
+				catppuccin-mocha = oldformat;
-					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.packages = [
+	fonts.fonts = [ 
 		( pkgs.nerdfonts.override { fonts = [ "Hack" "JetBrainsMono" ]; } )
 	];