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

programs.khal: remove extra new line on config #5221

Merged
merged 1 commit into from
Apr 5, 2024

Conversation

octvs
Copy link
Contributor

@octvs octvs commented Apr 3, 2024

  • Remove mistaken new line in khal config, refer to 1.
  • Make necessary changes on the expected config files

Description

Refer to the commit msg.

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.

  • If this PR adds a new module

    • Added myself as module maintainer. See example.

Maintainer CC

@teto

@teto
Copy link
Collaborator

teto commented Apr 3, 2024

thanks a lot for cleaning up my mess <3
I must confess I am a bit surprised to see a contribution just to cleanup newlines (even though I am guilty of this myself but for systemd units, not generated files).
I can merge this as it is or if you are interested, you could add "addresses" support #5192 which would make home-manager support all the account-specific options of khal.

@octvs
Copy link
Contributor Author

octvs commented Apr 3, 2024 via email

@octvs
Copy link
Contributor Author

octvs commented Apr 3, 2024 via email

@rycee
Copy link
Member

rycee commented Apr 4, 2024

LGTM but I'll let @teto have the last word 🙂

@octvs
Copy link
Contributor Author

octvs commented Apr 4, 2024 via email

@sumnerevans sumnerevans requested a review from teto April 4, 2024 22:19
@teto
Copy link
Collaborator

teto commented Apr 5, 2024

@octvs you are the goat ! Looks fine apart from the formatting that is off as the CI tells you. Format them and we are all good. You dont have to squash, we can do it from the github UI, and actually the home-manager project forces the squash so we dont even have a choice.

- Add `accounts.<calendar|contact>.accounts.<name>.khal.addresses`
  option to enable new configuration option, "addresses", from khal,
  which is used for showing participation status [1].
- Remove mistaken new line in khal implementation, refer to [2].
- Make additions to the existing test case to check the new addresses
  feature. And remove the empty lines in expected configs.

[1]: https://khal.readthedocs.io/en/latest/configure.html#the-calendars-section
[2]: nix-community#5192 (review)
@octvs
Copy link
Contributor Author

octvs commented Apr 5, 2024 via email

@teto teto merged commit 782eed8 into nix-community:master Apr 5, 2024
3 checks passed
@teto
Copy link
Collaborator

teto commented Apr 5, 2024

thank you for agreeing to my unsreasonable requests and welcome to home-manager ;)

@octvs octvs deleted the fix-khal-conf branch April 5, 2024 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants