Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jujutsu: update module to respect XDG config placement #5207

Merged
merged 1 commit into from
May 10, 2024

Conversation

mrnossiom
Copy link
Contributor

@mrnossiom mrnossiom commented Mar 31, 2024

Description

Use the new supported XDG config place instead of home directory to make it cleaner

Checklist

  • Change is backwards compatible.

  • Code formatted with ./format.

  • Code tested through nix-shell --pure tests -A run.all or nix develop --ignore-environment .#all using Flakes.

  • Test cases updated/added. See example.

  • Commit messages are formatted like

    {component}: {description}
    
    {long description}
    

    See CONTRIBUTING for more information and recent commit messages for examples.

@shikanime

@mrnossiom mrnossiom force-pushed the fix/jujutsu-xdg-config branch from 5cd33c9 to 754491b Compare April 1, 2024 15:30
@mrnossiom mrnossiom changed the title fix: fix: update jujutsu module to respect XDG config placement jujutsu: update jujutsu module to respect XDG config placement Apr 1, 2024
@mrnossiom mrnossiom changed the title jujutsu: update jujutsu module to respect XDG config placement jujutsu: update module to respect XDG config placement Apr 1, 2024
@rycee rycee force-pushed the fix/jujutsu-xdg-config branch from 754491b to d768262 Compare May 10, 2024 22:34
@rycee rycee merged commit d768262 into nix-community:master May 10, 2024
3 checks passed
@rycee
Copy link
Member

rycee commented May 10, 2024

Thanks! Merged to master now 🙂

@mrnossiom mrnossiom deleted the fix/jujutsu-xdg-config branch May 10, 2024 23:54
@bnjmnt4n
Copy link

This breaks the configuration on macOS since Jujutsu does not currently support $XDG_CONFIG_HOME on macOS (see martinvonz/jj#3466, related: #5001).

For now, I'm adding the following to my configuration:

home.sessionVariables = lib.mkIf (pkgs.stdenv.hostPlatform.isDarwin) {
  JJ_CONFIG = "${config.xdg.configHome}/jj/config.toml";
};

I'm not sure what the recommended solution is here.

@mrnossiom
Copy link
Contributor Author

mrnossiom commented May 19, 2024

It's possible to branch on isDarwin and place the config in the macOS standard directories. There seems to be a lot of discussion around following Apple guidelines for config placement, or just use XDG.

Follow-up PR : #5416

mrnossiom added a commit to mrnossiom/home-manager that referenced this pull request May 19, 2024
Follow up to nix-community#5207, fixing jujutsu module on darwin targets.
mrnossiom added a commit to mrnossiom/home-manager that referenced this pull request Jun 18, 2024
Follow up to nix-community#5207, fixing jujutsu module on darwin targets.
mrnossiom added a commit to mrnossiom/home-manager that referenced this pull request Jul 24, 2024
Follow up to nix-community#5207, fixing jujutsu module on darwin targets.
rycee pushed a commit to mrnossiom/home-manager that referenced this pull request Jul 28, 2024
Follow up to nix-community#5207, fixing jujutsu module on darwin targets.
rycee pushed a commit that referenced this pull request Jul 28, 2024
Follow up to #5207, fixing jujutsu module on darwin targets.
jkachmar pushed a commit to jkachmar/home-manager that referenced this pull request Aug 30, 2024
Follow up to nix-community#5207, fixing jujutsu module on darwin targets.
rycee pushed a commit that referenced this pull request Sep 7, 2024
Follow up to #5207, fixing jujutsu module on darwin targets.

(cherry picked from commit ea72cf5)
PerchunPak pushed a commit to PerchunPak/home-manager that referenced this pull request Sep 17, 2024
Follow up to nix-community#5207, fixing jujutsu module on darwin targets.
Noodlez1232 pushed a commit to Noodlez1232/home-manager that referenced this pull request Nov 21, 2024
Follow up to nix-community#5207, fixing jujutsu module on darwin targets.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants