leyoda/cosmic-session
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: X is supported by Cosmic

Browse source
This commit is contained in:
Ashley Wulber 2023-01-25 11:07:56 -05:00
parent fa898f9228
commit 8d8ac26d7b
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
4 changed files with 7 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Justfile
View file

@ -4,7 +4,6 @@ prefix := rootdir + '/usr'
clean := '0' clean := '0'
debug := '0' debug := '0'
vendor := '0' vendor := '0'
x := '0'
target := if debug == '1' { 'debug' } else { 'release' } target := if debug == '1' { 'debug' } else { 'release' }
vendor_args := if vendor == '1' { '--frozen --offline' } else { '' } vendor_args := if vendor == '1' { '--frozen --offline' } else { '' }
debug_args := if debug == '1' { '' } else { '--release' } debug_args := if debug == '1' { '' } else { '--release' }
@ -30,12 +29,8 @@ install:
# systemd target # systemd target
install -Dm0644 data/cosmic-session.target {{systemddir}}/cosmic-session.target install -Dm0644 data/cosmic-session.target {{systemddir}}/cosmic-session.target
# session desktop file # session
if test {{x}} = 1; then install -Dm0644 data/cosmic.desktop {{sessiondir}}/cosmic.desktop
install -Dm0644 data/cosmic-x.desktop {{sessiondir}}/cosmic.desktop
else
install -Dm0644 data/cosmic.desktop {{sessiondir}}/cosmic.desktop
fi
clean_vendor: clean_vendor:
rm -rf vendor vendor.tar .cargo/config rm -rf vendor vendor.tar .cargo/config

7
data/cosmic-x.desktop
View file

@ -1,7 +0,0 @@
[Desktop Entry]
Name=COSMIC
Comment=This session logs you into the COSMIC desktop with experimental X support
Exec=env COSMIC_X=1 /usr/bin/start-cosmic
TryExec=/usr/bin/start-cosmic
Type=Application
DesktopNames=pop:COSMIC

12
data/start-cosmic
View file

@ -25,16 +25,10 @@ fi
export XDG_CURRENT_DESKTOP="${XDG_CURRENT_DESKTOP:=pop:COSMIC}" export XDG_CURRENT_DESKTOP="${XDG_CURRENT_DESKTOP:=pop:COSMIC}"
export XDG_SESSION_TYPE="${XDG_SESSION_TYPE:=wayland}" export XDG_SESSION_TYPE="${XDG_SESSION_TYPE:=wayland}"
export XCURSOR_THEME="${XCURSOR_THEME:=Adwaita}" export XCURSOR_THEME="${XCURSOR_THEME:=Pop}"
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
export GDK_BACKEND=wayland,x11
# experimental X support in cosmic, but still prefer wayland export MOZ_ENABLE_WAYLAND=1
if [[ ! -z "${COSMIC_X}" ]]; then
export DISPLAY=:0
export GDK_BACKEND=wayland,x11
export MOZ_ENABLE_WAYLAND=1
export COSMIC_BACKEND=kms
fi
# import environment variables from the login manager # import environment variables from the login manager
systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP

5
debian/rules vendored
View file

@ -3,7 +3,6 @@
DESTDIR = debian/cosmic-session DESTDIR = debian/cosmic-session
CLEAN ?= 1 CLEAN ?= 1
VENDOR ?= 1 VENDOR ?= 1
X ?= 0
%: %:
dh $@ dh $@
@ -25,7 +24,7 @@ override_dh_auto_clean:
fi fi
override_dh_auto_build: override_dh_auto_build:
just rootdir=$(DESTDIR) debug=$(DEBUG) vendor=$(VENDOR) x=${X} just rootdir=$(DESTDIR) debug=$(DEBUG) vendor=$(VENDOR)
override_dh_auto_install: override_dh_auto_install:
just rootdir=$(DESTDIR) x=${X} install just rootdir=$(DESTDIR) install