Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

bottom: use xdg.configHome on Darwin

Browse source 
Both locations are supported, see

  https://clementtsang.github.io/bottom/nightly/configuration/config-file/default-config/
This commit is contained in:
Utkarsh Gupta 2023-04-14 15:06:38 +05:30 committed by Robert Helgesson
parent cd690d2021
commit e17e5e4f48
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
3 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/programs/bottom.nix
View file

@ -8,11 +8,6 @@ let
tomlFormat = pkgs.formats.toml { };
configDir = if pkgs.stdenv.isDarwin then
"Library/Application Support"
else
config.xdg.configHome;
in {
options = {
programs.bottom = {
@ -32,8 +27,7 @@ in {
default = { };
description = ''
Configuration written to
<filename>$XDG_CONFIG_HOME/bottom/bottom.toml</filename> on Linux or
<filename>$HOME/Library/Application Support/bottom/bottom.toml</filename> on Darwin.
<filename>$XDG_CONFIG_HOME/bottom/bottom.toml</filename>.
</para><para>
See <link xlink:href="https://github.com/ClementTsang/bottom/blob/master/sample_configs/default_config.toml"/>
for the default configuration.
@ -57,7 +51,7 @@ in {
config = mkIf cfg.enable {
home.packages = [ cfg.package ];
home.file."${configDir}/bottom/bottom.toml" = mkIf (cfg.settings != { }) {
xdg.configFile."bottom/bottom.toml" = mkIf (cfg.settings != { }) {
source = tomlFormat.generate "bottom.toml" cfg.settings;
};
};

9
tests/modules/programs/bottom/empty-settings.nix
View file

@ -9,13 +9,8 @@ with lib;
package = config.lib.test.mkStubPackage { };
};
nmt.script = let
configDir = if pkgs.stdenv.isDarwin then
"home-files/Library/Application Support"
else
"home-files/.config";
in ''
assertPathNotExists ${configDir}/bottom
nmt.script = ''
assertPathNotExists home-files/.config/bottom
'';
};
}

9
tests/modules/programs/bottom/example-settings.nix
View file

@ -18,14 +18,9 @@ with lib;
};
};
nmt.script = let
configDir = if pkgs.stdenv.isDarwin then
"home-files/Library/Application Support"
else
"home-files/.config";
in ''
nmt.script = ''
assertFileContent \
"${configDir}/bottom/bottom.toml" \
"home-files/.config/bottom/bottom.toml" \
${./example-settings-expected.toml}
'';
};