diff --git a/Justfile b/Justfile index 609699c..1765794 100644 --- a/Justfile +++ b/Justfile @@ -4,7 +4,6 @@ prefix := rootdir + '/usr' clean := '0' debug := '0' vendor := '0' -x := '0' target := if debug == '1' { 'debug' } else { 'release' } vendor_args := if vendor == '1' { '--frozen --offline' } else { '' } debug_args := if debug == '1' { '' } else { '--release' } @@ -30,12 +29,8 @@ install: # systemd target install -Dm0644 data/cosmic-session.target {{systemddir}}/cosmic-session.target - # session desktop file - if test {{x}} = 1; then - install -Dm0644 data/cosmic-x.desktop {{sessiondir}}/cosmic.desktop - else - install -Dm0644 data/cosmic.desktop {{sessiondir}}/cosmic.desktop - fi + # session + install -Dm0644 data/cosmic.desktop {{sessiondir}}/cosmic.desktop clean_vendor: rm -rf vendor vendor.tar .cargo/config diff --git a/data/cosmic-x.desktop b/data/cosmic-x.desktop deleted file mode 100644 index b99d166..0000000 --- a/data/cosmic-x.desktop +++ /dev/null @@ -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 diff --git a/data/start-cosmic b/data/start-cosmic index cdec35e..d1e2d81 100755 --- a/data/start-cosmic +++ b/data/start-cosmic @@ -25,16 +25,10 @@ fi export XDG_CURRENT_DESKTOP="${XDG_CURRENT_DESKTOP:=pop:COSMIC}" 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 - -# experimental X support in cosmic, but still prefer wayland -if [[ ! -z "${COSMIC_X}" ]]; then - export DISPLAY=:0 - export GDK_BACKEND=wayland,x11 - export MOZ_ENABLE_WAYLAND=1 - export COSMIC_BACKEND=kms -fi +export GDK_BACKEND=wayland,x11 +export MOZ_ENABLE_WAYLAND=1 # import environment variables from the login manager systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP diff --git a/debian/rules b/debian/rules index 23ad4c1..5a1d807 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,6 @@ DESTDIR = debian/cosmic-session CLEAN ?= 1 VENDOR ?= 1 -X ?= 0 %: dh $@ @@ -25,7 +24,7 @@ override_dh_auto_clean: fi override_dh_auto_build: - just rootdir=$(DESTDIR) debug=$(DEBUG) vendor=$(VENDOR) x=${X} + just rootdir=$(DESTDIR) debug=$(DEBUG) vendor=$(VENDOR) override_dh_auto_install: - just rootdir=$(DESTDIR) x=${X} install + just rootdir=$(DESTDIR) install