From 16a517df1440e48987907ec3228b33ceaf967a89 Mon Sep 17 00:00:00 2001
From: Philipp Trulson <philipp@trulson.de>
Date: Sun, 28 Jan 2024 18:03:43 +0100
Subject: [PATCH] sway: Improve OOTB config

---
 s/sway/manifest.x86_64.bin      | Bin 630 -> 646 bytes
 s/sway/manifest.x86_64.jsonc    |  13 ++++++++++++-
 s/sway/pkg/enhance-config.patch |  18 ++++++++++++++++++
 s/sway/stone.yml                |   9 +++++++--
 4 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 s/sway/pkg/enhance-config.patch

diff --git a/s/sway/manifest.x86_64.bin b/s/sway/manifest.x86_64.bin
index 2f2a59a81b8261eddf15a00184c93bdae6602c03..e43971a4ff0d4099192dd030d20ba68c93fba104 100644
GIT binary patch
delta 618
zcmV-w0+s#t1cn8WCx1o&0000000oNTeYB_5n_LP2001`t0RaLiwJ-euXzdXIcAi@$
z&=z$yMD#j%%|;L``#yvDz95ViF9)>v@C5+Jjadu_EA0uL0!si>09pV8|DMZKahof#
z%ca9^_im1$C;lgCLdi;L;P+qYm6l4@gxLp{NLN<L3pb6%mwzFT1g7{Y2Uq@pE0!z&
z)Wk7SM*%~BpvN9j9{2;3$_wi?1FaG^Wa0v*GvX2QL2>y1+$(E@8H6nV7Z#X_+DRkx
zUdK(DJuACZGP_jET>>tsTmdI$wF;{U+7b=@lYodE87%Oxkuk||bVmRa5FDCDW5wwx
z%3exq=BZbwUVpYyTe&+gnZ@U!I0j3*uKif*O{jHp<9L{>#s`Ud6q|61*obdZdqQ1q
zo6_ON>!hL*5EvK}=4rU9lbZ?0!lce+buP`l&)!KjFKaPI`Ks7ij%-FFy|iu%2LA>B
zmH)@FFoge&l^O_OQhBdzV_^l55UCaI#erH(z@%o<_<yVlY4y1{-3tE}tFR;Zml}GZ
zf2=ZTVyMAbLWpA~q$Eiy9k4{Cj@kxcG|3EeC>WWDf&vxW83V+)6<mE70>B#B|1Zm@
z6QC^ZBKd-<0*c2WlbkL~HZP<$+K9aI;M7-zZ%E=3gG7_Fmx|IulaUpvF%|i#)<AqK
zuGB3p{bOMkq4b*nXsjK&@qgGQ?=AH<6&r_WB7!wrQh~7{sD&d&m%?TT3zM;EVW>w<
zU}$!5hwWTD^f=fu01jf=<$d_!5;FK1aAqOwfa9=XYiLhI7N}*k{=J%KL^psAu3Qw0
E(VkNoh5!Hn

delta 602
zcmV-g0;T<i1@;7xCx12o0000000mx6cfq_K#o&Md001-q0RaLiwJ-euXl)Syb{$zI
z&{lCZ1e&}>B81WPiE?0;W#%zhjev0VaY`5rDf}x6phEdaDM<iO09OEmFqFl0uH;}a
z8+N<5vlJciPfZg}R!)`Qf2CJiI$aZHAviK&nI$jWG#cN9Tz?8!;-3_J`6*upzWi5|
z230Kq936rnyEM7-2MV-GxS)v%nNJAEN5_QWKXk9G5oRzN_^+VIP}EWwn)f<x%IsYk
z#*!JPS`GuSz~u=zIaaIClA;Hsqkj<(kR^fx{xLKp8jWs=vc+=c542{WihU|(E47uo
z6O&ndpo&wtG=J>ckgeW?S|>M+m%(amn5suP6K)R~@l9$=s>^LtGTexjSQNs+!h*`Y
z4QF+7Bk^3E>4RM#Y;*6kchb$9R9;xI18Xrx`K;JUHlvYVTDOD={ssOo|Ic%A4E{S-
zZX(L0@?u%XLW^?nk9nXLqXiDO$jzkjT@_L*gn7CV{(m`NCe<_=El*cf_R?Lb!CXQJ
zV<r?OO{D{%M5K<y4N*9%41*>ZnTUb{726pDBw}CYL{x=tRNS%$JqIRnkl1zMu3J|0
zm$z-w9%I?2xl!#Q(wk0e={4#FA||`n+h;#g=Y2S@)+1h*`#-PNc=jDav(SH5fj1x{
z{;*FUvs316A{vLvL=3BYV%XRrpa!Fc<KhP!9H>|W0suugAb49u?}=5rJP2+*04TN_
oS?50dM7DpqXxp?kZWdN;4L?!uf-9L?f2Zb|`;FEimn~{7eWX_h&;S4c

diff --git a/s/sway/manifest.x86_64.jsonc b/s/sway/manifest.x86_64.jsonc
index d030aab2..eb2ea883 100644
--- a/s/sway/manifest.x86_64.jsonc
+++ b/s/sway/manifest.x86_64.jsonc
@@ -5,6 +5,7 @@
 		"sway": {
 			"build-depends": [
 				"binary(cmake)",
+				"binary(scdoc)",
 				"pkgconfig(bash-completion)",
 				"pkgconfig(cairo)",
 				"pkgconfig(fish)",
@@ -60,6 +61,16 @@
 				"/usr/share/fish/vendor_completions.d/sway.fish",
 				"/usr/share/fish/vendor_completions.d/swaymsg.fish",
 				"/usr/share/fish/vendor_completions.d/swaynag.fish",
+				"/usr/share/man/man1/sway.1",
+				"/usr/share/man/man1/swaymsg.1",
+				"/usr/share/man/man1/swaynag.1",
+				"/usr/share/man/man5/sway-bar.5",
+				"/usr/share/man/man5/sway-input.5",
+				"/usr/share/man/man5/sway-output.5",
+				"/usr/share/man/man5/sway.5",
+				"/usr/share/man/man5/swaynag.5",
+				"/usr/share/man/man7/sway-ipc.7",
+				"/usr/share/man/man7/swaybar-protocol.7",
 				"/usr/share/wayland-sessions/sway.desktop",
 				"/usr/share/zsh/site-functions/_sway",
 				"/usr/share/zsh/site-functions/_swaymsg"
@@ -74,6 +85,6 @@
 		}
 	},
 	"source-name": "sway",
-	"source-release": "2",
+	"source-release": "3",
 	"source-version": "1.8.1"
 }
diff --git a/s/sway/pkg/enhance-config.patch b/s/sway/pkg/enhance-config.patch
new file mode 100644
index 00000000..00ad45e9
--- /dev/null
+++ b/s/sway/pkg/enhance-config.patch
@@ -0,0 +1,18 @@
+diff --git a/config.in b/config.in
+index 3eda7ac..55d0e80 100644
+--- a/config.in
++++ b/config.in
+@@ -14,11 +14,11 @@ set $down j
+ set $up k
+ set $right l
+ # Your preferred terminal emulator
+-set $term foot
++set $term alacritty
+ # Your preferred application launcher
+ # Note: pass the final command to swaymsg so that the resulting window can be opened
+ # on the original workspace that the command was run on.
+-set $menu dmenu_path | dmenu | xargs swaymsg exec --
++set $menu tofi-drun | xargs swaymsg exec --
+ 
+ ### Output configuration
+ #
diff --git a/s/sway/stone.yml b/s/sway/stone.yml
index 40072f1e..2eb3c7e6 100644
--- a/s/sway/stone.yml
+++ b/s/sway/stone.yml
@@ -5,7 +5,7 @@
 #
 name        : sway
 version     : '1.8.1'
-release     : 2
+release     : 3
 homepage    : https://github.com/swaywm/sway
 upstreams   :
     - https://github.com/swaywm/sway/releases/download/1.8.1/sway-1.8.1.tar.gz : 73f08fd2cf7948e8af900709efe44eae412ae11c5773960e25c9aa09f73bad41
@@ -16,6 +16,7 @@ license     :
     - MIT
 builddeps   :
     - binary(cmake)
+    - binary(scdoc)
     - pkgconfig(bash-completion)
     - pkgconfig(cairo)
     - pkgconfig(fish)
@@ -31,11 +32,15 @@ builddeps   :
 rundeps     :
     # Let's make sure we have at least one terminal
     - binary(alacritty)
+    - binary(swaybg)
+    - binary(tofi)
+    # For tofi-drun
+    - binary(xargs)
     - liberation-fonts-ttf
-    - swaybg
     # sway needs /usr/share/X11/xkb
     - xkeyboard-config
 setup       : |
+    %patch %(pkgdir)/enhance-config.patch
     %meson
 build       : |
     %meson_build