From 3ebf6470c1faf31130305159b2f183a6b99dbec3 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 26 Nov 2023 21:55:32 +0000 Subject: [PATCH] nixpkgs: 2023-11-26 -> 2023-11-26 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/c6c20c63b4c1f715f602ecc46e21521e7825c2fb' (2023-11-26) → 'github:nixos/nixpkgs/013f0a99e56eeb1cfb44764fc0d419306b84bbe4' (2023-11-26) ``` --- flake.lock | 6 +++--- hosts/modules/gui/sway/default.nix | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3bccb80f..a45b6f21 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1700998929, - "narHash": "sha256-Ajkz8t8MTCeAlvzEMTyPKrkLfnKQuLAXhMQTWxExqpw=", + "lastModified": 1701035596, + "narHash": "sha256-oZ8zdVQDRGhQ3+1H8rzqwMqxCS1MPJ9T265CuwHB8eI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c6c20c63b4c1f715f602ecc46e21521e7825c2fb", + "rev": "013f0a99e56eeb1cfb44764fc0d419306b84bbe4", "type": "github" }, "original": { diff --git a/hosts/modules/gui/sway/default.nix b/hosts/modules/gui/sway/default.nix index 7b168018..e6ee64de 100644 --- a/hosts/modules/gui/sway/default.nix +++ b/hosts/modules/gui/sway/default.nix @@ -14,16 +14,15 @@ let echo "launching sway-session (sway.desktop)..." | ${systemd-cat} --identifier=sway-session sway 2>&1 | ${systemd-cat} --identifier=sway-session ''; - origSway = (pkgs.wrapSway.override { + origSway = pkgs.sway.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 \