From 085c24c81e25ce240e74b23c9c102fabecc2eb82 Mon Sep 17 00:00:00 2001 From: Dennis ten Hoove Date: Wed, 28 Feb 2024 14:10:51 +0100 Subject: [PATCH] Equalize with Manjaro mainline --- .../test-manjaro-kde/bootstrap.list | 8 +- .../switcheroo-control.service | 1 - .../multi-user.target.wants/apparmor.service | 1 - .../system/timers.target.wants/paccache.timer | 1 - arkdep-build.d/test-manjaro-kde/package.list | 157 ++++++++++-------- 5 files changed, 89 insertions(+), 79 deletions(-) delete mode 120000 arkdep-build.d/test-manjaro-kde/overlay/etc/systemd/system/graphical.target.wants/switcheroo-control.service delete mode 120000 arkdep-build.d/test-manjaro-kde/overlay/etc/systemd/system/multi-user.target.wants/apparmor.service delete mode 120000 arkdep-build.d/test-manjaro-kde/overlay/etc/systemd/system/timers.target.wants/paccache.timer diff --git a/arkdep-build.d/test-manjaro-kde/bootstrap.list b/arkdep-build.d/test-manjaro-kde/bootstrap.list index 77f41e5..fd5a460 100644 --- a/arkdep-build.d/test-manjaro-kde/bootstrap.list +++ b/arkdep-build.d/test-manjaro-kde/bootstrap.list @@ -1,6 +1,6 @@ -base -linux -linux-firmware amd-ucode -intel-ucode +base dracut +linux66 +linux-firmware +manjaro-keyring diff --git a/arkdep-build.d/test-manjaro-kde/overlay/etc/systemd/system/graphical.target.wants/switcheroo-control.service b/arkdep-build.d/test-manjaro-kde/overlay/etc/systemd/system/graphical.target.wants/switcheroo-control.service deleted file mode 120000 index d4b97c2..0000000 --- a/arkdep-build.d/test-manjaro-kde/overlay/etc/systemd/system/graphical.target.wants/switcheroo-control.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/switcheroo-control.service \ No newline at end of file diff --git a/arkdep-build.d/test-manjaro-kde/overlay/etc/systemd/system/multi-user.target.wants/apparmor.service b/arkdep-build.d/test-manjaro-kde/overlay/etc/systemd/system/multi-user.target.wants/apparmor.service deleted file mode 120000 index f9a498e..0000000 --- a/arkdep-build.d/test-manjaro-kde/overlay/etc/systemd/system/multi-user.target.wants/apparmor.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/apparmor.service \ No newline at end of file diff --git a/arkdep-build.d/test-manjaro-kde/overlay/etc/systemd/system/timers.target.wants/paccache.timer b/arkdep-build.d/test-manjaro-kde/overlay/etc/systemd/system/timers.target.wants/paccache.timer deleted file mode 120000 index 1f5ee4f..0000000 --- a/arkdep-build.d/test-manjaro-kde/overlay/etc/systemd/system/timers.target.wants/paccache.timer +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/paccache.timer \ No newline at end of file diff --git a/arkdep-build.d/test-manjaro-kde/package.list b/arkdep-build.d/test-manjaro-kde/package.list index b837eb0..ca10263 100644 --- a/arkdep-build.d/test-manjaro-kde/package.list +++ b/arkdep-build.d/test-manjaro-kde/package.list @@ -1,106 +1,119 @@ -apparmor -arch-install-scripts -arianna -ark -arkdep -bind -bluez -bluez-cups -bluez-plugins -bluez-utils -btrfs-progs -colord-kde -cups -cups-pdf -dbus-broker-units +alsa-firmware +alsa-utils +audiocd-kio +avahi +bluedevil +breeze-gtk discover +dmidecode dolphin -dosfstools -efibootmgr -evince -f2fs-tools -flatpak -git -gst-plugin-pipewire +dolphin-plugins +ffmpeg +ffmpegthumbs +gnome-themes-standard +gst-libav +gst-plugins-bad gst-plugins-base gst-plugins-good -gwenview -ibus-typing-booster +gst-plugins-ugly +htop +inxi +kaccounts-providers kamera -kamoso -kcolorchooser -kcron -kde-inotify-survey +kde-gtk-config kdeconnect kdegraphics-thumbnailers kdenetwork-filesharing +kdeplasma-addons +kgamma khelpcenter -kio-admin -kmix -kmousetool -kmouth -koko +kimageformats5 +kinfocenter +kinit +kio-extras +kmenuedit konsole -kpipewire -ksystemlog +kscreen +kscreenlocker +ksshaskpass +ksysguard +kwallet-pam +kwayland-integration +kwin +kwrited +lib32-libcanberra +lib32-libva-mesa-driver +lib32-libva-vdpau-driver +libcanberra +libdvdcss libnss-extrausers libva-mesa-driver -man-db +libva-vdpau-driver +manjaro-alsa +manjaro-application-utility +manjaro-gstreamer +manjaro-hello manjaro-kde-settings -mesa -mesa-vdpau -neovim +manjaro-pipewire +manjaro-settings-manager-kcm +manjaro-settings-manager-knotifier +mesa-utils +milou +mtpfs +neofetch networkmanager +networkmanager-l2tp networkmanager-openconnect networkmanager-openvpn +networkmanager-pptp +networkmanager-vpnc noto-fonts noto-fonts-cjk noto-fonts-emoji -okular +nss-mdns +ntp +numlockx +openresolv openssh -pacman-contrib +p7zip partitionmanager +perl-file-mimeinfo phonon-qt5-gstreamer -pipewire -pipewire-alsa -pipewire-audio -pipewire-jack -pipewire-pulse +plasma-browser-integration plasma-desktop -plasma-integration -plasma-settings -plasma-systemmonitor +plasma-nm +plasma-pa +plasma-simplemenu plasma-thunderbolt -plasma-vault plasma-wayland-session -plasma-welcome -plasma-welcome plasma-workspace -podman +plymouth +plymouth-kcm +plymouth-theme-manjaro +poppler-data power-profiles-daemon -print-manager -pv -qemu-guest-agent +powerdevil +powertop +qt5-imageformats +qt5-virtualkeyboard +samba sddm +sddm-breath-theme sddm-kcm -skanlite -sof-firmware spectacle -spice-vdagent -sudo -svgpart -switcheroo-control +sshfs +systemd-kcm +systemsettings terminus-font -vulkan-intel -vulkan-mesa-layers -vulkan-radeon -webp-pixbuf-loader -wget -wireplumber +ttf-dejavu +udiskie +udisks2 +unarchiver +usb_modeswitch xdg-desktop-portal-kde xdg-user-dirs xdg-utils -zsh -zsh-autosuggestions -zsh-completions -zsh-syntax-highlighting +xf86-input-elographics +xf86-input-evdev +xf86-input-libinput +xf86-input-void