From 0877a1e59b532bb6bf792dd71a0b611f3c8dda6d Mon Sep 17 00:00:00 2001 From: m2 <69128853+m2Giles@users.noreply.github.com> Date: Sat, 27 Apr 2024 10:18:41 -0400 Subject: [PATCH] feat(Aurora): Add Pytxis shortcuts, branding, Desktop Effects (#1213) --- build_files/base/aurora-changes.sh | 5 +- build_files/dx/branding-dx.sh | 1 + .../themes/01-breeze-fedora/default-logo.svg | 239 ++++++++++++++++++ .../applications/quadlet-bluefin.desktop | 7 + .../share/applications/quadlet-fedora.desktop | 7 + .../share/applications/quadlet-ubuntu.desktop | 7 + .../default/share/config/kcminputrc | 5 + .../default/share/config/kglobalshortcutsrc | 11 + .../default/share/config/krunnerrc | 2 + .../default/xdg/kcm-about-distrorc | 5 + .../kde-profile/default/xdg/kcminputrc | 5 + .../default/xdg/kglobalshortcutsrc | 11 + .../kde-profile/default/xdg/krunnerrc | 2 + .../kde-profile/default/xdg/kwinrc | 15 ++ .../contents/splash/Splash.qml | 4 +- 15 files changed, 322 insertions(+), 4 deletions(-) create mode 100644 system_files/kinoite/usr/lib/sddm/themes/01-breeze-fedora/default-logo.svg create mode 100644 system_files/kinoite/usr/share/applications/quadlet-bluefin.desktop create mode 100644 system_files/kinoite/usr/share/applications/quadlet-fedora.desktop create mode 100644 system_files/kinoite/usr/share/applications/quadlet-ubuntu.desktop create mode 100644 system_files/kinoite/usr/share/kde-settings/kde-profile/default/share/config/kcminputrc create mode 100644 system_files/kinoite/usr/share/kde-settings/kde-profile/default/share/config/kglobalshortcutsrc create mode 100644 system_files/kinoite/usr/share/kde-settings/kde-profile/default/share/config/krunnerrc create mode 100644 system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kcm-about-distrorc create mode 100644 system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kcminputrc create mode 100644 system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kglobalshortcutsrc create mode 100644 system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/krunnerrc create mode 100644 system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kwinrc diff --git a/build_files/base/aurora-changes.sh b/build_files/base/aurora-changes.sh index 183a09ff677..16ff5177639 100644 --- a/build_files/base/aurora-changes.sh +++ b/build_files/base/aurora-changes.sh @@ -9,12 +9,13 @@ if [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then ln -sf aurora.xml /usr/share/backgrounds/default.xml sed -i '//,/<\/entry>/ s/[^<]*<\/default>/preferred:\/\/browser,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>/ s/[^<]*<\/default>/preferred:\/\/browser,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,org.gnome.Ptyxis.desktop,org.kde.discover.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 sed -i 's@Keywords=@Keywords=konsole;console;@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 Action new-window\]@\[Desktop Action new-window\]\nX-KDE-Shortcuts=Ctrl+Alt+T@g' /usr/share/applications/org.gnome.Ptyxis.desktop - rm -f /usr/share/kglobalaccel/org.kde.konsole.desktop + sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.kde.konsole.desktop rm -f /usr/etc/profile.d/gnome-ssh-askpass.{csh,sh} # This shouldn't be pulled in + rm -f /usr/share/kglobalaccel/org.kde.konsole.desktop systemctl enable kde-sysmonitor-workaround.service if [[ "$FEDORA_MAJOR_VERSION " -eq "38" ]]; then rm -f /usr/etc/profile.d/aurora-fastfetch.sh diff --git a/build_files/dx/branding-dx.sh b/build_files/dx/branding-dx.sh index 2fe4d8d21c9..36e1cdee6e8 100644 --- a/build_files/dx/branding-dx.sh +++ b/build_files/dx/branding-dx.sh @@ -8,4 +8,5 @@ if test "$BASE_IMAGE_NAME" = "silverblue"; then elif test "$BASE_IMAGE_NAME" = "kinoite"; then sed -i '/^PRETTY_NAME/s/Aurora/Aurora-dx/' /usr/lib/os-release sed -i 's/Aurora/Aurora-dx/' /usr/etc/yafti.yml + sed -i 's/Aurora/Aurora-DX/' /usr/share/kde-settings/kde-profile/default/xdg/kcm-about-distrorc fi \ No newline at end of file diff --git a/system_files/kinoite/usr/lib/sddm/themes/01-breeze-fedora/default-logo.svg b/system_files/kinoite/usr/lib/sddm/themes/01-breeze-fedora/default-logo.svg new file mode 100644 index 00000000000..9eb059ae1a6 --- /dev/null +++ b/system_files/kinoite/usr/lib/sddm/themes/01-breeze-fedora/default-logo.svg @@ -0,0 +1,239 @@ + + + + + +urora diff --git a/system_files/kinoite/usr/share/applications/quadlet-bluefin.desktop b/system_files/kinoite/usr/share/applications/quadlet-bluefin.desktop new file mode 100644 index 00000000000..d2f16b5244c --- /dev/null +++ b/system_files/kinoite/usr/share/applications/quadlet-bluefin.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Exec=/usr/libexec/distrobox-quadlet-ptyxis.sh bluefin-cli +Name=Bluefin-CLI +NoDisplay=true +StartupNotification=false +Type=Application +X-KDE-GlobalAccel-CommandShortcut=true \ No newline at end of file diff --git a/system_files/kinoite/usr/share/applications/quadlet-fedora.desktop b/system_files/kinoite/usr/share/applications/quadlet-fedora.desktop new file mode 100644 index 00000000000..358044e9422 --- /dev/null +++ b/system_files/kinoite/usr/share/applications/quadlet-fedora.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Exec=/usr/libexec/distrobox-quadlet-ptyxis.sh fedora-toolbox +Name=Fedora-Toolbox +NoDisplay=true +StartupNotification=false +Type=Application +X-KDE-GlobalAccel-CommandShortcut=true \ No newline at end of file diff --git a/system_files/kinoite/usr/share/applications/quadlet-ubuntu.desktop b/system_files/kinoite/usr/share/applications/quadlet-ubuntu.desktop new file mode 100644 index 00000000000..2df704ba204 --- /dev/null +++ b/system_files/kinoite/usr/share/applications/quadlet-ubuntu.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Exec=/usr/libexec/distrobox-quadlet-ptyxis.sh ubuntu-toolbox +Name=Ubuntu-Toolbox +NoDisplay=true +StartupNotification=false +Type=Application +X-KDE-GlobalAccel-CommandShortcut=true \ No newline at end of file diff --git a/system_files/kinoite/usr/share/kde-settings/kde-profile/default/share/config/kcminputrc b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/share/config/kcminputrc new file mode 100644 index 00000000000..44543416fa4 --- /dev/null +++ b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/share/config/kcminputrc @@ -0,0 +1,5 @@ +[Mouse] +cursorTheme=breeze_cursors + +[Touchpad] +NaturalScroll=true \ No newline at end of file diff --git a/system_files/kinoite/usr/share/kde-settings/kde-profile/default/share/config/kglobalshortcutsrc b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/share/config/kglobalshortcutsrc new file mode 100644 index 00000000000..7f5d165b192 --- /dev/null +++ b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/share/config/kglobalshortcutsrc @@ -0,0 +1,11 @@ +[services][org.kde.krunner.desktop] +_launch=Alt+F2\tMeta+Space\tSearch\tAlt+Space + +[services][quadlet-bluefin.desktop] +_launch=Meta+Return + +[services][quadlet-ubuntu.desktop] +_launch=Ctrl+Alt+U + +[services][quadlet-fedora.desktop] +_launch=Ctrl+Alt+F \ No newline at end of file diff --git a/system_files/kinoite/usr/share/kde-settings/kde-profile/default/share/config/krunnerrc b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/share/config/krunnerrc new file mode 100644 index 00000000000..031e9643b17 --- /dev/null +++ b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/share/config/krunnerrc @@ -0,0 +1,2 @@ +[General] +FreeFloating=true \ No newline at end of file diff --git a/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kcm-about-distrorc b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kcm-about-distrorc new file mode 100644 index 00000000000..712b5361d82 --- /dev/null +++ b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kcm-about-distrorc @@ -0,0 +1,5 @@ +[General] +LogoPath=/usr/share/pixmaps/system-logo.png +Name=Aurora +Website=https//getaurora.dev +Variant=Aurora \ No newline at end of file diff --git a/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kcminputrc b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kcminputrc new file mode 100644 index 00000000000..44543416fa4 --- /dev/null +++ b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kcminputrc @@ -0,0 +1,5 @@ +[Mouse] +cursorTheme=breeze_cursors + +[Touchpad] +NaturalScroll=true \ No newline at end of file diff --git a/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kglobalshortcutsrc b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kglobalshortcutsrc new file mode 100644 index 00000000000..7f5d165b192 --- /dev/null +++ b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kglobalshortcutsrc @@ -0,0 +1,11 @@ +[services][org.kde.krunner.desktop] +_launch=Alt+F2\tMeta+Space\tSearch\tAlt+Space + +[services][quadlet-bluefin.desktop] +_launch=Meta+Return + +[services][quadlet-ubuntu.desktop] +_launch=Ctrl+Alt+U + +[services][quadlet-fedora.desktop] +_launch=Ctrl+Alt+F \ No newline at end of file diff --git a/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/krunnerrc b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/krunnerrc new file mode 100644 index 00000000000..031e9643b17 --- /dev/null +++ b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/krunnerrc @@ -0,0 +1,2 @@ +[General] +FreeFloating=true \ No newline at end of file diff --git a/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kwinrc b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kwinrc new file mode 100644 index 00000000000..1653076e6ff --- /dev/null +++ b/system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kwinrc @@ -0,0 +1,15 @@ +[Wayland] +InputMethod[$e]=/usr/share/applications/com.github.maliit.keyboard.desktop +VirtualKeyboardEnabled=true + +[Effect-wobblywindows] +AdvancedMode=true +Drag=97 +MoveFactor=25 +Stiffness=7 +WobblynessLevel=4 + +[Plugins] +blurEnabled=true +fallapartEnabled=true +wobblywindowsEnabled=true \ No newline at end of file diff --git a/system_files/kinoite/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml b/system_files/kinoite/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml index 6617b083aa6..d1327309e78 100644 --- a/system_files/kinoite/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml +++ b/system_files/kinoite/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml @@ -55,8 +55,8 @@ Rectangle { y: parent.height - (parent.height - logo.y) / 3 - height/2 anchors.horizontalCenter: parent.horizontalCenter source: "images/busywidget.svgz" - sourceSize.height: PlasmaCore.Units.gridUnit * 2 - sourceSize.width: PlasmaCore.Units.gridUnit * 2 + sourceSize.height: PlasmaCore.Units.gridUnit + sourceSize.width: PlasmaCore.Units.gridUnit RotationAnimator on rotation { id: rotationAnimator from: 0