Update groups after testing on a clean installation.main

Update documentation.

2 files changed, 39 insertions, 31 deletions

diff --git a/README.md b/README.md
index 9ac94a0..8db3288 100644
--- a/README.md
+++ b/README.md
@@ -2,31 +2,47 @@
 
 ## Categories
 
- - `service(graphical-login)`
- - `PolicyKit-authentication-agent`
- - `desktop-notification-daemon`
- - Terminal
- - Browser
- - Application launcher
- - Image viewer
- - File manager [optional/just use shell?]
- - Volume applet/mixer
- - Brightness
- - Bluetooth applet
- - Network applet
- - Storage applet (udiskie) [optional]
- - ...?
+- `service(graphical-login)`
+- `PolicyKit-authentication-agent`
+- `desktop-notification-daemon`
+- Terminal
+- Browser
+- Application launcher
+- Image viewer
+- File manager [optional/just use shell?]
+- Volume applet/mixer
+- Brightness
+- Bluetooth applet
+- Network applet
+- Storage applet (udiskie)
+- ...?
+
+## Sources of inspiration
+
+- https://arewewaylandyet.com/
+- https://github.com/swaywm/sway/wiki/Useful-add-ons-for-sway
+- https://github.com/Manjaro-Sway/iso-profiles/blob/sway/community/sway/Packages-Desktop
 
 ## Testing
-```
+
+### Netinstall
+
+1. Download `Fedora-Everything-netinst` image from <https://download.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/iso/>
+2. Begin installation as usual
+3. At the `Installation Source*` screen select `On the network ➡ Closest mirror` and add <https://alebastr.fedorapeople.org/repo/sway-comps/f34/> as an additional repository
+4. At the `Software Selection` screen select environment `Sway Desktop`, adjust the group selection as necessary and proceed with the installation
+
+### Local repository
+
+```sh
 createrepo_c --groupfile sway-comps.xml .
 echo | sudo tee /etc/yum.repos.d/sway-comps.repo <<EOF
 [sway-comps]
 name=Group definitions for Sway desktop
-baseurl=file://${PWD}/
+baseurl=file://\${PWD}/
 enabled=1
 gpgcheck=0
-metadata_expire=1m
+metadata_expire=15m
 skip_if_unavailable=True
 EOF
 sudo dnf groupinfo swaywm
diff --git a/sway-comps.xml b/sway-comps.xml
index 837e400..c72d415 100644
--- a/sway-comps.xml
+++ b/sway-comps.xml
@@ -29,18 +29,21 @@
 
   <group>
     <id>swaywm-extended</id>
-    <name>Additional Utilities for Sway WM</name>
-    <description>Additional Utilities for Sway WM</description>
+    <name>Additional utilities for Sway WM</name>
+    <description>Additional utilities for Sway WM</description>
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">blueman</packagereq>
+      <packagereq type="default">gnome-keyring</packagereq>
       <packagereq type="default">light</packagereq>
       <packagereq type="default">lxqt-policykit</packagereq>
       <packagereq type="default">network-manager-applet</packagereq>
       <packagereq type="default">kanshi</packagereq>
       <packagereq type="default">pavucontrol-qt</packagereq>
       <packagereq type="default">playerctl</packagereq>
+      <!-- /usr/bin/pactl -->
+      <packagereq type="default">pulseaudio-utils</packagereq>
       <packagereq type="optional">waybar</packagereq>
     </packagelist>
   </group>
@@ -59,16 +62,6 @@
     </packagelist>
   </group>
 
-  <group>
-    <id>swaywm-wayland-apps</id>
-    <name>Wayland-native Applications for Sway</name>
-    <description>Graphical applications with native Wayland support for minimal environments</description>
-    <packagelist>
-      <packagereq>alacritty</packagereq>
-      <packagereq>imv</packagereq>
-    </packagelist>
-  </group>
-
   <environment>
     <id>swaywm-desktop-environment</id>
     <name>Sway Desktop</name>
@@ -87,12 +80,11 @@
       <groupid>printing</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>swaywm</groupid>
+      <groupid>swaywm-extended</groupid>
       <groupid>swaywm-graphical-login</groupid>
     </grouplist>
     <optionlist>
       <groupid>firefox</groupid>
-      <groupid>swaywm-extended</groupid>
-      <groupid>swaywm-wayland-apps</groupid>
     </optionlist>
   </environment>
 </comps>