roles/common/programs/bat.nix

@@ -1,14 +1,7 @@
 { 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
-	home-manager = {
+	newformat = {
-		users.toast.programs.bat = {
-			enable = true;
-			config = {
-				theme = "catppuccin-mocha";
-			};
-			themes = {
-				catppuccin-mocha = {
 		src = pkgs.fetchFromGitHub {
 			owner = "catppuccin";
 			repo = "bat";
@@ -17,6 +10,17 @@
 		};
 		file = "Catppuccin-mocha.tmTheme";
 	};
+	oldformat = builtins.readFile (newformat.src + "/${newformat.file}");
+in
+{
+	home-manager = {
+		users.toast.programs.bat = {
+			enable = true;
+			config = {
+				theme = "catppuccin-mocha";
+			};
+			themes = {
+				catppuccin-mocha = oldformat;
 			};
 		};
 	};

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" ]; } )
 	];