diff --git a/roles/common/programs/bat.nix b/roles/common/programs/bat.nix index 2075753..207887e 100644 --- a/roles/common/programs/bat.nix +++ b/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 = { - src = pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "bat"; - rev = "master"; - hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; - }; - file = "Catppuccin-mocha.tmTheme"; - }; + catppuccin-mocha = oldformat; }; }; };