feat/x-support (#51)

* feat/x-support

* feat/x-support

* fix: Install seciton

* wip: some fixes

* fix: typo

* refactor: set DISPLAY in start-cosmic instead

.gitmodules

@@ -40,3 +40,6 @@
 [submodule "iced-workspaces-applet"]
 	path = iced-workspaces-applet
 	url = https://github.com/pop-os/iced-workspaces-applet.git
+[submodule "wayland-proxy-virtwl"]
+	path = wayland-proxy-virtwl
+	url = https://github.com/talex5/wayland-proxy-virtwl

README.md

@@ -57,6 +57,13 @@ It also requires the previously mentioned libraries/dependencies at runtime to b
 
 It is thus no proper method for long term deployment.
 
+### Experimental X Support
+
+With [opam installed](https://opam.ocaml.org/doc/Install.html) X support using wayland-proxy-virtwl can be optionally enabled during installation. When building, use `just x=1 sysext` and after refreshing with `sudo systemd-sysext refresh`, run
+```
+systemctl --user daemon-reload
+systemctl --user enable --now wayland-proxy-virtwl
+```
 ### Packaging
 
 Cosmic DE is packaged for Pop!_OS for reference look at the `debian` folders in the projects repositories.

data/wayland-proxy-virtwl.service

@@ -0,0 +1,9 @@
+[Unit]
+Description=Wayland-proxy-virtwl
+After=cosmic-session.target
+
+[Service]
+ExecStart=/usr/bin/wayland-proxy-virtwl --wayland-display wayland-virtwl --x-display=0
+
+[Install]
+WantedBy=cosmic-session.target

justfile

@@ -1,6 +1,8 @@
+set dotenv-load
 just := just_executable()
 make := `which make`
 meson := `which meson`
+x := '0'
 
 _meson_build dir:
     -rm -rf {{dir}}_build
@@ -28,7 +30,8 @@ build:
     {{ make }} -C xdg-desktop-portal-cosmic all
 
 sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --short HEAD`): build && (_extension_release dir version)
-    @mkdir -p {{dir}}/usr/lib/extension-release.d/
+    #!/usr/bin/env sh
+    mkdir -p {{dir}}/usr/lib/extension-release.d/
     {{ just }} rootdir={{dir}} cosmic-applets/install
     {{ make }} -C cosmic-applet-host install DESTDIR={{dir}} prefix=/usr
     {{ just }} rootdir={{dir}} cosmic-applibrary/install
@@ -38,11 +41,16 @@ sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --sh
     {{ make }} -C cosmic-osd install DESTDIR={{dir}} prefix=/usr
     {{ make }} -C cosmic-panel install DESTDIR={{dir}} prefix=/usr
     {{ make }} -C cosmic-settings-daemon install DESTDIR={{dir}} prefix=/usr
-    {{ just }} rootdir={{dir}} cosmic-session/install
     {{ just }} _meson_install iced-workspaces-applet {{dir}}
     {{ just }} _meson_install user-color-editor {{dir}}
     {{ make }} -C xdg-desktop-portal-cosmic install DESTDIR={{dir}} prefix=/usr
-
+    if test {{x}} = 1; then
+        install -Dm0644 data/wayland-proxy-virtwl.service {{dir}}/usr/lib/systemd/user/wayland-proxy-virtwl.service
+        opam install ./wayland-proxy-virtwl --destdir={{dir}}/usr
+        {{ just }} x=1 rootdir={{dir}} cosmic-session/install
+    else
+        {{ just }} rootdir={{dir}} cosmic-session/install
+    fi
 _extension_release dir version:
     #!/usr/bin/env sh
     cat >{{dir}}/usr/lib/extension-release.d/extension-release.cosmic-sysext <<EOF