eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-30 06:59:45 +01:00
Code Issues Releases Wiki Activity

jujutsu: support darwin guidelines for config placement

Browse source 
Follow up to #5207, fixing jujutsu module on darwin targets.

(cherry picked from commit ea72cf548f)
This commit is contained in:
Milo Moisson 2024-07-28 22:54:29 +02:00 committed by Robert Helgesson
parent 849f477e8a
commit 3288b74c61
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/programs/jujutsu.nix
View file

@ -7,6 +7,11 @@ let
cfg = config.programs.jujutsu; cfg = config.programs.jujutsu;
tomlFormat = pkgs.formats.toml { }; tomlFormat = pkgs.formats.toml { };
configDir = if pkgs.stdenv.isDarwin then
"Library/Application Support"
else
config.xdg.configHome;
in { in {
meta.maintainers = [ maintainers.shikanime ]; meta.maintainers = [ maintainers.shikanime ];
@ -51,7 +56,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ cfg.package ]; home.packages = [ cfg.package ];
xdg.configFile."jj/config.toml" = mkIf (cfg.settings != { }) { home.file."${configDir}/jj/config.toml" = mkIf (cfg.settings != { }) {
source = tomlFormat.generate "jujutsu-config" (cfg.settings source = tomlFormat.generate "jujutsu-config" (cfg.settings
// optionalAttrs (cfg.ediff) (let // optionalAttrs (cfg.ediff) (let
emacsDiffScript = pkgs.writeShellScriptBin "emacs-ediff" '' emacsDiffScript = pkgs.writeShellScriptBin "emacs-ediff" ''

9
tests/modules/programs/jujutsu/empty-config.nix
View file

@ -1,11 +1,14 @@
{ ... }: { pkgs, ... }:
{ let
configDir =
if pkgs.stdenv.isDarwin then "Library/Application Support" else ".config";
in {
programs.jujutsu.enable = true; programs.jujutsu.enable = true;
test.stubs.jujutsu = { }; test.stubs.jujutsu = { };
nmt.script = '' nmt.script = ''
assertPathNotExists home-files/.config/jj/config.toml assertPathNotExists 'home-files/${configDir}/jj/config.toml'
''; '';
} }

12
tests/modules/programs/jujutsu/example-config.nix
View file

@ -1,6 +1,9 @@
{ config, ... }: { pkgs, config, ... }:
{ let
configDir =
if pkgs.stdenv.isDarwin then "Library/Application Support" else ".config";
in {
programs.jujutsu = { programs.jujutsu = {
enable = true; enable = true;
package = config.lib.test.mkStubPackage { }; package = config.lib.test.mkStubPackage { };
@ -13,9 +16,8 @@
}; };
nmt.script = '' nmt.script = ''
assertFileExists home-files/.config/jj/config.toml assertFileExists 'home-files/${configDir}/jj/config.toml'
assertFileContent \ assertFileContent 'home-files/${configDir}/jj/config.toml' \
home-files/.config/jj/config.toml \
${ ${
builtins.toFile "expected.toml" '' builtins.toFile "expected.toml" ''
[user] [user]