diff --git a/srcpkgs/evolution-desktop/INSTALL b/srcpkgs/evolution-desktop/INSTALL index 1ea5dce..e1183ba 100644 --- a/srcpkgs/evolution-desktop/INSTALL +++ b/srcpkgs/evolution-desktop/INSTALL @@ -10,7 +10,9 @@ post) cp -r /run/runit/supervise.agetty-tty1 /run/runit/supervise.greetd cp -r /run/runit/supervise.agetty-tty1 /run/runit/supervise.polkitd cp -r /run/runit/supervise.agetty-tty1 /run/runit/supervise.dbus + tty="$(cat /sys/class/tty/tty0/active | sed 's/.*\(.\)$/\1/')" echo "chvt 5" >> /etc/rc.local + chvt "$tty" rm -rf /var/service/agetty-tty5 sed -i '/ctrl_interface_group=.*$/d' /etc/wpa_supplicant/wpa_supplicant.conf if [ -d /etc/runit/runsvdir/default/wpa_supplicant ]; then diff --git a/srcpkgs/evolution-desktop/INSTALL.msg b/srcpkgs/evolution-desktop/INSTALL.msg index e39dc17..3455ddc 100644 --- a/srcpkgs/evolution-desktop/INSTALL.msg +++ b/srcpkgs/evolution-desktop/INSTALL.msg @@ -1,7 +1,7 @@ ---------------------------------------------------------------------------------- +A reboot is required for changes to take effect. Please reboot your computer. -Evolution Desktop: +Note that you must install drivers for your video card for evolution-desktop to work. - A reboot is required for changes to take effect. Please reboot your computer. +To start evolution-desktop on boot, run the command enabledesktop ---------------------------------------------------------------------------------- +But first, try it out to look for problems by running: evolution-desktop diff --git a/srcpkgs/evolution-desktop/files/bin/enabledesktop b/srcpkgs/evolution-desktop/files/bin/enabledesktop new file mode 100755 index 0000000..ab69b7e --- /dev/null +++ b/srcpkgs/evolution-desktop/files/bin/enabledesktop @@ -0,0 +1,22 @@ +#!/bin/bash + +help() { + echo "Help:" + echo " --help -h: Displays this help" + echo " -r: Disables Evolution-Desktop at launch" + echo " nothing: Enables Evolution-Desktop at launch" +} + +if [[ "$1" = "" ]]; then + ln -s /etc/sv/greetd /etc/runit/runsvdir/default/greetd + echo "Evolution-Desktop will now start at launch." +elif [[ "$1" = "-h" ]]; then + help +elif [[ "$1" = "--help" ]]; then + help +elif [[ "$1" = "-r" ]]; then + rm -f /etc/runit/runsvdir/default/greetd + echo "Evolution-Desktop will no longer start at launch" +else + echo "Unregonised option. Use --help for help." +fi diff --git a/srcpkgs/evolution-desktop/files/bin/startsession b/srcpkgs/evolution-desktop/files/bin/startsession index cb7b982..9d09c9e 100755 --- a/srcpkgs/evolution-desktop/files/bin/startsession +++ b/srcpkgs/evolution-desktop/files/bin/startsession @@ -1,16 +1,20 @@ #!/bin/bash -# Session stuff +# Session config export XDG_RUNTIME_DIR=/run/user/$(id -u) export XDG_SESSION_TYPE=wayland export XDG_SESSION_DESKTOP=wayfire export XDG_CURRENT_DESKTOP=wayfire -# Wayland stuff +# Wayland config export MOZ_ENABLE_WAYLAND=1 export SDL_VIDEODRIVER=wayland export _JAVA_AWT_WM_NONREPARENTING=1 +# Wayfire specific stuff +exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK +CLUTTER_BACKEND=gdk + pidof wayfire &>/dev/null if [ "$?" = "0" ]; then killall wayfire @@ -20,4 +24,3 @@ if [ "$1" = "" ]; then else dbus-run-session $* &>/dev/null fi - diff --git a/srcpkgs/evolution-desktop/files/var/service/greetd b/srcpkgs/evolution-desktop/files/var/service/greetd deleted file mode 120000 index 1c6fe1a..0000000 --- a/srcpkgs/evolution-desktop/files/var/service/greetd +++ /dev/null @@ -1 +0,0 @@ -/etc/sv/greetd/ \ No newline at end of file diff --git a/srcpkgs/evolution-desktop/template b/srcpkgs/evolution-desktop/template index 827c72b..5717d20 100644 --- a/srcpkgs/evolution-desktop/template +++ b/srcpkgs/evolution-desktop/template @@ -1,12 +1,13 @@ pkgname=evolution-desktop version=1.1 -revision=8 +revision=10 build_style=meta maintainer="Tracker-Friendly " short_desc="Desktop and Greeter for EvolutionOS" license="GPL-3.0" homepage="https://evolutionos.codeberg.page" -depends="wayfire greetd wf-shell wcm mesa-dri elogind polkit mate-polkit greetd-gtkgreet gtkloadspinner dbus dconf nautilus alacritty pipewire wireplumber slurp grim alsa-pipewire gnome-system-monitor upower brightnessctl gnome-themes-extra dejavu-fonts-ttf xdg-desktop-portal-wlr xdg-desktop-portal-gtk swaylock swayidle wpa_supplicant wpa-cute evolution-theme-switcher" +depends="wayfire greetd wf-shell wcm mesa mesa-dri elogind polkit mate-polkit greetd-gtkgreet gtkloadspinner dbus dconf nautilus alacritty pipewire wireplumber slurp grim alsa-pipewire gnome-system-monitor upower brightnessctl gnome-themes-extra dejavu-fonts-ttf xdg-desktop-portal-wlr xdg-desktop-portal-gtk swaylock swayidle wpa_supplicant wpa-cute evolution-theme-switcher" +conf_files="/usr/bin/Wayfire /usr/bin/startsession" do_install() { #!/bin/bash @@ -16,6 +17,11 @@ do_install() { vbin ${FILESDIR}/bin/Wayfire vbin ${FILESDIR}/bin/startsession vbin ${FILESDIR}/bin/audioctl + vbin ${FILESDIR}/bin/enabledesktop + touch /usr/bin/Wayfire + chmod +x /usr/bin/Wayfire + ln /usr/bin/Wayfire ${DESTDIR}/usr/bin/evolution-desktop + rm -f /usr/bin/Wayfire mkdir -p ${DESTDIR}/etc/greetd cp ${FILESDIR}/etc/greetd/environments ${DESTDIR}/etc/greetd cp ${FILESDIR}/etc/greetd/wallpaper.png ${DESTDIR}/etc/greetd/ diff --git a/srcpkgs/evolution-patches/template b/srcpkgs/evolution-patches/template index 8732f76..2e33920 100644 --- a/srcpkgs/evolution-patches/template +++ b/srcpkgs/evolution-patches/template @@ -1,15 +1,16 @@ pkgname=evolution-patches version=1.0 -revision=9 +revision=11 build_style=meta maintainer="Tracker-Friendly " short_desc="Simple patches that enable an usable OS out of the box" license="GPL-3.0" homepage="https://evolutionos.codeberg.page" makedepends="busybox-core opendoas" -depends="busybox-core opendoas shadowfix" -replaces="grep which gzip tar diffutils coreutils findutils xz wget sed gawk pciutils usbutils tree" +depends="busybox-core opendoas" +replaces="grep which gzip tar diffutils coreutils findutils xz wget sed gawk pciutils usbutils tree shadowfix" provides="awk-0_1" +conf_files="/etc/shadow /etc/doas.conf /etc/sv/agetty-tty1/conf" do_install() { #!/bin/bash @@ -36,6 +37,7 @@ do_install() { cp ${FILESDIR}/main.conf ${DESTDIR}/usr/share/xbps.d/*-0-evolution-main.conf mkdir -p ${DESTDIR}/etc/ cp ${FILESDIR}/doas.conf ${DESTDIR}/etc/doas.conf + touch ${DESTDIR}/etc/shadow ln -sf /bin/doas ${DESTDIR}/usr/bin/sudo } diff --git a/srcpkgs/fastfetch/template b/srcpkgs/fastfetch/template new file mode 100644 index 0000000..45aaa1f --- /dev/null +++ b/srcpkgs/fastfetch/template @@ -0,0 +1,44 @@ +#!/bin/sh +pkgname=fastfetch +version=1.9.1.rc.gb0c1925 +revision=1 +short_desc="Like neofetch, but much faster because written in c (NOT MY SOFTWARE)" +maintainer="Tracker-Friendly " +homepage="https://github.com/fastfetch-cli/fastfetch" +license="GPL-3.0" +makedepends="git cmake chafa-devel dbus-devel dconf-devel glib-devel libmagick-devel NetworkManager-devel + libpulseaudio libX11-devel libxcb-devel libXrandr-devel mesa ocl-icd-devel opencl-headers + pciutils-devel Vulkan-Headers vulkan-loader wayland-devel xfconf-devel zlib-devel gtk+3-devel libgcc make + autoconf automake binutils bison file findutils flex gawk gcc groff + gzip libtool m4 patch pkg-config sed texinfo which sudo" +depends="gtk+3" + +do_build() { + echo "Building..." + cd ${XBPS_BUILDDIR} + rm -rf fastfetch + git clone https://github.com/fastfetch-cli/fastfetch.git --branch dev + cd fastfetch + mkdir build + cmake \ + -B "./build" \ + -S "./" \ + -DCMAKE_BUILD_TYPE='RelWithDebInfo' \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_TESTS='ON' \ + -DENABLE_SQLITE3=OFF \ + -DENABLE_RPM=OFF \ + -DENABLE_IMAGEMAGICK6=OFF \ + -DENABLE_LIBCJSON=OFF \ + -Wno-dev + + cmake \ + --build "./build" + + DESTDIR=${PKGDESTDIR} cmake \ + --install "./build" +} + +do_install() { + : +} diff --git a/srcpkgs/shadowfix/template b/srcpkgs/shadowfix/template deleted file mode 100644 index b2fd355..0000000 --- a/srcpkgs/shadowfix/template +++ /dev/null @@ -1,16 +0,0 @@ -pkgname=shadowfix -version=1.0 -revision=0 -build_style=meta -maintainer="Tracker-Friendly " -short_desc="Something that should only ever be installed ONCE. EVER." -license="GPL-3.0" -homepage="https://evolutionos.codeberg.page" - -do_install() { - #!/bin/bash - - mkdir -p ${DESTDIR}/etc/ - - touch ${DESTDIR}/etc/shadow -}