eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-27 05:29:46 +01:00
Code Issues Releases Wiki Activity

sway: restore use of pkgs.sway

Browse source 
Using the final package in the `onChange` block broke some use cases.
This restores the old behavior and instead solves the test
dependencies in a different way.

Fixes #1611

This reverts commit 7c3c64208e.
This commit is contained in:
Robert Helgesson 2020-11-16 22:35:07 +01:00
parent 9e01441c5c
commit 4f20ee61c2
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
5 changed files with 50 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/services/window-managers/i3-sway/sway.nix
View file

@ -399,7 +399,7 @@ in {
swaySocket=''${XDG_RUNTIME_DIR:-/run/user/$UID}/sway-ipc.$UID.$(${pkgs.procps}/bin/pgrep -x sway || ${pkgs.coreutils}/bin/true).sock swaySocket=''${XDG_RUNTIME_DIR:-/run/user/$UID}/sway-ipc.$UID.$(${pkgs.procps}/bin/pgrep -x sway || ${pkgs.coreutils}/bin/true).sock
if [ -S $swaySocket ]; then if [ -S $swaySocket ]; then
echo "Reloading sway" echo "Reloading sway"
$DRY_RUN_CMD ${cfg.package}/bin/swaymsg -s $swaySocket reload $DRY_RUN_CMD ${pkgs.sway}/bin/swaymsg -s $swaySocket reload
fi fi
''; '';
}; };

20
tests/modules/services/window-managers/sway/sway-default.nix
View file

@ -2,26 +2,28 @@
with lib; with lib;
{ let
dummy-package = pkgs.runCommandLocal "dummy-package" { } "mkdir $out";
in {
config = { config = {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
package = pkgs.runCommandLocal "dummy-package" { } "mkdir $out" // { package = dummy-package // { outPath = "@sway"; };
outPath = "@sway";
};
# overriding findutils causes issues # overriding findutils causes issues
config.menu = "${pkgs.dmenu}/bin/dmenu_run"; config.menu = "${pkgs.dmenu}/bin/dmenu_run";
}; };
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
dummy-package = super.runCommandLocal "dummy-package" { } "mkdir $out"; dmenu = dummy-package // { outPath = "@dmenu@"; };
dmenu = self.dummy-package // { outPath = "@dmenu@"; }; rxvt-unicode-unwrapped = dummy-package // {
rxvt-unicode-unwrapped = self.dummy-package // {
outPath = "@rxvt-unicode-unwrapped@"; outPath = "@rxvt-unicode-unwrapped@";
}; };
i3status = self.dummy-package // { outPath = "@i3status@"; }; i3status = dummy-package // { outPath = "@i3status@"; };
xwayland = self.dummy-package // { outPath = "@xwayland@"; }; sway = dummy-package // { outPath = "@sway@"; };
xwayland = dummy-package // { outPath = "@xwayland@"; };
}) })
]; ];

23
tests/modules/services/window-managers/sway/sway-followmouse-legacy.nix
View file

@ -2,10 +2,15 @@
with lib; with lib;
{ let
dummy-package = pkgs.runCommandLocal "dummy-package" { } "mkdir $out";
in {
config = { config = {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
package = dummy-package // { outPath = "@sway"; };
config = { config = {
focus.followMouse = false; focus.followMouse = false;
@ -16,15 +21,17 @@ with lib;
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
dmenu = super.dmenu // { outPath = "@dmenu@"; }; dmenu = dummy-package // { outPath = "@dmenu@"; };
rxvt-unicode-unwrapped = super.rxvt-unicode-unwrapped // { rxvt-unicode-unwrapped = dummy-package // {
outPath = "@rxvt-unicode-unwrapped@"; outPath = "@rxvt-unicode-unwrapped@";
}; };
sway-unwrapped = sway = dummy-package // { outPath = "@sway@"; };
pkgs.runCommandLocal "dummy-sway-unwrapped" { version = "1"; } sway-unwrapped = dummy-package // {
"mkdir $out"; outPath = "@sway-unwrapped@";
swaybg = pkgs.writeScriptBin "dummy-swaybg" ""; version = "1";
xwayland = pkgs.writeScriptBin "xwayland" ""; };
swaybg = dummy-package // { outPath = "@swaybg@"; };
xwayland = dummy-package // { outPath = "@xwayland@"; };
}) })
]; ];

20
tests/modules/services/window-managers/sway/sway-followmouse.nix
View file

@ -2,10 +2,15 @@
with lib; with lib;
{ let
dummy-package = pkgs.runCommandLocal "dummy-package" { } "mkdir $out";
in {
config = { config = {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
package = dummy-package // { outPath = "@sway"; };
config = { config = {
focus.followMouse = "always"; focus.followMouse = "always";
@ -16,15 +21,14 @@ with lib;
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
dmenu = super.dmenu // { outPath = "@dmenu@"; }; dmenu = dummy-package // { outPath = "@dmenu@"; };
rxvt-unicode-unwrapped = super.rxvt-unicode-unwrapped // { rxvt-unicode-unwrapped = dummy-package // {
outPath = "@rxvt-unicode-unwrapped@"; outPath = "@rxvt-unicode-unwrapped@";
}; };
sway-unwrapped = sway = dummy-package // { outPath = "@sway@"; };
pkgs.runCommandLocal "dummy-sway-unwrapped" { version = "1"; } sway-unwrapped = dummy-package // { version = "1"; };
"mkdir $out"; swaybg = dummy-package // { outPath = "@swaybg@"; };
swaybg = pkgs.writeScriptBin "dummy-swaybg" ""; xwayland = dummy-package // { outPath = "@xwayland@"; };
xwayland = pkgs.writeScriptBin "xwayland" "";
}) })
]; ];

20
tests/modules/services/window-managers/sway/sway-post-2003.nix
View file

@ -2,28 +2,30 @@
with lib; with lib;
{ let
dummy-package = pkgs.runCommandLocal "dummy-package" { } "mkdir $out";
in {
config = { config = {
home.stateVersion = "20.09"; home.stateVersion = "20.09";
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
package = pkgs.runCommandLocal "dummy-package" { } "mkdir $out" // { package = dummy-package // { outPath = "@sway"; };
outPath = "@sway";
};
# overriding findutils causes issues # overriding findutils causes issues
config.menu = "${pkgs.dmenu}/bin/dmenu_run"; config.menu = "${pkgs.dmenu}/bin/dmenu_run";
}; };
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
dummy-package = super.runCommandLocal "dummy-package" { } "mkdir $out"; dmenu = dummy-package // { outPath = "@dmenu@"; };
dmenu = self.dummy-package // { outPath = "@dmenu@"; }; rxvt-unicode-unwrapped = dummy-package // {
rxvt-unicode-unwrapped = self.dummy-package // {
outPath = "@rxvt-unicode-unwrapped@"; outPath = "@rxvt-unicode-unwrapped@";
}; };
i3status = self.dummy-package // { outPath = "@i3status@"; }; sway = dummy-package // { outPath = "@sway@"; };
xwayland = self.dummy-package // { outPath = "@xwayland@"; }; i3status = dummy-package // { outPath = "@i3status@"; };
xwayland = dummy-package // { outPath = "@xwayland@"; };
}) })
]; ];