diff --git a/flake.lock b/flake.lock index e5fa82cd..3bccb80f 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700342017, - "narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=", + "lastModified": 1700905716, + "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "decdf666c833a325cb4417041a90681499e06a41", + "rev": "dfb95385d21475da10b63da74ae96d89ab352431", "type": "github" }, "original": { @@ -53,11 +53,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1700908591, - "narHash": "sha256-HlNh+SjBH7H1h4cUecZf2kZOZbBTopG7xXDMfCizdis=", + "lastModified": 1700998929, + "narHash": "sha256-Ajkz8t8MTCeAlvzEMTyPKrkLfnKQuLAXhMQTWxExqpw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e6e261526ebe0762e1fb7a80cd320d09602ade5a", + "rev": "c6c20c63b4c1f715f602ecc46e21521e7825c2fb", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700362823, - "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=", + "lastModified": 1700967639, + "narHash": "sha256-uuUwD/O1QcVk+TWPZFwl4ioUkC8iACj0jEXSyE/wGPI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49a87c6c827ccd21c225531e30745a9a6464775c", + "rev": "4be58d802693d7def8622ff34d36714f8db40371", "type": "github" }, "original": { diff --git a/hosts/modules/gui/sway/default.nix b/hosts/modules/gui/sway/default.nix index 46c432d0..7b168018 100644 --- a/hosts/modules/gui/sway/default.nix +++ b/hosts/modules/gui/sway/default.nix @@ -14,15 +14,16 @@ let echo "launching sway-session (sway.desktop)..." | ${systemd-cat} --identifier=sway-session sway 2>&1 | ${systemd-cat} --identifier=sway-session ''; - origSway = (pkgs.sway.override { + origSway = (pkgs.wrapSway.override { # this override is what `programs.nixos` would do internally if we left `package` unset. + # NOTE(2023/11/26): this wrapper is in flux, see: extraSessionCommands = scfg.extraSessionCommands; extraOptions = scfg.extraOptions; withBaseWrapper = scfg.wrapperFeatures.base; withGtkWrapper = scfg.wrapperFeatures.gtk; isNixOS = true; # TODO: `enableXWayland = ...`? - }); + }) pkgs.sway-unwrapped; desktop-file = pkgs.runCommand "sway-desktop-wrapper" {} '' mkdir -p $out/share/wayland-sessions substitute ${origSway}/share/wayland-sessions/sway.desktop $out/share/wayland-sessions/sway.desktop \