diff --git a/system_files/shared/etc/bazaar/blocklist.yaml b/system_files/shared/etc/bazaar/blocklist.yaml index 58c9ba5..62239a9 100644 --- a/system_files/shared/etc/bazaar/blocklist.yaml +++ b/system_files/shared/etc/bazaar/blocklist.yaml @@ -1,7 +1,6 @@ # For the rationale about what is included in this list, see https://github.com/ublue-os/aurora/issues/786 blocklists: - block: - - app.devsuite.Ptyxis - com.google.AndroidStudio - com.helix_editor.Helix - com.jetbrains.CLion diff --git a/system_files/shared/etc/dconf/db/distro.d/01-aurora-ptyxis-pallete-opacity b/system_files/shared/etc/dconf/db/distro.d/01-aurora-ptyxis-pallete-opacity deleted file mode 100644 index 19336db..0000000 --- a/system_files/shared/etc/dconf/db/distro.d/01-aurora-ptyxis-pallete-opacity +++ /dev/null @@ -1,6 +0,0 @@ -# Relocatable schemas are located here in dconf -# Some Gnome extensions don't ship gschema XML, so their settings also need to go in dconf - -[org/gnome/Ptyxis/Profiles/2871e8027773ae74d6c87a5f659bbc74] -palette='Breeze' -opacity=0.9 diff --git a/system_files/shared/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette b/system_files/shared/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette deleted file mode 100644 index fcd3bfc..0000000 --- a/system_files/shared/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette +++ /dev/null @@ -1,45 +0,0 @@ -[Palette] -Name=Catppuccin Dynamic -Primary=true - -[Light] -Background=#EFF1F5 -Foreground=#4C4F69 -Cursor=#4C4F69 -Color0=#5C5F77 -Color1=#D20F39 -Color2=#40A02B -Color3=#DF8E1D -Color4=#1E66F5 -Color5=#EA76CB -Color6=#179299 -Color7=#ACB0BE -Color8=#6C6F85 -Color9=#D20F39 -Color10=#40A02B -Color11=#DF8E1D -Color12=#1E66F5 -Color13=#EA76CB -Color14=#179299 -Color15=#BCC0CC - -[Dark] -Background=#1E1E2E -Foreground=#CDD6F4 -Cursor=#CDD6F4 -Color0=#45475A -Color1=#F38BA8 -Color2=#A6E3A1 -Color3=#F9E2AF -Color4=#89B4FA -Color5=#F5C2E7 -Color6=#94E2D5 -Color7=#BAC2DE -Color8=#585B70 -Color9=#F38BA8 -Color10=#A6E3A1 -Color11=#F9E2AF -Color12=#89B4FA -Color13=#F5C2E7 -Color14=#94E2D5 -Color15=#A6ADC8 diff --git a/system_files/shared/usr/bin/kde-ptyxis b/system_files/shared/usr/bin/kde-ptyxis deleted file mode 100755 index fbac8de..0000000 --- a/system_files/shared/usr/bin/kde-ptyxis +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/bash -# Shim to handle KDE only supporting -e -# https://bugs.kde.org/show_bug.cgi?id=459616 -# We replace all standalone occurrences, but ignore others, e.g. in 'distrobox-enter' -args=() -for arg in ${@}; do - if [[ "$arg" == -e ]]; then - args+=("--") - else - args+=("$arg") - fi -done - -# Dolphin integration requires --new-window to function properly -if [[ ! "${args[@]}" =~ "--" && ! "${args[@]}" =~ "-h" && ! "${args[@]}" =~ "-x" ]]; then - /usr/bin/ptyxis --new-window "${args[@]}" -else - /usr/bin/ptyxis "${args[@]}" -fi diff --git a/system_files/shared/usr/share/glib-2.0/schemas/zz0-aurora-modifications.gschema.override b/system_files/shared/usr/share/glib-2.0/schemas/zz0-aurora-modifications.gschema.override deleted file mode 100644 index 5852ac0..0000000 --- a/system_files/shared/usr/share/glib-2.0/schemas/zz0-aurora-modifications.gschema.override +++ /dev/null @@ -1,11 +0,0 @@ -#-------------- REMAINING SCHEMAS IN THIS SETTING SECTION ARE LOCATED IN DCONF --------------# -# Settings bellow are supported with gschema override, but other settings, which are relocatable schemas, are not. Edit dconfs if you need to modify relocatable schemas. - -# Ptyxis color palette & opacity is recognized as a relocatable schema -[org.gnome.Ptyxis] -restore-session=false -restore-window-size=false -profile-uuids=['2871e8027773ae74d6c87a5f659bbc74'] -default-profile-uuid='2871e8027773ae74d6c87a5f659bbc74' -use-system-font=false -font-name='Adwaita Mono 10' diff --git a/system_files/shared/usr/share/kde-settings/kde-profile/default/xdg/kdeglobals b/system_files/shared/usr/share/kde-settings/kde-profile/default/xdg/kdeglobals index 9bd6ac7..9b2b9eb 100644 --- a/system_files/shared/usr/share/kde-settings/kde-profile/default/xdg/kdeglobals +++ b/system_files/shared/usr/share/kde-settings/kde-profile/default/xdg/kdeglobals @@ -5,8 +5,6 @@ ColorScheme=BreezeDark widgetStyle=Breeze [General] -TerminalApplication=kde-ptyxis -TerminalService=org.gnome.Ptyxis.desktop desktopFont=Noto Sans,10,-1,5,50,0,0,0,0,0 fixed=Monospace,10,-1,5,50,0,0,0,0,0 font=Noto Sans,10,-1,5,50,0,0,0,0,0 diff --git a/system_files/shared/usr/share/kde-settings/kde-profile/default/xdg/kicker-extra-favoritesrc b/system_files/shared/usr/share/kde-settings/kde-profile/default/xdg/kicker-extra-favoritesrc index 4e2a2d3..5590bc9 100644 --- a/system_files/shared/usr/share/kde-settings/kde-profile/default/xdg/kicker-extra-favoritesrc +++ b/system_files/shared/usr/share/kde-settings/kde-profile/default/xdg/kicker-extra-favoritesrc @@ -1,3 +1,3 @@ [General] -Prepend=preferred://browser;systemsettings.desktop;org.kde.dolphin.desktop;org.kde.kate.desktop;org.gnome.Ptyxis.desktop;dev.getaurora.aurora-docs.desktop;io.github.kolunmi.Bazaar.desktop +Prepend=preferred://browser;systemsettings.desktop;org.kde.dolphin.desktop;org.kde.kate.desktop;org.kde.konsole.desktop;dev.getaurora.aurora-docs.desktop;io.github.kolunmi.Bazaar.desktop IgnoreDefaults=true diff --git a/system_files/shared/usr/share/ublue-os/just/system.just b/system_files/shared/usr/share/ublue-os/just/system.just index 37281a6..414c812 100644 --- a/system_files/shared/usr/share/ublue-os/just/system.just +++ b/system_files/shared/usr/share/ublue-os/just/system.just @@ -83,24 +83,6 @@ toggle-devmode: fi echo "Use ujust dx-group to add your user to the correct groups and complete the installation after rebooting into the development image" -# Ptyxis terminal transparency -[group('System')] -ptyxis-transparency opacity="0.95": - #!/usr/bin/env bash - set -euxo pipefail - if [[ -n "$(echo "{{ opacity }}" | grep -v '^[.0-9]*$')" ]]; then - printf "Value must be numeric: %s.\n" "{{ opacity }}" - elif [[ $(echo "0<{{ opacity }} && 1>={{ opacity }}" | bc -q) -eq 1 ]]; then - raw="$(gsettings get org.gnome.Ptyxis profile-uuids)" - uuids="$(sed -En 's|[^0-9a-z]*||g; s|([0-9a-z]{32})|\1\n|gp' <<<${raw})" - for i in ${uuids}; do - location="org.gnome.Ptyxis.Profile:/org/gnome/Ptyxis/Profiles/${i}/" - gsettings set "${location}" opacity "{{ opacity }}"; done - printf "Ptyxis opacity is now %s.\n" "{{ opacity }}" - else - printf "Value must be greater than 0 and less than or equal to 1: %s.\n" "{{ opacity }}" - fi - # Configure docker,incus-admin,libvirt, container manager, serial permissions [group('System')] dx-group: diff --git a/system_files/shared/usr/share/ublue-os/user-setup.hooks.d/50-ptyxis.sh b/system_files/shared/usr/share/ublue-os/user-setup.hooks.d/50-ptyxis.sh deleted file mode 100644 index 306bfe2..0000000 --- a/system_files/shared/usr/share/ublue-os/user-setup.hooks.d/50-ptyxis.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -source /usr/lib/ublue/setup-services/libsetup.sh -version-script aurora-ptyxis user 1 || exit 0 - -# Ensure custom ptyxis theme is present -PTYXIS_THEME_DIR="/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/catppuccin-dynamic.palette" ]]; then - cp "$PTYXIS_THEME_DIR/catppuccin-dynamic.palette" "$PTYXIS_DIR/catppuccin-dynamic.palette" -fi \ No newline at end of file