From 4e76ba8446fa046f1936b725c436a925305ce222 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Wed, 17 Apr 2019 10:32:36 +0200 Subject: [PATCH] linux-service-oem --- community/openbox/Packages-Desktop | 1 - .../linux-service-oem-kde/Packages-Desktop | 6 +-- .../linux-service-oem-kde/Packages-Mhwd | 1 + .../linux-service-oem-kde/profile.conf | 4 +- .../linux-service-oem-xfce/Packages-Desktop | 2 +- .../linux-service-oem-xfce/profile.conf | 2 +- oem/bladebook-oem-cinnamon/Packages-Desktop | 3 +- oem/bladebook-oem-kde/Packages-Desktop | 2 +- shared/Packages-Root | 40 +++++++++---------- 9 files changed, 30 insertions(+), 31 deletions(-) create mode 120000 linux-service/linux-service-oem-kde/Packages-Mhwd diff --git a/community/openbox/Packages-Desktop b/community/openbox/Packages-Desktop index 8dbcded..3392caf 100644 --- a/community/openbox/Packages-Desktop +++ b/community/openbox/Packages-Desktop @@ -282,7 +282,6 @@ manjaro-hotfixes polkit polkit-gnome python2-xdg -qt5-styleplugins qt5ct xdg-user-dirs xdg-user-dirs-gtk diff --git a/linux-service/linux-service-oem-kde/Packages-Desktop b/linux-service/linux-service-oem-kde/Packages-Desktop index 6c24568..f8d6e04 100644 --- a/linux-service/linux-service-oem-kde/Packages-Desktop +++ b/linux-service/linux-service-oem-kde/Packages-Desktop @@ -94,12 +94,12 @@ terminus-font #packagekit-qt5 #discover flatpak -#fwupd +#fwupd #octopi #octopi-cachecleaner #octopi-repoeditor #octopi-notifier-frameworks -pamac +pamac-gtk pamac-tray-appindicator ## Printing @@ -256,7 +256,7 @@ inxi #>extra krita >extra firefox >basic falkon -ms-office-online +#ms-office-online >extra libreoffice-fresh manjaro-settings-manager-kcm manjaro-settings-manager-knotifier diff --git a/linux-service/linux-service-oem-kde/Packages-Mhwd b/linux-service/linux-service-oem-kde/Packages-Mhwd new file mode 120000 index 0000000..9df3d5e --- /dev/null +++ b/linux-service/linux-service-oem-kde/Packages-Mhwd @@ -0,0 +1 @@ +../../shared/Packages-Mhwd \ No newline at end of file diff --git a/linux-service/linux-service-oem-kde/profile.conf b/linux-service/linux-service-oem-kde/profile.conf index b5e5443..5b16b8e 100644 --- a/linux-service/linux-service-oem-kde/profile.conf +++ b/linux-service/linux-service-oem-kde/profile.conf @@ -11,7 +11,7 @@ displaymanager="sddm" # autologin="true" # nonfree mhwd drivers -nonfree_mhwd="false" +nonfree_mhwd="true" # use extra packages as defined in pkglist to activate a full profile extra="true" @@ -22,7 +22,7 @@ extra="true" # efi_boot_loader="grub" # configure calamares for mhwd -mhwd_used="false" +mhwd_used="true" # configure calamares for oem oem_used="true" diff --git a/linux-service/linux-service-oem-xfce/Packages-Desktop b/linux-service/linux-service-oem-xfce/Packages-Desktop index 558598a..96ba8ff 100644 --- a/linux-service/linux-service-oem-xfce/Packages-Desktop +++ b/linux-service/linux-service-oem-xfce/Packages-Desktop @@ -82,7 +82,7 @@ ttf-bitstream-vera # xfce4-terminal default Monospace >extra steam-manjaro ## Package management -pamac +pamac-gtk flatpak ## Java diff --git a/linux-service/linux-service-oem-xfce/profile.conf b/linux-service/linux-service-oem-xfce/profile.conf index f5443bb..3bd5291 100644 --- a/linux-service/linux-service-oem-xfce/profile.conf +++ b/linux-service/linux-service-oem-xfce/profile.conf @@ -22,7 +22,7 @@ extra="true" # efi_boot_loader="grub" # configure calamares for mhwd -mhwd_used="false" +mhwd_used="true" # configure calamares for oem oem_used="true" diff --git a/oem/bladebook-oem-cinnamon/Packages-Desktop b/oem/bladebook-oem-cinnamon/Packages-Desktop index e65ec1d..2e3421f 100644 --- a/oem/bladebook-oem-cinnamon/Packages-Desktop +++ b/oem/bladebook-oem-cinnamon/Packages-Desktop @@ -97,7 +97,7 @@ openresolv openssh >extra openvpn >extra p7zip -pamac +pamac-gtk papirus-maia-icon-theme >extra parcellite patch @@ -151,7 +151,6 @@ xorg-xinit >extra xplayer >extra xreader >extra xviewer-plugins ->extra yaourt xdg-user-dirs xorg-server xorg-xhost diff --git a/oem/bladebook-oem-kde/Packages-Desktop b/oem/bladebook-oem-kde/Packages-Desktop index 6c24568..33c2a3b 100644 --- a/oem/bladebook-oem-kde/Packages-Desktop +++ b/oem/bladebook-oem-kde/Packages-Desktop @@ -99,7 +99,7 @@ flatpak #octopi-cachecleaner #octopi-repoeditor #octopi-notifier-frameworks -pamac +pamac-gtk pamac-tray-appindicator ## Printing diff --git a/shared/Packages-Root b/shared/Packages-Root index eb278b6..b7cc3f2 100644 --- a/shared/Packages-Root +++ b/shared/Packages-Root @@ -1,13 +1,21 @@ -acpi -amd-ucode >i686 archlinux32-keyring +>manjaro manjaro-release +>multilib gcc-libs-multilib +acpi +acpid +amd-ucode b43-fwcutter bash btrfs-progs bzip2 coreutils +cpupower crda +cronie +cryptsetup +device-mapper dhclient +dhcpcd diffutils dmraid dnsmasq @@ -22,12 +30,12 @@ filesystem findutils gawk gcc-libs ->multilib gcc-libs-multilib gettext glibc grep grub gzip +haveged inetutils intel-ucode iproute2 @@ -42,16 +50,18 @@ licenses linux-firmware logrotate lsb-release +lvm2 man-db -manjaro-firmware ->manjaro manjaro-release -manjaro-system man-pages +manjaro-firmware +manjaro-system +mdadm memtest86+ mhwd mhwd-db mkinitcpio-openswap nano +nfs-utils ntfs-3g os-prober pacman @@ -60,33 +70,23 @@ perl procps-ng psmisc reiserfsprogs +rsync +s-nail sed shadow spectre-meltdown-checker -s-nail sudo sysfsutils -acpid -cpupower -cronie -cryptsetup -device-mapper -dhcpcd -haveged -lvm2 -mdadm -nfs-utils -rsync systemd-fsck-silent systemd-sysvcompat -tlp -wpa_supplicant tar texinfo +tlp usbutils util-linux vi wget which +wpa_supplicant xfsprogs zsh