Merge branch 'second' into 'master'

Add SwayFx packges and fix conflicts

See merge request tile-os/tileos-meta!1

debian/control

@@ -250,8 +250,66 @@ Recommends:
  ranger,
  systemd-oomd,
  wlr-randr
+Conflicts:
+ tileos-desktop-swayfx,
+ tileos-desktop-river
 Description: Sway desktop for TileOS
 
+Package: tileos-desktop-swayfx
+Architecture: amd64 arm64
+Depends:
+ alacritty,
+ autotiling,
+ azote,
+ calcurse,
+ cliphist,
+ dunst,
+ grimshot,
+ kanshi,
+ nwg-bar,
+ nwg-displays,
+ nwg-drawer,
+ nwg-look,
+ nwg-wrapper,
+ qtwayland5,
+ qt6-wayland,
+ rofi-wayland,
+ slurp,
+ swappy,
+ swayfx,
+ swaybg,
+ swayidle,
+ swaylock,
+ swayr,
+ sway-systemd,
+ sway-input-config,
+ plymouth-theme-tileos,
+ tileos-desktop-common (= ${binary:Version}),
+ tileos-grub-theme,
+ tileos-settings-sway,
+ tileos-theme-catppuccin,
+ tileos-wallpapers,
+ waybar,
+ wf-recorder,
+ wl-clipboard,
+ wlsunset,
+ xdg-desktop-portal-wlr,
+ xwayland
+Recommends:
+ engrampa,
+ firefox-esr,
+ imv,
+ pavucontrol,
+ pcmanfm-qt,
+ pluma,
+ ranger,
+ systemd-oomd,
+ wlr-randr
+Conflicts:
+ tileos-desktop-sway,
+ tileos-desktop-river
+Description: SwayFx desktop for TileOS
+
 Package: tileos-desktop-river
 Architecture: amd64 arm64
 Depends:
@@ -295,7 +353,9 @@ Recommends:
  pluma,
  ranger,
  wlr-randr
-Conflicts: tileos-desktop-sway
+Conflicts:
+ tileos-desktop-sway,
+ tileos-desktop-swayfx
 Description: River desktop for TileOS (experimental)
 
 Package: tileos-sway-live
@@ -307,6 +367,15 @@ Depends:
  live-config-systemd
 Description: LiveCD components for TileOS (Sway variant)
 
+Package: tileos-swayfx-live
+Architecture: amd64 arm64
+Depends:
+ calamares-settings-tileos-swayfx,
+ live-boot,
+ live-config,
+ live-config-systemd
+Description: LiveCD components for TileOS (SwayFx variant)
+
 Package: tileos-river-live
 Architecture: amd64 arm64
 Depends: