mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-03-29 22:20:21 +00:00
chore: Update Prompt terminal to new name (Ptyxis)
This commit is contained in:
Kyle Gospodnetich
parent
31bb763603
commit
94ea84d2d0
@ -423,18 +423,18 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
|
||||
kdeplasma-addons \
|
||||
rom-properties-kf5 \
|
||||
qvtf \
|
||||
prompt && \
|
||||
ptyxis && \
|
||||
git clone https://github.com/maxiberta/kwin-system76-scheduler-integration.git --depth 1 /tmp/kwin-system76-scheduler-integration && \
|
||||
git clone https://github.com/catsout/wallpaper-engine-kde-plugin.git --depth 1 /tmp/wallpaper-engine-kde-plugin && \
|
||||
kpackagetool5 --type=KWin/Script --global --install /tmp/kwin-system76-scheduler-integration && \
|
||||
kpackagetool5 --type=Plasma/Wallpaper --global --install /tmp/wallpaper-engine-kde-plugin/plugin && \
|
||||
rm -rf /tmp/kwin-system76-scheduler-integration && \
|
||||
rm -rf /tmp/wallpaper-engine-kde-plugin && \
|
||||
sed -i '/<entry name="launchers" type="StringList">/,/<\/entry>/ s/<default>[^<]*<\/default>/<default>preferred:\/\/browser,applications:steam.desktop,applications:net.lutris.Lutris.desktop,applications:org.gnome.Prompt.desktop,applications:org.kde.discover.desktop,preferred:\/\/filemanager<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml && \
|
||||
sed -i '/<entry name="favorites" type="StringList">/,/<\/entry>/ s/<default>[^<]*<\/default>/<default>preferred:\/\/browser,steam.desktop,net.lutris.Lutris.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,org.gnome.Prompt.desktop,org.kde.discover.desktop,system-update.desktop<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.kickoff/contents/config/main.xml && \
|
||||
sed -i 's@\[Desktop Action new-window\]@\[Desktop Action new-window\]\nX-KDE-Shortcuts=Ctrl+Alt+T@g' /usr/share/applications/org.gnome.Prompt.desktop && \
|
||||
sed -i 's@Exec=prompt@Exec=kde-prompt@g' /usr/share/applications/org.gnome.Prompt.desktop && \
|
||||
cp /usr/share/applications/org.gnome.Prompt.desktop /usr/share/kglobalaccel/org.gnome.Prompt.desktop && \
|
||||
sed -i '/<entry name="launchers" type="StringList">/,/<\/entry>/ s/<default>[^<]*<\/default>/<default>preferred:\/\/browser,applications:steam.desktop,applications:net.lutris.Lutris.desktop,applications:org.gnome.Ptyxis.desktop,applications:org.kde.discover.desktop,preferred:\/\/filemanager<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml && \
|
||||
sed -i '/<entry name="favorites" type="StringList">/,/<\/entry>/ s/<default>[^<]*<\/default>/<default>preferred:\/\/browser,steam.desktop,net.lutris.Lutris.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,org.gnome.Ptyxis.desktop,org.kde.discover.desktop,system-update.desktop<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.kickoff/contents/config/main.xml && \
|
||||
sed -i 's@\[Desktop Action new-window\]@\[Desktop Action new-window\]\nX-KDE-Shortcuts=Ctrl+Alt+T@g' /usr/share/applications/org.gnome.Ptyxis.desktop && \
|
||||
sed -i 's@Exec=ptyxis@Exec=kde-ptyxis@g' /usr/share/applications/org.gnome.Ptyxis.desktop && \
|
||||
cp /usr/share/applications/org.gnome.Ptyxis.desktop /usr/share/kglobalaccel/org.gnome.Ptyxis.desktop && \
|
||||
sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.kde.konsole.desktop && \
|
||||
sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/yad-icon-browser.desktop && \
|
||||
rm -f /usr/share/kglobalaccel/org.kde.konsole.desktop && \
|
||||
@ -458,7 +458,7 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
|
||||
vte-profile \
|
||||
libadwaita && \
|
||||
rpm-ostree install \
|
||||
prompt \
|
||||
ptyxis \
|
||||
nautilus-open-any-terminal \
|
||||
nautilus-gsconnect \
|
||||
steamdeck-backgrounds \
|
||||
|
||||
@ -274,7 +274,7 @@ Sebagai tambahan, paket-paket berikut ini digunakan dari repository Copr:
|
||||
| [latencyflex-vulkan-layer](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/) |  |
|
||||
| [noise-suppression-for-voice](https://copr.fedorainfracloud.org/coprs/ycollet/audinux/) |  |
|
||||
| [obs-vkcapture](https://copr.fedorainfracloud.org/coprs/kylegospo/obs-vkcapture/) |  |
|
||||
| [prompt](https://gitlab.gnome.org/chergert/prompt) |  |
|
||||
| [ptyxis](https://gitlab.gnome.org/chergert/ptyxis) |  |
|
||||
| [rom-properties](https://copr.fedorainfracloud.org/coprs/kylegospo/rom-properties/) |  |
|
||||
| [steamdeck-kmod](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/) |  |
|
||||
| [system76-scheduler](https://copr.fedorainfracloud.org/coprs/kylegospo/system76-scheduler/) |  |
|
||||
|
||||
@ -52,7 +52,7 @@ Bazzite es creado con [ublue-os/main](https://github.com/ublue-os/main) y [ublue
|
||||
- Incluida una [extensión de la shell para mostrar las propiedades de ROMs](https://github.com/GerbilSoft/rom-properties) (usados para la emulación de consolas) en el navegador de archivos.
|
||||
- Soporte completo para [Winesync/Fastsync/NTsync](https://github.com/Frogging-Family/wine-tkg-git/issues/936).
|
||||
- [Distrobox](https://github.com/89luca89/distrobox) pre-instalado con actualizaciones automáticas para los contenedores creados.
|
||||
- Se usa por defecto la [terminal Prompt](https://gitlab.gnome.org/chergert/prompt) en todas las imágenes. Esta terminal esta especificamente diseñada para el flujo de trabajo basado en contenedores que usamos en Bazzite. Si deseas regresar a como estaba antes, simplemente ejecuta el siguiente comando en una terminal: `ujust restore-original-terminal`
|
||||
- Se usa por defecto la [terminal Ptyxis](https://gitlab.gnome.org/chergert/ptyxis) en todas las imágenes. Esta terminal esta especificamente diseñada para el flujo de trabajo basado en contenedores que usamos en Bazzite. Si deseas regresar a como estaba antes, simplemente ejecuta el siguiente comando en una terminal: `ujust restore-original-terminal`
|
||||
- Servicios automatizados `duperemove` y `rmlint` incluidos para reducir el espacio de disco utilizados por los contenidos de los prefijos de WINE.
|
||||
- Soporte de HDMI CEC (para poder controlar todos los dispositivos conectados por HDMI) usando [libCEC](https://libcec.pulse-eight.com/).
|
||||
- [System76-Scheduler](https://github.com/pop-os/system76-scheduler) pre-instalado, proveyendo ajustes automáticos de la prioridad de procesos a tu aplicación actualmente en uso, manteniendo al mínimo el tiempo que tu procesador (CPU) trabaja con procesos de fondo.
|
||||
@ -353,7 +353,7 @@ Adicionalmente, los paquetes listados a continuación provienen de otros reposit
|
||||
| [latencyflex-vulkan-layer](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/) |  |
|
||||
| [noise-suppression-for-voice](https://copr.fedorainfracloud.org/coprs/ycollet/audinux/) |  |
|
||||
| [obs-vkcapture](https://copr.fedorainfracloud.org/coprs/kylegospo/obs-vkcapture/) |  |
|
||||
| [prompt](https://gitlab.gnome.org/chergert/prompt) |  |
|
||||
| [ptyxis](https://gitlab.gnome.org/chergert/prompt) |  |
|
||||
| [rom-properties](https://copr.fedorainfracloud.org/coprs/kylegospo/rom-properties/) |  |
|
||||
| [steamdeck-kmod](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/) |  |
|
||||
| [system76-scheduler](https://copr.fedorainfracloud.org/coprs/kylegospo/system76-scheduler/) |  |
|
||||
|
||||
@ -49,7 +49,7 @@ Bazzite is built from [ublue-os/main](https://github.com/ublue-os/main) and [ubl
|
||||
- [ROM Properties Page shell extension](https://github.com/GerbilSoft/rom-properties) included.
|
||||
- Full support for [Winesync/Fastsync/NTsync](https://github.com/Frogging-Family/wine-tkg-git/issues/936).
|
||||
- [Distrobox](https://github.com/89luca89/distrobox) preinstalled with automatic updates for created containers.
|
||||
- [Prompt Terminal](https://gitlab.gnome.org/chergert/prompt) used as the default in all images. This terminal is specifically designed for the container workflow you'll use in Bazzite. If you wish to return to stock, run `ujust restore-original-terminal`
|
||||
- [Ptyxis Terminal](https://gitlab.gnome.org/chergert/ptyxis) used as the default in all images. This terminal is specifically designed for the container workflow you'll use in Bazzite. If you wish to return to stock, run `ujust restore-original-terminal`
|
||||
- Automated `duperemove` and `rmlint` services for reducing the disk space used by wine prefix contents.
|
||||
- Support for HDMI CEC via [libCEC](https://libcec.pulse-eight.com/).
|
||||
- [System76-Scheduler](https://github.com/pop-os/system76-scheduler) preinstalled, providing automatic process priority tweaks to your focused application and keeping CPU time for background processes to a minimum.
|
||||
@ -334,7 +334,7 @@ Additionally, the following packages are used from other Copr repos:
|
||||
| [nerd-fonts](https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/) |  |
|
||||
| [noise-suppression-for-voice](https://copr.fedorainfracloud.org/coprs/ycollet/audinux/) |  |
|
||||
| [obs-vkcapture](https://copr.fedorainfracloud.org/coprs/kylegospo/obs-vkcapture/) |  |
|
||||
| [prompt](https://gitlab.gnome.org/chergert/prompt) |  |
|
||||
| [ptyxis](https://gitlab.gnome.org/chergert/ptyxis) |  |
|
||||
| [rom-properties](https://copr.fedorainfracloud.org/coprs/kylegospo/rom-properties/) |  |
|
||||
| [steamdeck-kmod](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/) |  |
|
||||
| [system76-scheduler](https://copr.fedorainfracloud.org/coprs/kylegospo/system76-scheduler/) |  |
|
||||
|
||||
@ -3,8 +3,8 @@ LookAndFeelPackage=com.valve.vapor.desktop
|
||||
SingleClick=false
|
||||
|
||||
[General]
|
||||
TerminalApplication=kde-prompt
|
||||
TerminalService=org.gnome.Prompt.desktop
|
||||
TerminalApplication=kde-ptyxis
|
||||
TerminalService=org.gnome.Ptyxis.desktop
|
||||
fixed=Fira Code,10,-1,5,50,0,0,0,0,0
|
||||
font=Noto Sans,10,-1,5,50,0,0,0,0,0
|
||||
menuFont=Noto Sans,10,-1,5,50,0,0,0,0,0
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
kcm_plymouth.desktop=false
|
||||
|
||||
[General]
|
||||
+TerminalApplication=kde-prompt
|
||||
+TerminalService=org.gnome.Prompt.desktop
|
||||
+TerminalApplication=kde-ptyxis
|
||||
+TerminalService=org.gnome.Ptyxis.desktop
|
||||
+fixed=Fira Code,9,-1,5,50,0,0,0,0,0
|
||||
font=Noto Sans,11,-1,5,50,0,0,0,0,0
|
||||
menuFont=Noto Sans,11,-1,5,50,0,0,0,0,0
|
||||
|
||||
@ -5,7 +5,7 @@ args=("${@//-e/--}")
|
||||
|
||||
# Dolphin integration requires --new-window to function properly
|
||||
if [[ ! "${args[@]}" =~ "--" && ! "${args[@]}" =~ "-h" && ! "${args[@]}" =~ "-x" ]]; then
|
||||
/usr/bin/prompt --new-window "${args[@]}"
|
||||
/usr/bin/ptyxis --new-window "${args[@]}"
|
||||
else
|
||||
/usr/bin/prompt "${args[@]}"
|
||||
/usr/bin/ptyxis "${args[@]}"
|
||||
fi
|
||||
@ -1,9 +1,9 @@
|
||||
[org/gnome/Prompt]
|
||||
[org/gnome/Ptyxis]
|
||||
restore-session=false
|
||||
restore-window-size=false
|
||||
profile-uuids=['2871e8027773ae74d6c87a5f659bbc74']
|
||||
default-profile-uuid='2871e8027773ae74d6c87a5f659bbc74'
|
||||
|
||||
[org/gnome/Prompt/Profiles/2871e8027773ae74d6c87a5f659bbc74]
|
||||
[org/gnome/Ptyxis/Profiles/2871e8027773ae74d6c87a5f659bbc74]
|
||||
palette='vapor'
|
||||
opacity=0.9
|
||||
|
||||
@ -61,25 +61,25 @@ if [[ ! -f "$GRADIENCE_DIR/vgui2.json" ]]; then
|
||||
cp "$GRADIENCE_THEME_DIR/vgui2.json" "$GRADIENCE_DIR/vgui2.json"
|
||||
fi
|
||||
|
||||
PROMPT_THEME_DIR="/usr/etc/skel/.local/share/org.gnome.Prompt/palettes"
|
||||
PROMPT_DIR="$HOME/.local/share/org.gnome.Prompt/palettes"
|
||||
mkdir -p "$PROMPT_DIR"
|
||||
if [[ ! -f "$PROMPT_DIR/vapor.palette" ]]; then
|
||||
cp "$PROMPT_THEME_DIR/vapor.palette" "$PROMPT_DIR/vapor.palette"
|
||||
PTYXIS_THEME_DIR="/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes"
|
||||
PTYXIS_DIR="$HOME/.local/share/org.gnome.Ptyxis/palettes"
|
||||
mkdir -p "$PTYXIS_DIR"
|
||||
if [[ ! -f "$PTYXIS_DIR/vapor.palette" ]]; then
|
||||
cp "$PTYXIS_THEME_DIR/vapor.palette" "$PTYXIS_DIR/vapor.palette"
|
||||
fi
|
||||
if [[ ! -f "$PROMPT_DIR/vgui2.palette" ]]; then
|
||||
cp "$PROMPT_THEME_DIR/vgui2.palette" "$PROMPT_DIR/vgui2.palette"
|
||||
if [[ ! -f "$PTYXIS_DIR/vgui2.palette" ]]; then
|
||||
cp "$PTYXIS_THEME_DIR/vgui2.palette" "$PTYXIS_DIR/vgui2.palette"
|
||||
fi
|
||||
|
||||
# Initialize Prompt config
|
||||
# Initialize Ptyxis config
|
||||
# This is intentionally run on both images to ensure a user rebasing from Silverblue to Kinoite
|
||||
# doesn't get their Prompt config wiped out.
|
||||
echo 'Configuring Prompt'
|
||||
if [[ ! -f "$BAZZITE_CONFIG_DIR/prompt-initialized" ]]; then
|
||||
# doesn't get their Ptyxis config wiped out.
|
||||
echo 'Configuring Ptyxis'
|
||||
if [[ ! -f "$BAZZITE_CONFIG_DIR/ptyxis-initialized" ]]; then
|
||||
if [[ $BASE_IMAGE_NAME =~ "kinoite" ]]; then
|
||||
dconf load / < /etc/dconf/db/local.d/02-bazzite-kde
|
||||
fi
|
||||
touch "$BAZZITE_CONFIG_DIR/prompt-initialized"
|
||||
touch "$BAZZITE_CONFIG_DIR/ptyxis-initialized"
|
||||
fi
|
||||
|
||||
if [[ $BASE_IMAGE_NAME =~ "kinoite" ]]; then
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
#!/usr/bin/bash
|
||||
|
||||
if command -v /usr/bin/prompt > /dev/null; then
|
||||
if command -v /usr/bin/ptyxis > /dev/null; then
|
||||
if [[ -z "$@" ]]; then
|
||||
/usr/bin/prompt --new-window
|
||||
/usr/bin/ptyxis --new-window
|
||||
else
|
||||
/usr/bin/prompt -- "$@"
|
||||
/usr/bin/ptyxis -- "$@"
|
||||
fi
|
||||
elif grep '^org\.gnome\.Prompt$' <<< $(/usr/bin/flatpak list --app --columns=application); then
|
||||
elif grep '^org\.gnome\.Ptyxis$' <<< $(/usr/bin/flatpak list --app --columns=application); then
|
||||
if [[ -z "$@" ]]; then
|
||||
/usr/bin/flatpak run org.gnome.Prompt --new-window
|
||||
/usr/bin/flatpak run org.gnome.Ptyxis --new-window
|
||||
else
|
||||
/usr/bin/flatpak run org.gnome.Prompt -- "$@"
|
||||
/usr/bin/flatpak run org.gnome.Ptyxis -- "$@"
|
||||
fi
|
||||
else
|
||||
/usr/bin/gnome-terminal -- "$@"
|
||||
|
||||
@ -15,8 +15,8 @@ tap-to-click=true
|
||||
|
||||
[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0]
|
||||
binding='<Control><Alt>t'
|
||||
command='prompt --new-window'
|
||||
name='Prompt'
|
||||
command='ptyxis --new-window'
|
||||
name='Ptyxis'
|
||||
|
||||
[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1]
|
||||
binding='<Control><Alt>KP_Delete'
|
||||
@ -49,12 +49,12 @@ download-updates=false
|
||||
download-updates-notify=false
|
||||
|
||||
[com/github/stunkymonkey/nautilus-open-any-terminal]
|
||||
terminal='prompt'
|
||||
terminal='ptyxis'
|
||||
keybindings=''
|
||||
new-tab=false
|
||||
flatpak='off'
|
||||
|
||||
[org/gnome/Prompt]
|
||||
[org/gnome/Ptyxis]
|
||||
restore-session=false
|
||||
restore-window-size=false
|
||||
|
||||
@ -63,7 +63,7 @@ symbolic-icon=false
|
||||
menu-button-icon-image=0
|
||||
menu-button-icon-size=20
|
||||
hide-icon-shadow=false
|
||||
menu-button-terminal='prompt --new-window'
|
||||
menu-button-terminal='ptyxis --new-window'
|
||||
menu-button-system-monitor='flatpak run io.missioncenter.MissionCenter'
|
||||
menu-button-extensions-app='com.mattjakeman.ExtensionManager.desktop'
|
||||
menu-button-software-center='gnome-software'
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
[org/gnome/shell]
|
||||
favorite-apps=['org.mozilla.firefox.desktop', 'steam.desktop', 'net.lutris.Lutris.desktop', 'org.gnome.Software.desktop', 'org.gnome.Prompt.desktop', 'org.gnome.Nautilus.desktop']
|
||||
favorite-apps=['org.mozilla.firefox.desktop', 'steam.desktop', 'net.lutris.Lutris.desktop', 'org.gnome.Software.desktop', 'org.gnome.Ptyxis.desktop', 'org.gnome.Nautilus.desktop']
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user