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

sway: Read the configuration from /etc before /nix/store #60319

Merged
merged 1 commit into from Apr 27, 2019
Merged

sway: Read the configuration from /etc before /nix/store #60319

merged 1 commit into from Apr 27, 2019

Conversation

primeos
Copy link
Member

@primeos primeos commented Apr 27, 2019

This change will load all configuration files from /etc, to make it easy
to override them, but fallback to /nix/store/.../etc/sway/config to make
Sway work out-of-the-box with the default configuration on non NixOS
systems.

Notes: I'm using mkOptionDefault instead of mkDefault so that setting environment.etc."sway/config".text = "..."; works as well (see nixos/modules/system/etc/etc.nix, which implements text via source and also uses mkDefault).

See 578fe3f#r33300320 for the motivation of this change.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@primeos
sway: Read the configuration from /etc before /nix/store
779237b 
This change will load all configuration files from /etc, to make it easy
to override them, but fallback to /nix/store/.../etc/sway/config to make
Sway work out-of-the-box with the default configuration on non NixOS
systems.
@primeos primeos requested a review from infinisil as a code owner April 27, 2019 12:45
primeos referenced this pull request Apr 27, 2019
@primeos
nixos/sway: Improve the module and adapt it to NixOS
578fe3f 
This commit contains the following changes:
- nixos/sway: Remove the beta references
- sway: Drop buildDocs
- nixos/sway: Improve the documentation
- sway,nixos/sway: Adapt Sway to NixOS
  - Copy the default configuration file to /etc/sway/config (Sway will
    still load the identical file from the Nix store but this makes it
    easier to copy the default configuration file).
  - This will also remove all references to the Nix store from the
    default configuration file as they will eventually be garbage
    collected which is a problem if the user copies it.
  - I've also decided to drop the default wallpaper (alternatively we
    could copy it to a fixed location).
- nixos/sway: Drop the package option
@primeos primeos mentioned this pull request Apr 27, 2019
Open
22 tasks
@teto teto mentioned this pull request Apr 27, 2019
Merged
10 tasks
@primeos primeos merged commit 15010f0 into NixOS:master Apr 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil Awaiting requested review from infinisil

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

Successfully merging this pull request may close these issues.

None yet
1 participant
@primeos