diff --git a/.sources/sources.json b/.sources/sources.json index acf5d2e..f991a3d 100644 --- a/.sources/sources.json +++ b/.sources/sources.json @@ -100,13 +100,13 @@ "type": "Git", "repository": { "type": "GitHub", - "owner": "catppuccin", + "owner": "rose-pine", "repo": "grub" }, "branch": "main", - "revision": "b8e617076daed2b38292af9e14c0a22e2c2bd659", - "url": "https://github.com/catppuccin/grub/archive/b8e617076daed2b38292af9e14c0a22e2c2bd659.tar.gz", - "hash": "0sx08xc9zd3ys9bgy7z57gngamgh8gm2623s3xbx87d46ami9z36" + "revision": "4a26bd253f4aecb6343e70a98da2e12043739f5a", + "url": "https://github.com/rose-pine/grub/archive/4a26bd253f4aecb6343e70a98da2e12043739f5a.tar.gz", + "hash": "0virkip3zw6z8r05d7767iymyrs7nl7acznskfgivkqgzmzl1ql4" }, "helix": { "type": "Git", @@ -386,5 +386,4 @@ } }, "version": 3 -} - +} \ No newline at end of file diff --git a/modules/nixos/grub.nix b/modules/nixos/grub.nix index 8458d8f..afef32a 100644 --- a/modules/nixos/grub.nix +++ b/modules/nixos/grub.nix @@ -1,26 +1,16 @@ { config, lib, - pkgs, ... -}: -let - inherit (config.catppuccin) sources; - cfg = config.boot.loader.grub.catppuccin; - enable = cfg.enable && config.boot.loader.grub.enable; +}: let + inherit (config.rose-pine) sources; - # TODO @getchoo: upstream this in nixpkgs maybe? idk if they have grub themes - theme = pkgs.runCommand "catppuccin-grub-theme" { } '' - mkdir -p "$out" - cp -r ${sources.grub}/src/catppuccin-${cfg.flavor}-grub-theme/* "$out"/ - ''; -in -{ - options.boot.loader.grub.catppuccin = lib.ctp.mkCatppuccinOpt { name = "grub"; }; + cfg = config.boot.loader.grub.rose-pine; + enable = cfg.enable && config.boot.loader.grub.enable; +in { + options.boot.loader.grub.rose-pine = lib.rp.mkRosePineOpt {name = "grub";}; config.boot.loader.grub = lib.mkIf enable { - font = "${theme}/font.pf2"; - splashImage = "${theme}/background.png"; - inherit theme; + theme = sources.grub; }; }