Update cosmic-settings before beta 3 tag

Also added cosmic-initial-setup

.gitmodules

@@ -98,3 +98,11 @@
 	path = cosmic-player
 	url = https://github.com/pop-os/cosmic-player.git
 	branch = master
+[submodule "cosmic-initial-setup"]
+	path = cosmic-initial-setup
+	url = https://github.com/pop-os/cosmic-initial-setup
+	branch = master
+[submodule "pop-launcher"]
+	path = pop-launcher
+	url = https://github.com/pop-os/launcher.git
+	branch = master

README.md

@@ -1,7 +1,6 @@
 # COSMIC Desktop
 
-Currently an incomplete **alpha**. Testing instructions below for various distributions.
-
+Currently in **beta** for Epoch 1 (the first release), which is nearly feature-complete and in the final bug fixing stage. Testing instructions for various distributions are below.
 
 ## Components of COSMIC Desktop
 * [cosmic-applets](https://github.com/pop-os/cosmic-applets)
@@ -13,6 +12,7 @@ Currently an incomplete **alpha**. Testing instructions below for various distri
 * [cosmic-greeter](https://github.com/pop-os/cosmic-greeter)
 * [cosmic-icons](https://github.com/pop-os/cosmic-icons)
 * [cosmic-idle](https://github.com/pop-os/cosmic-idle)
+* [cosmic-initial-setup](https://github.com/pop-os/cosmic-initial-setup)
 * [cosmic-launcher](https://github.com/pop-os/cosmic-launcher)
 * [cosmic-notifications](https://github.com/pop-os/cosmic-notifications)
 * [cosmic-osd](https://github.com/pop-os/cosmic-osd)
@@ -36,108 +36,24 @@ Currently an incomplete **alpha**. Testing instructions below for various distri
 * [cosmic-text](https://github.com/pop-os/cosmic-text)
 * [cosmic-theme](https://github.com/pop-os/cosmic-theme)
 * [cosmic-time](https://github.com/pop-os/cosmic-time)
+
+### COSMIC toolkit for apps and applets
+
 * [libcosmic](https://github.com/pop-os/libcosmic)
 
-## Setup on distributions without packaging of cosmic components
-
-The COSMIC desktop environment requires a few dependencies:
-(This list does not try to be exhaustive, but rather tries to provide a decent starting point. For detailed instructions, check out the individual projects):
-
-- [just](https://github.com/casey/just)
-- rustc
-- libwayland
-- mesa (or third-party libEGL/libGL implementations, though interfacing with mesa's libglvnd is generally recommended).
-- libseat
-- libxkbcommon
-- libinput
-- udev
-- dbus
-
-optionally (though the build-system might currently require these libraries):
-- libsystem
-- libpulse
-- pop-launcher
-- libexpat1
-- libfontconfig
-- libfreetype
-- lld
-- cargo
-- libgbm-dev
-- libclang-dev
-- libpipewire-0.3-dev
-
-Note: `libfontconfig`, `libfreetype`, and `lld` are packages specific to Linux distributions. You may need to find the equivalent version for your distribution if you are not using Pop!_OS.
-
-The required ones can be installed with:
-```
-sudo apt install just rustc libglvnd-dev libwayland-dev libseat-dev libxkbcommon-dev libinput-dev udev dbus libdbus-1-dev libpam0g-dev libpixman-1-dev libssl-dev libflatpak-dev -y
-```
-
-and the optional ones with:
-```
-sudo apt install libsystemd-dev libpulse-dev pop-launcher libexpat1-dev libfontconfig-dev libfreetype-dev mold cargo libgbm-dev libclang-dev libpipewire-0.3-dev -y
-```
-
-They can be installed all at once with:
-```
-sudo apt install just rustc libglvnd-dev libwayland-dev libseat-dev libxkbcommon-dev libinput-dev udev dbus libdbus-1-dev libsystemd-dev libpixman-1-dev libssl-dev libflatpak-dev libpulse-dev pop-launcher libexpat1-dev libfontconfig-dev libfreetype-dev mold cargo libgbm-dev libclang-dev libpipewire-0.3-dev libpam0g-dev -y
-```
-
-### Testing
-
-The easiest way to test COSMIC DE currently is by building a systemd system extension (see `man systemd-sysext`).
-
-```
-git clone --recurse-submodules https://github.com/pop-os/cosmic-epoch
-cd cosmic-epoch
-just sysext
-```
-
-This will create a system-extension called `cosmic-sysext`, that you can move (without renaming!) into e.g. `/var/lib/extensions`.
-After starting systemd-sysext.service (`sudo systemctl enable --now systemd-sysext`) and refreshing (`sudo systemd-sysext refresh`) or rebooting,
-*COSMIC* will be an available option in your favorite display manager.
-
-If you have SELinux enabled (e.g. on Fedora), the installed extension won't have the correct labels applied.
-To test COSMIC, you can temporarily disable it and restart `gdm` (note that this will close your running programs).
-
-```shell
-sudo setenforce 0
-sudo systemctl restart gdm
-```
-
-**Note**: An extension created this way will be linked against specific libraries on your system and will not work on other distributions.
-It also requires the previously mentioned libraries/dependencies at runtime to be installed in your system (the system extension does not carry these libraries).
-
-**Read-Only Filesystem**: If you're not on an immutable distro you may notice that `/usr/` and `/opt/` are read-only.
-this is caused by `systemd-sysext` being enabled, when you are done testing you can disable `systemd-sysext` (`sudo systemctl disable --now systemd-sysext`)
-
-It is thus no proper method for long term deployment.
-
-### Packaging
-
-COSMIC DE is packaged for Pop!_OS. For reference, look at the `debian` folders in the projects repositories.
-These and the `justfile` inside this repository may be used as references on how to package COSMIC DE, though no backwards-compatibility guarantees are provided at this stage.
-
-### Versioning
-
-COSMIC DE is very much still work-in-progress and thus does not follow a versioning scheme so far.
-We do our best to keep the referenced submodule commits in this repository building and working together, as a consequence they might not contain the latest updates and features from these repositories (yet).
-
-Notes on versioning and packaging all these components together properly will be added at a later stage once COSMIC DE gets its first release.
-
 ## Installing on Pop!\_OS
 
-COSMIC DE is in its first alpha release. Using and testing the alpha is welcome. Bugs and breakage are expected.
+COSMIC DE is in its first beta release. We're in a bug fixing stage of development with features largely complete for the first release. Using and testing the beta is welcome. 
 
-### Pop!\_OS 24.04 Alpha
+### Pop!\_OS 24.04 Beta
 
-The recommended way to test COSMIC Epoch on Pop!\_OS is by using the Pop!\_OS 24.04 LTS Alpha release. There are two ways to get the 24.04 Alpha:
+The recommended way to test COSMIC Epoch on Pop!\_OS is by using the Pop!\_OS 24.04 LTS Beta release. There are two ways to get the 24.04 Beta:
 
-- Install it from the [latest Alpha release ISO](https://system76.com/cosmic/).
+- Install it from the [latest Beta release ISO](https://system76.com/cosmic/).
 - Upgrade an existing Pop!\_OS 22.04 installation using the following command: `pop-upgrade release upgrade -f`
     - If you experience problems during the upgrade, please open an issue in the [pop-upgrade GitHub repository](https://github.com/pop-os/upgrade) or join the [Pop!\_OS Mattermost chat server](https://chat.pop-os.org) for assistance.
 
-Pop!\_OS 24.04 Alpha installations will be upgradable to the final 24.04 release, but some manual interventions may occasionally be required during development. If you're using Pop!\_OS 24.04 Alpha, then it's recommended to join the [Pop!\_OS Mattermost chat server](https://chat.pop-os.org) to receive news about the 24.04 development cycle.
+Pop!\_OS 24.04 Beta installations will be upgradable to the final 24.04 release, but some manual interventions may occasionally be required during development. If you're using Pop!\_OS 24.04 Beta, then it's recommended to join the [Pop!\_OS Mattermost chat server](https://chat.pop-os.org) to receive news about the 24.04 development cycle. Join the COSMIC Epoch channel.
 
 ### Pop!\_OS 22.04
 
@@ -211,7 +127,25 @@ dnf install cosmic-desktop
 Then log out, click on your user, and a sprocket at the bottom right shows an additional entry alongside your desktop environments. Change to COSMIC and proceed with log in.
 For further information, you may check the [COPR page](https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch/).
 
-## Installing on openSUSE tumbleweed 
+## Installing on NixOS
+The COSMIC module on NixOS can be enabled by adding the following lines to
+your NixOS configuration file (`configuration.nix` or in your Flake):
+```nix
+  # Enable the login manager
+  services.displayManager.cosmic-greeter.enable = true;
+  # Enable the COSMIC DE itself
+  services.desktopManager.cosmic.enable = true;
+  # Enable XWayland support in COSMIC
+  services.desktopManager.cosmic.xwayland.enable = true;
+```
+
+While some packages like `cosmic-session` might be present in prior versions,
+the modules that add full support for COSMIC were added in **NixOS 25.05**.
+
+You can find more details in the [NixOS 25.05 release notes](https://nixos.org/manual/nixos/unstable/release-notes#sec-release-25.05).
+
+
+## Installing on openSUSE tumbleweed
 Cosmic can be installed by adding X11:COSMIC:Factory repo with opi.
 ```
 opi patterns-cosmic
@@ -233,6 +167,96 @@ Next, install the COSMIC desktop environment and its associated themes:
 Then log out, click on your user, and a sprocket at the bottom right shows an additional entry alongside your desktop environments. Change to COSMIC and proceed with log in.
 For further information, you may check the [Gentoo Wiki](https://wiki.gentoo.org/wiki/COSMIC) or [Overlay Repository](https://github.com/fsvm88/cosmic-overlay).
 
+## Setup on distributions without packaging of COSMIC components
+
+The COSMIC desktop environment requires a few dependencies:
+(This list does not try to be exhaustive, but rather tries to provide a decent starting point. For detailed instructions, check out the individual projects):
+
+- [just](https://github.com/casey/just)
+- rustc
+- libwayland
+- mesa (or third-party libEGL/libGL implementations, though interfacing with mesa's libglvnd is generally recommended).
+- libseat
+- libxkbcommon
+- libinput
+- udev
+- dbus
+
+optionally (though the build-system might currently require these libraries):
+- libsystem
+- libpulse
+- pop-launcher
+- libexpat1
+- libfontconfig
+- libfreetype
+- lld
+- cargo
+- libgbm-dev
+- libclang-dev
+- libpipewire-0.3-dev
+
+Note: `libfontconfig`, `libfreetype`, and `lld` are packages specific to Linux distributions. You may need to find the equivalent version for your distribution if you are not using Pop!_OS.
+
+The required ones can be installed with:
+```
+sudo apt install just rustc libglvnd-dev libwayland-dev libseat-dev libxkbcommon-dev libinput-dev udev dbus libdbus-1-dev libpam0g-dev libpixman-1-dev libssl-dev libflatpak-dev -y
+```
+
+and the optional ones with:
+```
+sudo apt install libsystemd-dev libpulse-dev pop-launcher libexpat1-dev libfontconfig-dev libfreetype-dev mold cargo libgbm-dev libclang-dev libpipewire-0.3-dev -y
+```
+
+They can be installed all at once with:
+```
+sudo apt install just rustc libglvnd-dev libwayland-dev libseat-dev libxkbcommon-dev libinput-dev udev dbus libdbus-1-dev libsystemd-dev libpixman-1-dev libssl-dev libflatpak-dev libpulse-dev pop-launcher libexpat1-dev libfontconfig-dev libfreetype-dev mold cargo libgbm-dev libclang-dev libpipewire-0.3-dev libpam0g-dev -y
+```
+
+### Testing
+
+The easiest way to test COSMIC DE currently is by building a systemd system extension (see `man systemd-sysext`).
+
+```
+git clone --recurse-submodules https://github.com/pop-os/cosmic-epoch
+cd cosmic-epoch
+just sysext
+```
+
+This will create a system-extension called `cosmic-sysext`, which you can move (without renaming!) into e.g. `/var/lib/extensions`.
+After starting systemd-sysext.service (`sudo systemctl enable --now systemd-sysext`) and refreshing (`sudo systemd-sysext refresh`) or rebooting,
+COSMIC will be an available option in your favorite display manager.
+
+If you have SELinux enabled (e.g. on Fedora), the installed extension won't have the correct labels applied.
+To test COSMIC, you can temporarily disable it and restart `gdm` (note that this will close your running programs).
+
+```shell
+sudo setenforce 0
+sudo systemctl restart gdm
+```
+
+**Note**: An extension created this way will be linked against specific libraries on your system and will not work on other distributions.
+It also requires the previously mentioned libraries/dependencies at runtime to be installed in your system (the system extension does not carry these libraries).
+
+**Read-Only Filesystem**: If you're not on an immutable distro you may notice that `/usr/` and `/opt/` are read-only.
+this is caused by `systemd-sysext` being enabled, when you are done testing you can disable `systemd-sysext` (`sudo systemctl disable --now systemd-sysext`)
+
+It is thus not a proper method for long term deployment.
+
+### Packaging
+
+COSMIC DE is packaged for Pop!_OS. For reference, look at the `debian` folders in the projects repositories.
+These and the `justfile` inside this repository may be used as references on how to package COSMIC DE, though no backwards-compatibility guarantees are provided at this stage.
+
+### Versioning
+
+COSMIC DE is still a work-in-progress and thus does not follow a versioning scheme yet.
+We do our best to keep the referenced submodule commits in this repository building and working together; as a consequence, they might not contain the latest updates and features from these repositories (yet).
+The commits corresponding with the current beta release are tagged `epoch-1.0.0-beta.X.Y`, where `X` is the beta release and `Y` is the minor release.
+
+## Translating
+
+To submit translations for COSMIC in your language, please use Weblate: https://hosted.weblate.org/projects/pop-os/ 
+
 ## Contact
 - [Mattermost](https://chat.pop-os.org/)
 - [Twitter](https://twitter.com/pop_os_official)

justfile

@@ -12,6 +12,7 @@ build:
     {{ just }} cosmic-files/build-release
     {{ just }} cosmic-greeter/build-release
     {{ just }} cosmic-idle/build-release
+    {{ just }} cosmic-initial-setup/build-release
     {{ just }} cosmic-launcher/build-release
     {{ just }} cosmic-notifications/build-release
     {{ make }} -C cosmic-osd all
@@ -26,6 +27,7 @@ build:
     {{ just }} cosmic-term/build-release
     {{ make }} -C cosmic-wallpapers all
     {{ make }} -C cosmic-workspaces-epoch all
+    {{ just }} pop-launcher/build-release
     {{ make }} -C xdg-desktop-portal-cosmic all
 
 install rootdir="" prefix="/usr/local": build
@@ -38,6 +40,7 @@ install rootdir="" prefix="/usr/local": build
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-greeter/install
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-icons/install
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-idle/install
+    {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-initial-setup/install
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-launcher/install
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-notifications/install
     {{ make }} -C cosmic-osd install DESTDIR={{rootdir}} prefix={{prefix}}
@@ -47,11 +50,12 @@ install rootdir="" prefix="/usr/local": build
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-screenshot/install
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-settings/install
     {{ make }} -C cosmic-settings-daemon install DESTDIR={{rootdir}} prefix={{prefix}}
-    {{ just }} rootdir={{rootdir}} prefix={{rootdir + prefix}} cosmic-session/install
+    {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-session/install
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-store/install
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-term/install
     {{ make }} -C cosmic-wallpapers install DESTDIR={{rootdir}} prefix={{prefix}}
     {{ make }} -C cosmic-workspaces-epoch install DESTDIR={{rootdir}} prefix={{prefix}}
+    {{ just }} rootdir={{rootdir}} pop-launcher/install
     {{ make }} -C xdg-desktop-portal-cosmic install DESTDIR={{rootdir}} prefix={{prefix}}
 
 _mkdir dir:
@@ -78,6 +82,7 @@ clean:
     {{ just }} cosmic-files/clean
     rm -rf cosmic-greeter/target
     {{ just }} cosmic-idle/clean
+    {{ just }} cosmic-initial-setup/clean
     rm -rf cosmic-launcher/target
     rm -rf cosmic-panel/target
     rm -rf cosmic-player/target
@@ -92,4 +97,5 @@ clean:
     {{ just }} cosmic-term/clean
     {{ make }} -C cosmic-wallpapers clean
     rm -rf cosmic-workspaces-epoch/target
+    {{ just }} pop-launcher/clean
     rm -rf xdg-desktop-portal-cosmic/target