From 5153b7b1a3f83ff175df9be1ab5b17754519ac67 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 27 Oct 2024 21:59:53 +0100 Subject: [PATCH 1/2] sway-unwrapped: 1.9 -> 1.10 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/sw/sway-unwrapped/package.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 6bcff1c52a2d..05a182ac8063 100644 --- a/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "sway-unwrapped"; - version = "1.9"; + version = "1.10"; inherit enableXWayland isNixOS systemdSupport trayEnabled; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = finalAttrs.version; - hash = "sha256-/6+iDkQfdLcL/pTJaqNc6QdP4SRVOYLjfOItEu/bZtg="; + hash = "sha256-PzeU/niUdqI6sf2TCG19G2vNgAZJE5JCyoTwtO9uFTk="; }; patches = [ @@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: { sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in [ (mesonOption "sd-bus-provider" sd-bus-provider) - (mesonEnable "xwayland" finalAttrs.enableXWayland) (mesonEnable "tray" finalAttrs.trayEnabled) ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c39a5cd60f6..b4c7c9ad57c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4410,7 +4410,7 @@ with pkgs; shotman = callPackage ../tools/wayland/shotman { }; sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix { - wlroots = wlroots_0_17; + wlroots = wlroots_0_18; }; swayr = callPackage ../tools/wayland/swayr { }; From eb382ecd5226570a283e8cacc0066c09a276f65e Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 28 Oct 2024 08:40:21 +0100 Subject: [PATCH 2/2] nixos/sway: update default extraPackages Signed-off-by: Sefa Eyeoglu --- nixos/modules/programs/wayland/sway.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix index 1fae6b120074..74fc216569e5 100644 --- a/nixos/modules/programs/wayland/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -85,9 +85,10 @@ in extraPackages = lib.mkOption { type = with lib.types; listOf package; - default = with pkgs; [ swaylock swayidle foot dmenu wmenu ]; + # Packages used in default config + default = with pkgs; [ brightnessctl foot grim pulseaudio swayidle swaylock wmenu ]; defaultText = lib.literalExpression '' - with pkgs; [ swaylock swayidle foot dmenu wmenu ]; + with pkgs; [ brightnessctl foot grim pulseaudio swayidle swaylock wmenu ]; ''; example = lib.literalExpression '' with pkgs; [ i3status i3status-rust termite rofi light ]