diff --git a/releng/airootfs/etc/os-release b/releng/airootfs/etc/os-release index 1a985b5e..3dcec442 100644 --- a/releng/airootfs/etc/os-release +++ b/releng/airootfs/etc/os-release @@ -1,5 +1,5 @@ -NAME="RaveOS GNOME 1.0" -PRETTY_NAME="RaveOS GNOME 1.0" +NAME="RaveOS GNOME 1.1" +PRETTY_NAME="RaveOS GNOME 1.1" ID=arch BUILD_ID=rolling ANSI_COLOR="38;2;255;0;255" @@ -8,5 +8,5 @@ DOCUMENTATION_URL="https://git.rp1.hu/explore/repos" SUPPORT_URL="https://git.rp1.hu/explore/repos" BUG_REPORT_URL="https://git.rp1.hu/explore/repos" LOGO=raveos-logo -VERSION="1.0" -VERSION_ID="1.0" +VERSION="1.1" +VERSION_ID="1.1" diff --git a/releng/airootfs/etc/skel/.config/gtk-4.0/gtk.css b/releng/airootfs/etc/skel/.config/gtk-4.0/gtk.css deleted file mode 100644 index 9dbdee86..00000000 --- a/releng/airootfs/etc/skel/.config/gtk-4.0/gtk.css +++ /dev/null @@ -1,95 +0,0 @@ -@define-color yaru_accent_bg_color #7764D8; -@define-color blue_1 #75d3f4; -@define-color blue_2 #47c4f1; -@define-color blue_3 #19B6EE; -@define-color blue_4 #007aa6; -@define-color blue_5 #335280; -@define-color green_1 #5AED70; -@define-color green_2 #47D35C; -@define-color green_3 #34B948; -@define-color green_4 #219E34; -@define-color green_5 #0e8420; -@define-color yellow_1 #FCCD87; -@define-color yellow_2 #FBC16A; -@define-color yellow_3 #FBB44C; -@define-color yellow_4 #FAA82F; -@define-color yellow_5 #F99B11; -@define-color orange_1 #F29879; -@define-color orange_2 #F08763; -@define-color orange_3 #ED764D; -@define-color orange_4 #EB6536; -@define-color orange_5 #E95420; -@define-color red_1 #EA485C; -@define-color red_2 #DE374C; -@define-color red_3 #D3273B; -@define-color red_4 #c7162b; -@define-color red_5 #a91224; -@define-color purple_1 #924D8B; -@define-color purple_2 #762572; -@define-color purple_3 #77216F; -@define-color purple_4 #5E2750; -@define-color purple_5 #2C001E; -@define-color brown_1 #E1B289; -@define-color brown_2 #C5976E; -@define-color brown_3 #AA7B53; -@define-color brown_4 #8E6038; -@define-color brown_5 #72441D; -@define-color light_1 #FFFFFF; -@define-color light_2 #F7F7F7; -@define-color light_3 #CCC; -@define-color light_4 #AEA79F; -@define-color light_5 #878787; -@define-color dark_1 #666666; -@define-color dark_2 #5D5D5D; -@define-color dark_3 #3D3D3D; -@define-color dark_4 #181818; -@define-color dark_5 #000000; -/* GTK NAMED COLORS - ---------------- - use responsibly! */ -@define-color accent_bg_color @yaru_accent_bg_color; -@define-color accent_fg_color @light_1; -@define-color accent_color @yaru_accent_bg_color; -@define-color destructive_bg_color @red_4; -@define-color destructive_fg_color @light_1; -@define-color destructive_color @red_4; -@define-color success_bg_color @green_4; -@define-color success_fg_color @light_1; -@define-color success_color @green_4; -@define-color warning_bg_color @yellow_5; -@define-color warning_fg_color @light_1; -@define-color warning_color @yellow_5; -@define-color error_bg_color @red_4; -@define-color error_fg_color @light_1; -@define-color error_color @red_4; -popover.menu check, -popover.menu radio { - transition: none; -} - -levelbar > trough > block.high, levelbar > trough > block:not(.empty) { - background-color: @success_color; -} - -button.suggested-action { - color: @success_fg_color; -} -button.suggested-action:not(.flat), -button.suggested-action:checked:not(.flat) { - background-color: @success_bg_color; -} -button.flat.suggested-action { - color: @success_color; -} - -splitbutton.suggested-action > button, splitbutton.suggested-action > menubutton > button { - color: @success_fg_color; -} -splitbutton.suggested-action > button, splitbutton.suggested-action > button:checked, splitbutton.suggested-action > menubutton > button, splitbutton.suggested-action > menubutton > button:checked { - background-color: @success_bg_color; -} - -button, -link { - font-weight: normal; -} diff --git a/releng/airootfs/root/calamares-build/etc/calamares/modules/packages.conf b/releng/airootfs/root/calamares-build/etc/calamares/modules/packages.conf index 0fe709eb..750d97c8 100644 --- a/releng/airootfs/root/calamares-build/etc/calamares/modules/packages.conf +++ b/releng/airootfs/root/calamares-build/etc/calamares/modules/packages.conf @@ -203,7 +203,6 @@ pacman: # operations: - try_remove: - - plasma-framework5 - kpmcore - yaml-cpp - mkinitcpio-archiso @@ -220,3 +219,4 @@ operations: - solid5 - qt5-svg - linux + - gdm diff --git a/releng/airootfs/root/ros-settings.sh b/releng/airootfs/root/ros-settings.sh index 1209797a..337ffd86 100644 --- a/releng/airootfs/root/ros-settings.sh +++ b/releng/airootfs/root/ros-settings.sh @@ -11,7 +11,8 @@ mv "${SOURCE_DIR}/archlinux-logo-text-dark.svg" /usr/share/pixmaps/ cp "${SOURCE_DIR}/view-app-grid-symbolic.svg" /usr/share/icons/Yaru/scalable/actions/ mv "${SOURCE_DIR}/view-app-grid-symbolic.svg" /home/$USER/.icons/Yaru/scalable/actions/ -mv "${SOURCE_DIR}/raveos-sddm" /usr/share/sddm/themes/ +mv /root/raveos-sddm /usr/share/sddm/themes/ +chmod 755 /usr/share/sddm/themes/raveos-sddm chmod 755 /usr/share/pixmaps/raveos-logo.svg chmod 755 /usr/share/pixmaps/archlinux-logo-text.svg @@ -21,8 +22,6 @@ chmod 755 /usr/share/pixmaps/faces/rave-pp.png chmod 755 /usr/share/icons/Yaru/scalable/actions/view-app-grid-symbolic.svg chmod 755 /home/$USER/.icons/Yaru/scalable/actions/ -chmod 755 /usr/share/sddm/themes/raveos-sddm - systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target geoclue.service curl -Ls https://links.rp1.hu/progsgui -o /usr/local/bin/progs/3progs.sh diff --git a/releng/airootfs/usr/local/bin/displaymanager-check b/releng/airootfs/usr/local/bin/displaymanager-check index 28087992..05437f1e 100755 --- a/releng/airootfs/usr/local/bin/displaymanager-check +++ b/releng/airootfs/usr/local/bin/displaymanager-check @@ -14,15 +14,15 @@ package=sddm if pacman -Qs $package > /dev/null ; then ln -sf /usr/lib/systemd/system/sddm.service /etc/systemd/system/display-manager.service fi -package=gdm -if pacman -Qs $package > /dev/null ; then - ln -sf /usr/lib/systemd/system/gdm.service /etc/systemd/system/display-manager.service -fi -package=lxdm -if pacman -Qs $package > /dev/null ; then - ln -sf /usr/lib/systemd/system/lxdm.service /etc/systemd/system/display-manager.service -fi -package=lightdm -if pacman -Qs $package > /dev/null ; then - ln -sf /usr/lib/systemd/system/lightdm.service /etc/systemd/system/display-manager.service -fi +#package=gdm +#if pacman -Qs $package > /dev/null ; then +# ln -sf /usr/lib/systemd/system/gdm.service /etc/systemd/system/display-manager.service +#fi +#package=lxdm +#if pacman -Qs $package > /dev/null ; then +# ln -sf /usr/lib/systemd/system/lxdm.service /etc/systemd/system/display-manager.service +#fi +#package=lightdm +#if pacman -Qs $package > /dev/null ; then +# ln -sf /usr/lib/systemd/system/lightdm.service /etc/systemd/system/display-manager.service +#fi diff --git a/releng/packages.x86_64 b/releng/packages.x86_64 index 23673df8..fc1401d7 100644 --- a/releng/packages.x86_64 +++ b/releng/packages.x86_64 @@ -167,6 +167,8 @@ ttf-ubuntu-font-family # GUI és GNOME (Xorg-alapú) #gdm sddm +plasma-framework5 + gnome-shell gnome-session gnome-settings-daemon