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.

Sign up for GitHub

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

Jump to bottom

nixos/sddm: use attrs instead of plain text #107724

Merged
merged 1 commit into from Dec 28, 2020
Merged

nixos/sddm: use attrs instead of plain text #107724

merged 1 commit into from Dec 28, 2020

Conversation

peterhoeg
Copy link
Member

Motivation for this change

Instead of treating the sddm config a wall of text that doesn't allow us
to override anything, turn it into an attribute set.

We dump extraConfig and instead introduce settings that is merged
with the module defaults to provide the final configuration.

There is some additional noise in here due to nixpkgs-fmt.

We totally should do this everywhere where we are currently just doing a bunch of text but the expected format is one for which we have a generator available (ini, yaml, json, toml).

A few minor additional things:

  1. make the minimum UID for autologin configurable instead of hard-coding 1000
  2. remove references to /bin/sh in the generated scripts
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

aanderse
aanderse reviewed Dec 27, 2020
View reviewed changes
Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! In addition to the comments I left I think it would be better to have a few commits instead of mixing together... if that's not too much a hassle.

nixos/modules/services/x11/display-managers/sddm.nix Outdated
[ "services" "xserver" "displayManager" "sddm" "autoLogin" "user" ]
[ "services" "xserver" "displayManager" "autoLogin" "user" ]
)
(mkRenamedOptionModule
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Different type so you should use mkRemovedOptionModule and mention the new option.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, fixed.

nixos/modules/services/x11/display-managers/sddm.nix Outdated
type = types.lines;
default = "";
settings = mkOption {
type = types.attrs;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have some fancy pants new types available. Take a look at this, specifically format = pkgs.formats.ini {};.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thanks, fixed.

@peterhoeg
Copy link
Member Author

@GrahamcOfBorg build tests.sddm

@peterhoeg
nixos/sddm: use attrs instead of plain text
8ae4f3c 
Instead of treating the sddm config a wall of text that doesn't allow us
to override anything, turn it into an attribute set.

We dump `extraConfig` and instead introduce `settings` that is merged
with the module defaults to provide the final configuration.

There is some additional noise in here due to nixpkgs-fmt.
@peterhoeg
Copy link
Member Author

@GrahamcOfBorg build tests.sddm

@peterhoeg
Copy link
Member Author

@GrahamcOfBorg test sddm

aanderse
aanderse approved these changes Dec 28, 2020
View reviewed changes
Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@peterhoeg peterhoeg merged commit 7d07645 into NixOS:master Dec 28, 2020
@peterhoeg peterhoeg deleted the m/sddm branch December 28, 2020 21:06
@peterhoeg peterhoeg mentioned this pull request Dec 28, 2020
Open
@peterhoeg peterhoeg restored the m/sddm branch December 29, 2020 05:10
@peterhoeg peterhoeg deleted the m/sddm branch July 4, 2021 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aanderse aanderse aanderse approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@peterhoeg @aanderse