programs.sway: always wrap the provided package #4039

teto · 2023-05-31T12:57:50Z

when swapping the sway package with another (e.g., "swayfx") we lose HM's wrapping like session variables, command line arguments etc for no reason. It's inconsistent with how the neovim module behaves too.

If someone wants to bypass the HM wrapping, it's still possible to wrap the package with a function .

Description

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.

modules/services/window-managers/i3-sway/sway.nix

ncfavier · 2023-05-31T13:38:42Z

modules/services/window-managers/i3-sway/sway.nix

@@ -335,7 +328,7 @@ in {

    package = mkOption {
      type = with types; nullOr package;
-      default = defaultSwayPackage;
+      default = pkgs.sway;
      defaultText = literalExpression "${pkgs.sway}";


While you're at it

Suggested change

defaultText = literalExpression "${pkgs.sway}";

defaultText = literalExpression "pkgs.sway";

I've used swayfx to show something different than the default.

also it should have been sway-unwrapped anyway

The defaultText should show what the default value is. Use example for an example.

teto · 2023-06-03T15:33:28Z

so I lost a few minutes before discovering the tests ran with a mock/stub "sway". It's pretty smart but the module needs to override sway which broke with the stub. It was simpler to remove the stub so that's what I have done. My changes to the tests fixed make TEST=sway-bar-focused-colors test but before I proceed, I would like confirmation that my changes are OK.
I am a bit confused by the status_command @i3status@/bin/i3status that dont seem to get replaced/normalized. Is that due to the change in stubs/is it expected ? cc @rycee @sigprof

it's easier to use overrideAttrs than override IMO, and for the home-manager module I would like to be able to configure sway forks the same way as the original sway which is not possible currently see nix-community/home-manager#4039

teto · 2023-06-10T16:06:07Z

this requires some changes tin nixpkgs to work, so I will try to merge NixOS/nixpkgs#237044 first

it's easier to use overrideAttrs than override IMO, and for the home-manager module I would like to be able to configure sway forks the same way as the original sway which is not possible currently see nix-community/home-manager#4039

when swapping the default package with another (e.g., "swayfx") we lose all kinds of HM properties like the session variable / extra options etc for no reason. It's inconsistent with how the neovim module behaves too. If someone wants to bypass the HM wrapping, it's still possible to wrap the package with a function .

it's easier to use overrideAttrs than override IMO, and for the home-manager module I would like to be able to configure sway forks the same way as the original sway which is not possible currently see nix-community/home-manager#4039

stale · 2023-09-30T14:26:41Z

Thank you for your contribution! I marked this pull request as stale due to inactivity. Please read the relevant sections below before commenting.

If you are the original author of the PR

GitHub sometimes doesn't notify people who commented / reviewed a PR previously when you (force) push commits. If you have addressed the reviews you can officially ask for a review from those who commented to you or anyone else.
If it is unfinished but you plan to finish it, please mark it as a draft.
If you don't expect to work on it any time soon, please consider closing it with a short comment encouraging someone else to pick up your work.
To get things rolling again, rebase the PR against the target branch and address valid comments.

If you are not the original author of the PR

If you want to pick up the work on this PR, please create a new PR and indicate that it supercedes and closes this PR.

stale · 2023-12-29T16:51:05Z

Thank you for your contribution! I marked this pull request as stale due to inactivity. Please read the relevant sections below before commenting.

If you are the original author of the PR

GitHub sometimes doesn't notify people who commented / reviewed a PR previously when you (force) push commits. If you have addressed the reviews you can officially ask for a review from those who commented to you or anyone else.
If it is unfinished but you plan to finish it, please mark it as a draft.
If you don't expect to work on it any time soon, please consider closing it with a short comment encouraging someone else to pick up your work.
To get things rolling again, rebase the PR against the target branch and address valid comments.

If you are not the original author of the PR

If you want to pick up the work on this PR, please create a new PR and indicate that it supercedes and closes this PR.

rycee · 2023-12-31T10:19:29Z

The sway-stubs.nix file contains i3status = { };, which I think would explain the @i3status@.

Does this change mean that the CI will download Sway and its dependencies?

ncfavier reviewed May 31, 2023

View reviewed changes

modules/services/window-managers/i3-sway/sway.nix Outdated Show resolved Hide resolved

ncfavier reviewed May 31, 2023

View reviewed changes

teto force-pushed the sway-wrapper branch 4 times, most recently from 3fb5f15 to 9d893bb Compare June 3, 2023 15:31

teto force-pushed the sway-wrapper branch 4 times, most recently from b4c40d1 to 3dd6e0f Compare June 6, 2023 11:39

teto added the window-manager label Jun 11, 2023

teto mentioned this pull request Jun 11, 2023

sway-unwrapped: rename wlroots_0_16 argument to wlroots NixOS/nixpkgs#237044

Merged

12 tasks

teto mentioned this pull request Jul 2, 2023

flake.lock: Update #4161

Merged

teto added 2 commits July 2, 2023 15:03

ci: attempts to fix

2ace874

teto force-pushed the sway-wrapper branch from 3dd6e0f to 2ace874 Compare July 2, 2023 13:19

stale bot added the status: stale label Sep 30, 2023

teto removed the status: stale label Sep 30, 2023

stale bot added the status: stale label Dec 29, 2023

stale bot removed the status: stale label Dec 31, 2023

rycee added the pinned Prevent marking as stale label Dec 31, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

programs.sway: always wrap the provided package #4039

programs.sway: always wrap the provided package #4039

teto commented May 31, 2023 •

edited

Loading

ncfavier May 31, 2023

teto May 31, 2023

teto May 31, 2023

ncfavier May 31, 2023

teto commented Jun 3, 2023

teto commented Jun 10, 2023

stale bot commented Sep 30, 2023

stale bot commented Dec 29, 2023

rycee commented Dec 31, 2023

	defaultText = literalExpression "${pkgs.sway}";
	defaultText = literalExpression "pkgs.sway";

programs.sway: always wrap the provided package #4039

Are you sure you want to change the base?

programs.sway: always wrap the provided package #4039

Conversation

teto commented May 31, 2023 • edited Loading

Description

Checklist

ncfavier May 31, 2023

Choose a reason for hiding this comment

teto May 31, 2023

Choose a reason for hiding this comment

teto May 31, 2023

Choose a reason for hiding this comment

ncfavier May 31, 2023

Choose a reason for hiding this comment

teto commented Jun 3, 2023

teto commented Jun 10, 2023

stale bot commented Sep 30, 2023

stale bot commented Dec 29, 2023

rycee commented Dec 31, 2023

teto commented May 31, 2023 •

edited

Loading