[19.03] Sway 1.0 #57601
Merged
[19.03] Sway 1.0 #57601
+85
−193
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 0c89c44)
(cherry picked from commit 7bf4323)
(cherry picked from commit eb2a26f)
(cherry picked from commit 1240834)
This is the result of executing: git mv -f pkgs/applications/window-managers/sway/beta.nix pkgs/applications/window-managers/sway/default.nix git mv -f nixos/modules/programs/sway-beta.nix nixos/modules/programs/sway.nix And removing sway-beta from the following files: pkgs/top-level/all-packages.nix nixos/modules/module-list.nix (cherry picked from commit 45004c6)
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
(cherry picked from commit 578fe3f)
GrahamcOfBorg
added
6.topic: nixos
GrahamcOfBorg
added
8.has: clean-up
11.by: package-maintainer
|
Wow, 12 commits, there was quite some activity after the branch-off :) I've successfully tested it with |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Sway 0.15.x is old, unmaintained, and not as stable as Sway 1.0. We also want to avoid having the
sway-betamodule in a stable release.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)