From 91374e5df44995288a329bdee325eaeb44d777be Mon Sep 17 00:00:00 2001 From: punkfairie Date: Sat, 2 Nov 2024 22:35:46 -0700 Subject: [PATCH] chore(starship): mkDefault caused entire config to be overridden MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert "✨ feat(starship): Starship fixes" This reverts commit 4ce7b95d1bb2d211d39f2697a0884d5eb12d716d. --- Justfile | 2 +- modules/home-manager/starship.nix | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Justfile b/Justfile index c197fd3..5c9d0ab 100644 --- a/Justfile +++ b/Justfile @@ -2,4 +2,4 @@ test: nix run \ --inputs-from "./dev" "github:Mic92/nix-fast-build" -- \ --no-nom \ - --flake "./dev#checks.$(nix eval --raw --impure --expr builtins.currentSystem)" + --flake "./dev#checks$(nix eval --raw --impure --expr builtins.currentSystem)" diff --git a/modules/home-manager/starship.nix b/modules/home-manager/starship.nix index bc3c99e..99957a1 100644 --- a/modules/home-manager/starship.nix +++ b/modules/home-manager/starship.nix @@ -2,19 +2,20 @@ config, lib, ... -}: -let +}: let inherit (config.rose-pine) sources; cfg = config.programs.starship.rose-pine; enable = cfg.enable && config.programs.starship.enable; - themeName = if (cfg.flavor == "main") then "rose-pine" else "rose-pine-${cfg.flavor}"; -in -{ - options.programs.starship.rose-pine = lib.rp.mkRosePineOpt { name = "starship"; }; + themeName = + if (cfg.flavor == "main") + then "rose-pine" + else "rose-pine-${cfg.flavor}"; +in { + options.programs.starship.rose-pine = lib.rp.mkRosePineOpt {name = "starship";}; config.programs.starship.settings = lib.mkIf enable ( - lib.mkDefault (lib.importTOML "${sources.starship}/${themeName}.toml") + lib.importTOML "${sources.starship}/${themeName}.toml" ); }