root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

start sway support

Browse source
This commit is contained in:
Tobias Powalowski 2023-07-10 10:44:16 +02:00
parent fc2693b157
commit 22eb0db0c6
3 changed files with 59 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
etc/archboot/defaults
View file

@ -22,6 +22,9 @@ _GNOME_PACKAGES="gnome-desktop-4 gnome-shell gnome-terminal gnome-control-center
### KDE/Plasma defaults
# KDE/Plasma packages
_PLASMA_PACKAGES="plasma-wayland-session plasma-desktop konsole kscreen kate dolphin powerdevil ark gwenview"
### SWAY defaults
# Sway packages
_SWAY_PACKAGES="sway foot bemenu-wayland j4-dmenu-desktop"
### Custom Graphical defaults
# Custom packages
_CUSTOM_XORG=""

14
usr/lib/archboot/update/sway.sh Normal file
View file

@ -0,0 +1,14 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: GPL-2.0-only
# created by Tobias Powalowski <tpowa@archlinux.org>
_install_sway() {
_PACKAGES="${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_SWAY_PACKAGES}"
_prepare_sway
}
_start_sway() {
echo -e "Launching \e[1mSway\e[m now..."
echo -e "To relaunch \e[1mSway\e[m use: \e[92msway\e[m"
sway
}
# vim: set ft=sh ts=4 sw=4 et:

42
usr/lib/archboot/update/update.sh
View file

@ -53,6 +53,7 @@ usage () {
if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 2500000 ]]; then
echo -e " \e[1m-xfce\e[m Launch XFCE desktop with VNC sharing enabled."
echo -e " \e[1m-custom-xorg\e[m Install custom X environment."
echo -e " \e[1m-sway\e[m Launch SWAY desktop."
[[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 3400000 ]] && echo -e " \e[1m-custom-wayland\e[m Install custom Wayland environment."
echo ""
fi
@ -519,6 +520,7 @@ _install_graphic () {
[[ -n "${_L_GNOME_WAYLAND}" ]] && _install_gnome_wayland
[[ -n "${_L_PLASMA}" ]] && _install_plasma
[[ -n "${_L_PLASMA_WAYLAND}" ]] && _install_plasma_wayland
[[ -n "${_L_SWAY}" ]] && _install_sway
# only start vnc on xorg environment
echo -e "\e[1mStep 3/3:\e[m Setting up VNC and browser...\e[m"
[[ -n "${_L_XFCE}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}" ]] && _autostart_vnc
@ -529,6 +531,7 @@ _install_graphic () {
[[ -n "${_L_GNOME_WAYLAND}" ]] && _start_gnome_wayland
[[ -n "${_L_PLASMA}" ]] && _start_plasma
[[ -n "${_L_PLASMA_WAYLAND}" ]] && _start_plasma_wayland
[[ -n "${_L_SWAY}" ]] && _start_sway
}
_hint_graphic_installed () {
@ -563,6 +566,19 @@ _prepare_plasma() {
fi
}
_prepare_sway() {
if ! [[ -e /usr/bin/sway ]]; then
echo -e "\e[1mStep 1/3:\e[m Installing SWAY desktop now..."
echo " This will need some time..."
_prepare_graphic "${_PACKAGES}" >/dev/tty7 2>&1
echo -e "\e[1mStep 2/3:\e[m Configuring SWAY desktop..."
_configure_sway >/dev/tty7 2>&1
else
echo -e "\e[1mStep 1/3:\e[m Installing SWAY desktop already done..."
echo -e "\e[1mStep 2/3:\e[m Configuring SWAY desktop already done..."
fi
}
_configure_gnome() {
echo "Configuring Gnome..."
[[ "${_STANDARD_BROWSER}" == "firefox" ]] && gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'firefox.desktop', 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']"
@ -645,6 +661,32 @@ EOF
cp /etc/xdg/autostart/archboot.desktop /usr/share/applications/
}
_configure_sway() {
echo "Configuring Gnome..."
#[[ "${_STANDARD_BROWSER}" == "firefox" ]] && gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'firefox.desktop', 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']"
#[[ "${_STANDARD_BROWSER}" == "chromium" ]] && gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'chromium.desktop', 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']"
echo "Enable bemenu..."
sed -i -e 's|^set $menu.*|set $menu j4-dmenu-desktop --dmenu=\x27bemenu -i --nb "#3f3f3f" --nf "#dcdccc" --fn "pango:DejaVu Sans Mono 12"\x27 --term="foot"|g' /etc/sway/config
echo "Setting wallpaper..."
sed -i -e 's|^output .*|output * bg /usr/share/archboot/grub/archboot-background.png fill|g' /etc/sway/config
echo "Autostarting setup..."
cat << EOF > /etc/xdg/autostart/archboot.desktop
[Desktop Entry]
Type=Application
Name=Archboot Setup
GenericName=Installer
Exec=foot -- /usr/bin/setup
Icon=system-software-install
EOF
cp /etc/xdg/autostart/archboot.desktop /usr/share/applications/
#_HIDE_MENU="avahi-discover bssh bvnc org.gnome.Extensions org.gnome.FileRoller org.gnome.gThumb org.gnome.gedit fluid vncviewer qvidcap qv4l2"
#echo "Hiding ${_HIDE_MENU} menu entries..."
#for i in ${_HIDE_MENU}; do
# echo "[DESKTOP ENTRY]" > /usr/share/applications/"${i}".desktop
# echo 'NoDisplay=true' >> /usr/share/applications/"${i}".desktop
#done
}
_custom_wayland_xorg() {
if [[ -n "${_CUSTOM_WAYLAND}" ]]; then
echo -e "\e[1mStep 1/3:\e[m Installing custom wayland..."