feat(starship): Starship fixes
Some checks are pending
CI / Format Nix files (push) Waiting to run
CI / Test Modules (push) Waiting to run
CI / Validate sources (push) Waiting to run
Release / Make release (push) Waiting to run
Release / Publish to Flake registries (push) Blocked by required conditions
Build & deploy website / Build site (push) Waiting to run
Build & deploy website / Deploy website (push) Blocked by required conditions

This commit is contained in:
punkfairie 2024-11-02 19:39:55 -07:00
parent 4303182418
commit 4ce7b95d1b
Signed by: punkfairie
GPG key ID: 01823C057725C266
2 changed files with 8 additions and 9 deletions

View file

@ -2,4 +2,4 @@ test:
nix run \ nix run \
--inputs-from "./dev" "github:Mic92/nix-fast-build" -- \ --inputs-from "./dev" "github:Mic92/nix-fast-build" -- \
--no-nom \ --no-nom \
--flake "./dev#checks$(nix eval --raw --impure --expr builtins.currentSystem)" --flake "./dev#checks.$(nix eval --raw --impure --expr builtins.currentSystem)"

View file

@ -2,20 +2,19 @@
config, config,
lib, lib,
... ...
}: let }:
let
inherit (config.rose-pine) sources; inherit (config.rose-pine) sources;
cfg = config.programs.starship.rose-pine; cfg = config.programs.starship.rose-pine;
enable = cfg.enable && config.programs.starship.enable; enable = cfg.enable && config.programs.starship.enable;
themeName = themeName = if (cfg.flavor == "main") then "rose-pine" else "rose-pine-${cfg.flavor}";
if (cfg.flavor == "main") in
then "rose-pine" {
else "rose-pine-${cfg.flavor}"; options.programs.starship.rose-pine = lib.rp.mkRosePineOpt { name = "starship"; };
in {
options.programs.starship.rose-pine = lib.rp.mkRosePineOpt {name = "starship";};
config.programs.starship.settings = lib.mkIf enable ( config.programs.starship.settings = lib.mkIf enable (
lib.importTOML "${sources.starship}/${themeName}.toml" lib.mkDefault (lib.importTOML "${sources.starship}/${themeName}.toml")
); );
} }