punkfairie/rose-pine-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(home-manager/lazygit): support darwin without XDG (#313)

Browse source 
* fix(home-manager/lazygit): support darwin without XDG

Lazygit would fail to load becase the wrong path was being generated to
the configuration file on darwin systems when XDG wasn't enabled.

* Refactored

* fix(home-manager/lazygit): actually use xdg directory when it's enabled

---------

Co-authored-by: seth <getchoo@tuta.io>
This commit is contained in:
Alejandro Angulo 2024-08-20 05:17:35 -07:00 committed by GitHub
parent ff4128f8ea
commit 8886a68eda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/home-manager/lazygit.nix
View file

@ -1,9 +1,26 @@
{ config, lib, ... }: {
config,
lib,
pkgs,
...
}:
let let
inherit (lib) ctp; inherit (lib) ctp;
inherit (config.catppuccin) sources; inherit (config.catppuccin) sources;
cfg = config.programs.lazygit.catppuccin; cfg = config.programs.lazygit.catppuccin;
enable = cfg.enable && config.programs.lazygit.enable; enable = cfg.enable && config.programs.lazygit.enable;
# NOTE: On MacOS specifically, k9s expects its configuration to be in
# `~/Library/Application Support` when not using XDG
enableXdgConfig = !pkgs.stdenv.hostPlatform.isDarwin || config.xdg.enable;
configDirectory =
if enableXdgConfig then
config.xdg.configHome
else
"${config.home.homeDirectory}/Library/Application Support";
configFile = "${configDirectory}/lazygit/config.yml";
in in
{ {
options.programs.lazygit.catppuccin = lib.ctp.mkCatppuccinOpt { name = "lazygit"; } // { options.programs.lazygit.catppuccin = lib.ctp.mkCatppuccinOpt { name = "lazygit"; } // {
@ -12,6 +29,6 @@ in
config.home.sessionVariables = lib.mkIf enable { config.home.sessionVariables = lib.mkIf enable {
# Ensure that the default config file is still sourced # Ensure that the default config file is still sourced
LG_CONFIG_FILE = "${sources.lazygit}/themes-mergable/${cfg.flavor}/${cfg.accent}.yml,${config.xdg.configHome}/lazygit/config.yml"; LG_CONFIG_FILE = "${sources.lazygit}/themes-mergable/${cfg.flavor}/${cfg.accent}.yml,${configFile}";
}; };
} }