From e75f03eae4a039092ce5f8890484b1e8dc5d9715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Tue, 7 Apr 2020 11:45:58 +0200 Subject: [PATCH 01/16] [gnome] small adjustments --- manjaro/gnome/Packages-Desktop | 2 +- oem/starlite-oem-gnome/Packages-Desktop | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index bd1d8ca..221434b 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -113,7 +113,7 @@ pamac-gtk-dev >extra snapd-glib >extra pamac-snap-plugin-dev >extra pamac-flatpak-plugin-dev ->extra pamac-gnome-integration-dev +pamac-gnome-integration-dev polkit-gnome powertop pulseaudio-bluetooth diff --git a/oem/starlite-oem-gnome/Packages-Desktop b/oem/starlite-oem-gnome/Packages-Desktop index ff0667a..82946b3 100644 --- a/oem/starlite-oem-gnome/Packages-Desktop +++ b/oem/starlite-oem-gnome/Packages-Desktop @@ -70,7 +70,7 @@ gvfs-google gvfs-smb ibus inxi ->extra imagewriter +>extra etcher #cli tool# pacui mc @@ -116,7 +116,7 @@ pamac-gtk-dev >extra snapd-glib >extra pamac-snap-plugin-dev >extra pamac-flatpak-plugin-dev ->extra pamac-gnome-integration-dev +pamac-gnome-integration-dev polkit-gnome powertop pulseaudio-bluetooth From 0fb509ad1882688fef44e58c78360bd85103819a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Tue, 7 Apr 2020 11:48:21 +0200 Subject: [PATCH 02/16] [gnome] small adjustments --- oem/starlite-oem-gnome/Packages-Desktop | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/oem/starlite-oem-gnome/Packages-Desktop b/oem/starlite-oem-gnome/Packages-Desktop index 82946b3..9262798 100644 --- a/oem/starlite-oem-gnome/Packages-Desktop +++ b/oem/starlite-oem-gnome/Packages-Desktop @@ -5,7 +5,6 @@ alsa-firmware >extra baobab >extra dconf-editor dmidecode ->extra hexchat gthumb evince >basic epiphany @@ -47,7 +46,6 @@ gnome-wallpapers gparted papirus-maia-icon-theme >extra gnome-calendar ->extra bijiben >extra gnome-characters >extra gnome-clocks >extra gnome-weather @@ -172,7 +170,7 @@ xorg-xinit >extra gnome-calendar >extra lollypop >extra empathy ->extra telepathy-accounts-signon +>extra telepathy >extra uget >extra transmission-gtk >extra manjaro-documentation-en From 9beceaca583a5bfa2b510c09e8f22e30687dceec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Tue, 7 Apr 2020 19:56:02 +0200 Subject: [PATCH 03/16] [gnome] update pkgs --- manjaro/gnome/Packages-Desktop | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index 221434b..c622c18 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -108,12 +108,12 @@ openresolv #gnome-software-snap #>extra flatpak #>extra bauh -pamac-gtk-dev +pamac-gtk #>extra snapd >extra snapd-glib ->extra pamac-snap-plugin-dev ->extra pamac-flatpak-plugin-dev -pamac-gnome-integration-dev +>extra pamac-snap-plugin +>extra pamac-flatpak-plugin +pamac-gnome-integration polkit-gnome powertop pulseaudio-bluetooth From 7b9402e0b31a8744fd8f1b2174da598cae86ba31 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Wed, 8 Apr 2020 10:24:55 +0200 Subject: [PATCH 04/16] starlite autostart cal in live --- diff | 178 ++++++++++++++++++ .../skel/.config/autostart/calamares.desktop | 14 ++ shared/Packages-Live | 2 +- 3 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 diff create mode 100755 oem/starlite-oem-gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop diff --git a/diff b/diff new file mode 100644 index 0000000..f5d724b --- /dev/null +++ b/diff @@ -0,0 +1,178 @@ +diff -rupN manjaro/gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop oem/starlite-oem-gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop +--- manjaro/gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop 1970-01-01 01:00:00.000000000 +0100 ++++ oem/starlite-oem-gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop 2020-01-06 20:00:26.000000000 +0100 +@@ -0,0 +1,14 @@ ++[Desktop Entry] ++Type=Application ++Version=1.0 ++Name=Install Manjaro Linux ++GenericName=Live Installer ++Comment=Install the operating system to disk ++Comment[de]=Manjaro Linux installieren ++X-GNOME-Autostart-enabled=true ++Exec=kstart5 --fullscreen calamares_polkit ++Icon=calamares ++Terminal=false ++StartupNotify=true ++Type=Application ++Categories=Qt;System; +diff -rupN manjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/branding.desc oem/starlite-oem-gnome/live-overlay/usr/share/calamares/branding/manjaro/branding.desc +--- manjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/branding.desc 1970-01-01 01:00:00.000000000 +0100 ++++ oem/starlite-oem-gnome/live-overlay/usr/share/calamares/branding/manjaro/branding.desc 2020-04-06 12:50:05.018055214 +0200 +@@ -0,0 +1,23 @@ ++--- ++componentName: manjaro ++ ++strings: ++ productName: Manjaro Linux ++ shortProductName: Manjaro ++ version: 19.0.2 OEM ++ shortVersion: 19.0.2 OEM ++ versionedName: Manjaro Linux 19.0.2 "Kyria" OEM ++ shortVersionedName: Manjaro 19.0.2 OEM ++ bootloaderEntryName: Manjaro ++ ++images: ++ productLogo: "logo.png" ++ productIcon: "logo.png" ++ productWelcome: "languages.png" ++ ++slideshow: "show.qml" ++ ++style: ++ sidebarBackground: "#454948" ++ sidebarText: "#efefef" ++ sidebarTextSelect: "#9E4F5D" +diff -rupN manjaro/gnome/Packages-Desktop oem/starlite-oem-gnome/Packages-Desktop +--- manjaro/gnome/Packages-Desktop 2020-04-07 22:28:02.611539427 +0200 ++++ oem/starlite-oem-gnome/Packages-Desktop 2020-04-07 22:28:02.611539427 +0200 +@@ -187,3 +188,8 @@ xorg-xinit + + >basic lighter-gnome + >basic disable-tracker ++ ++## OEM ++calamares-git ++calamares-oem-modules ++calamares-oem-starlite-gnome-settings +diff -rupN manjaro/gnome/Packages-Live oem/starlite-oem-gnome/Packages-Live +--- manjaro/gnome/Packages-Live 2020-04-08 09:38:11.053630984 +0200 ++++ oem/starlite-oem-gnome/Packages-Live 2020-04-04 11:22:15.000000000 +0200 +@@ -1,9 +1,5 @@ +-calamares-git + grub-theme-live-manjaro +-gsmartcontrol +-manjaro-architect + manjaro-live-skel + manjaro-live-systemd + mkinitcpio-nfs-utils + nbd +-clonezilla +diff -rupN manjaro/gnome/Packages-Mhwd oem/starlite-oem-gnome/Packages-Mhwd +--- manjaro/gnome/Packages-Mhwd 2020-04-04 11:22:15.645595953 +0200 ++++ oem/starlite-oem-gnome/Packages-Mhwd 1970-01-01 01:00:00.000000000 +0100 +@@ -1,63 +0,0 @@ +-## The following is only temp for 18.1-rc7 +->extra libreoffice-still +->extra freeoffice +- +-## Normal MHWD package list +- +-KERNEL-bbswitch +-KERNEL-broadcom-wl +-#KERNEL-r8168 +-#KERNEL-zfs +-zfs-utils +-#KERNEL-rt3562sta +-KERNEL-virtualbox-guest-modules +-KERNEL-headers +-zfs-dkms +-libva-intel-driver +-libva-mesa-driver +-libva-vdpau-driver +->multilib lib32-libva-vdpau-driver +-libxaw +-libxpm +-libxvmc +-mesa-vdpau +->multilib lib32-mesa-vdpau +->multilib lib32-libxvmc +->multilib lib32-primus +-#>nonfree_default catalyst-utils +-#>nonfree_default KERNEL-catalyst +-#>nonfree_default KERNEL-nvidia-340xx +->nonfree_default KERNEL-nvidia-390xx +->nonfree_x86_64 KERNEL-nvidia-440xx +->nonfree_default nvidia-340xx-utils +->nonfree_default nvidia-390xx-utils +->nonfree_x86_64 nvidia-440xx-utils +-#>nonfree_multilib lib32-catalyst-utils +->nonfree_multilib lib32-nvidia-440xx-utils +-#>nonfree_multilib lib32-nvidia-340xx-utils +->nonfree_multilib lib32-nvidia-390xx-utils +-opencl-mesa +-open-vm-tools +-pangox-compat +-primus +-bumblebee +-nvidia-prime +-gtkmm3 +-spice-vdagent +-virtualbox-guest-utils +-vulkan-radeon +->multilib lib32-vulkan-radeon +-vulkan-intel +->multilib lib32-vulkan-intel +-xf86-input-vmmouse +-xf86-video-amdgpu +-xf86-video-ati +-xf86-video-dummy +-xf86-video-fbdev +-xf86-video-intel +-xf86-video-nouveau +-xf86-video-openchrome +-xf86-video-sisusb +-xf86-video-vesa +-xf86-video-vmware +-xf86-video-voodoo +diff -rupN manjaro/gnome/profile.conf oem/starlite-oem-gnome/profile.conf +--- manjaro/gnome/profile.conf 2020-04-05 16:30:12.251311211 +0200 ++++ oem/starlite-oem-gnome/profile.conf 2020-04-06 12:58:01.865141618 +0200 +@@ -32,17 +32,19 @@ displaymanager="gdm" + # use geoip + # geoip="true" + ++# configure calamares for mhwd ++mhwd_used="false" ++ ++# configure calamares for oem ++oem_used="true" ++ ++windowexp=fullscreen ++ + # unset defaults to given values + # names must match systemd service names +-enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'avahi-demon' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd') +-#enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-demon' 'haveged' 'ufw') ++enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'fstrim.timer' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd') + disable_systemd=('pacman-init') + +-# unset defaults to given values, +-# names must match openrc service names +-# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +-# disable_openrc=() +- + # unset defaults to given values + # addgroups="lp,network,power,wheel" + +@@ -74,9 +76,4 @@ login_shell=/usr/bin/zsh + # unset defaults to given values + # names must match systemd service names + # services in enable_systemd array don't need to be listed here +-# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live') +- +-# unset defaults to given values, +-# names must match openrc service names +-# services in enable_openrc array don't need to be listed here +-# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live') ++enable_systemd_live=('manjaro-live' 'pacman-init' 'mirrors-live') diff --git a/oem/starlite-oem-gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop b/oem/starlite-oem-gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop new file mode 100755 index 0000000..40b4464 --- /dev/null +++ b/oem/starlite-oem-gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Install Manjaro Linux +GenericName=Live Installer +Comment=Install the operating system to disk +Comment[de]=Manjaro Linux installieren +X-GNOME-Autostart-enabled=true +Exec=kstart5 --fullscreen calamares_polkit +Icon=calamares +Terminal=false +StartupNotify=true +Type=Application +Categories=Qt;System; diff --git a/shared/Packages-Live b/shared/Packages-Live index 4489cb4..ee15e0d 100644 --- a/shared/Packages-Live +++ b/shared/Packages-Live @@ -1,5 +1,5 @@ calamares-git ->manjaro grub-theme-live-manjaro +grub-theme-live-manjaro gsmartcontrol manjaro-architect manjaro-live-skel From 3efa0a8dc4aae395599cb54fa17a29c2d2a68c6a Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Wed, 8 Apr 2020 10:25:37 +0200 Subject: [PATCH 05/16] rename starlabs --- oem/{starlite-oem-gnome => starlabs-oem-gnome}/Packages-Desktop | 0 oem/{starlite-oem-gnome => starlabs-oem-gnome}/Packages-Live | 0 oem/{starlite-oem-gnome => starlabs-oem-gnome}/Packages-Root | 0 .../desktop-overlay/etc/environment | 0 .../desktop-overlay/etc/gdm/custom.conf | 0 .../desktop-overlay/etc/pam.d/polkit-1 | 0 .../desktop-overlay/etc/pam.d/sudo | 0 .../desktop-overlay/usr/share/icons/default/index.theme | 0 .../live-overlay/etc/default | 0 .../live-overlay/etc/fstab | 0 .../live-overlay/etc/issue | 0 .../live-overlay/etc/localtime | 0 .../live-overlay/etc/pam.d | 0 .../live-overlay/etc/skel/.config/autostart/calamares.desktop | 0 .../etc/skel/.config/autostart/no-lock-screen.desktop | 0 .../live-overlay/etc/skel/.config/manjaro | 0 .../live-overlay/etc/sudoers.d | 0 .../live-overlay/root/.config/Kvantum/kvantum.kvconfig | 0 .../live-overlay/root/.config/qt5ct/qt5ct.conf | 0 oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/usr | 0 oem/{starlite-oem-gnome => starlabs-oem-gnome}/profile.conf | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/Packages-Desktop (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/Packages-Live (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/Packages-Root (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/desktop-overlay/etc/environment (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/desktop-overlay/etc/gdm/custom.conf (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/desktop-overlay/etc/pam.d/polkit-1 (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/desktop-overlay/etc/pam.d/sudo (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/desktop-overlay/usr/share/icons/default/index.theme (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/etc/default (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/etc/fstab (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/etc/issue (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/etc/localtime (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/etc/pam.d (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/etc/skel/.config/autostart/calamares.desktop (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/etc/skel/.config/manjaro (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/etc/sudoers.d (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/root/.config/Kvantum/kvantum.kvconfig (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/root/.config/qt5ct/qt5ct.conf (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/live-overlay/usr (100%) rename oem/{starlite-oem-gnome => starlabs-oem-gnome}/profile.conf (100%) diff --git a/oem/starlite-oem-gnome/Packages-Desktop b/oem/starlabs-oem-gnome/Packages-Desktop similarity index 100% rename from oem/starlite-oem-gnome/Packages-Desktop rename to oem/starlabs-oem-gnome/Packages-Desktop diff --git a/oem/starlite-oem-gnome/Packages-Live b/oem/starlabs-oem-gnome/Packages-Live similarity index 100% rename from oem/starlite-oem-gnome/Packages-Live rename to oem/starlabs-oem-gnome/Packages-Live diff --git a/oem/starlite-oem-gnome/Packages-Root b/oem/starlabs-oem-gnome/Packages-Root similarity index 100% rename from oem/starlite-oem-gnome/Packages-Root rename to oem/starlabs-oem-gnome/Packages-Root diff --git a/oem/starlite-oem-gnome/desktop-overlay/etc/environment b/oem/starlabs-oem-gnome/desktop-overlay/etc/environment similarity index 100% rename from oem/starlite-oem-gnome/desktop-overlay/etc/environment rename to oem/starlabs-oem-gnome/desktop-overlay/etc/environment diff --git a/oem/starlite-oem-gnome/desktop-overlay/etc/gdm/custom.conf b/oem/starlabs-oem-gnome/desktop-overlay/etc/gdm/custom.conf similarity index 100% rename from oem/starlite-oem-gnome/desktop-overlay/etc/gdm/custom.conf rename to oem/starlabs-oem-gnome/desktop-overlay/etc/gdm/custom.conf diff --git a/oem/starlite-oem-gnome/desktop-overlay/etc/pam.d/polkit-1 b/oem/starlabs-oem-gnome/desktop-overlay/etc/pam.d/polkit-1 similarity index 100% rename from oem/starlite-oem-gnome/desktop-overlay/etc/pam.d/polkit-1 rename to oem/starlabs-oem-gnome/desktop-overlay/etc/pam.d/polkit-1 diff --git a/oem/starlite-oem-gnome/desktop-overlay/etc/pam.d/sudo b/oem/starlabs-oem-gnome/desktop-overlay/etc/pam.d/sudo similarity index 100% rename from oem/starlite-oem-gnome/desktop-overlay/etc/pam.d/sudo rename to oem/starlabs-oem-gnome/desktop-overlay/etc/pam.d/sudo diff --git a/oem/starlite-oem-gnome/desktop-overlay/usr/share/icons/default/index.theme b/oem/starlabs-oem-gnome/desktop-overlay/usr/share/icons/default/index.theme similarity index 100% rename from oem/starlite-oem-gnome/desktop-overlay/usr/share/icons/default/index.theme rename to oem/starlabs-oem-gnome/desktop-overlay/usr/share/icons/default/index.theme diff --git a/oem/starlite-oem-gnome/live-overlay/etc/default b/oem/starlabs-oem-gnome/live-overlay/etc/default similarity index 100% rename from oem/starlite-oem-gnome/live-overlay/etc/default rename to oem/starlabs-oem-gnome/live-overlay/etc/default diff --git a/oem/starlite-oem-gnome/live-overlay/etc/fstab b/oem/starlabs-oem-gnome/live-overlay/etc/fstab similarity index 100% rename from oem/starlite-oem-gnome/live-overlay/etc/fstab rename to oem/starlabs-oem-gnome/live-overlay/etc/fstab diff --git a/oem/starlite-oem-gnome/live-overlay/etc/issue b/oem/starlabs-oem-gnome/live-overlay/etc/issue similarity index 100% rename from oem/starlite-oem-gnome/live-overlay/etc/issue rename to oem/starlabs-oem-gnome/live-overlay/etc/issue diff --git a/oem/starlite-oem-gnome/live-overlay/etc/localtime b/oem/starlabs-oem-gnome/live-overlay/etc/localtime similarity index 100% rename from oem/starlite-oem-gnome/live-overlay/etc/localtime rename to oem/starlabs-oem-gnome/live-overlay/etc/localtime diff --git a/oem/starlite-oem-gnome/live-overlay/etc/pam.d b/oem/starlabs-oem-gnome/live-overlay/etc/pam.d similarity index 100% rename from oem/starlite-oem-gnome/live-overlay/etc/pam.d rename to oem/starlabs-oem-gnome/live-overlay/etc/pam.d diff --git a/oem/starlite-oem-gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop b/oem/starlabs-oem-gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop similarity index 100% rename from oem/starlite-oem-gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop rename to oem/starlabs-oem-gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop diff --git a/oem/starlite-oem-gnome/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop b/oem/starlabs-oem-gnome/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop similarity index 100% rename from oem/starlite-oem-gnome/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop rename to oem/starlabs-oem-gnome/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop diff --git a/oem/starlite-oem-gnome/live-overlay/etc/skel/.config/manjaro b/oem/starlabs-oem-gnome/live-overlay/etc/skel/.config/manjaro similarity index 100% rename from oem/starlite-oem-gnome/live-overlay/etc/skel/.config/manjaro rename to oem/starlabs-oem-gnome/live-overlay/etc/skel/.config/manjaro diff --git a/oem/starlite-oem-gnome/live-overlay/etc/sudoers.d b/oem/starlabs-oem-gnome/live-overlay/etc/sudoers.d similarity index 100% rename from oem/starlite-oem-gnome/live-overlay/etc/sudoers.d rename to oem/starlabs-oem-gnome/live-overlay/etc/sudoers.d diff --git a/oem/starlite-oem-gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig b/oem/starlabs-oem-gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig similarity index 100% rename from oem/starlite-oem-gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig rename to oem/starlabs-oem-gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig diff --git a/oem/starlite-oem-gnome/live-overlay/root/.config/qt5ct/qt5ct.conf b/oem/starlabs-oem-gnome/live-overlay/root/.config/qt5ct/qt5ct.conf similarity index 100% rename from oem/starlite-oem-gnome/live-overlay/root/.config/qt5ct/qt5ct.conf rename to oem/starlabs-oem-gnome/live-overlay/root/.config/qt5ct/qt5ct.conf diff --git a/oem/starlite-oem-gnome/live-overlay/usr b/oem/starlabs-oem-gnome/live-overlay/usr similarity index 100% rename from oem/starlite-oem-gnome/live-overlay/usr rename to oem/starlabs-oem-gnome/live-overlay/usr diff --git a/oem/starlite-oem-gnome/profile.conf b/oem/starlabs-oem-gnome/profile.conf similarity index 100% rename from oem/starlite-oem-gnome/profile.conf rename to oem/starlabs-oem-gnome/profile.conf From dc71c6cbba01fbdee393c989843b6b9db13bef62 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Wed, 8 Apr 2020 14:11:50 +0200 Subject: [PATCH 06/16] starlabs suppress m-hello in factory session --- .../etc/skel/.config/autostart/manjaro-hello.desktop | 1 + 1 file changed, 1 insertion(+) create mode 100644 oem/starlabs-oem-gnome/live-overlay/etc/skel/.config/autostart/manjaro-hello.desktop diff --git a/oem/starlabs-oem-gnome/live-overlay/etc/skel/.config/autostart/manjaro-hello.desktop b/oem/starlabs-oem-gnome/live-overlay/etc/skel/.config/autostart/manjaro-hello.desktop new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/oem/starlabs-oem-gnome/live-overlay/etc/skel/.config/autostart/manjaro-hello.desktop @@ -0,0 +1 @@ + From 03fde1d391f13cd897a06cc19c0ea75e89198530 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Wed, 8 Apr 2020 15:06:17 +0200 Subject: [PATCH 07/16] rename cal-oem-stalabs --- oem/starlabs-oem-gnome/Packages-Desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oem/starlabs-oem-gnome/Packages-Desktop b/oem/starlabs-oem-gnome/Packages-Desktop index 9262798..a9e653e 100644 --- a/oem/starlabs-oem-gnome/Packages-Desktop +++ b/oem/starlabs-oem-gnome/Packages-Desktop @@ -192,4 +192,4 @@ xorg-xinit ## OEM calamares-git calamares-oem-modules -calamares-oem-starlite-gnome-settings +calamares-oem-starlabs-gnome-settings From 3c0db207a96d67716ae109b06494a8ba2f990b5e Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Wed, 8 Apr 2020 17:51:12 +0200 Subject: [PATCH 08/16] [starlabs] add libreoffice --- oem/starlabs-oem-gnome/Packages-Desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/oem/starlabs-oem-gnome/Packages-Desktop b/oem/starlabs-oem-gnome/Packages-Desktop index a9e653e..10bf4e8 100644 --- a/oem/starlabs-oem-gnome/Packages-Desktop +++ b/oem/starlabs-oem-gnome/Packages-Desktop @@ -80,6 +80,7 @@ manjaro-artwork #>extra manjaro-wallpapers-18.0 >extra wallpapers-juhraya illyria-wallpaper +>extra libreoffice-still manjaro-browser-settings manjaro-dynamic-wallpaper manjaro-settings-manager-notifier From ecc8f5bb2572e8a37490eb282dda4ad07f9f11e9 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Wed, 8 Apr 2020 17:51:28 +0200 Subject: [PATCH 09/16] add starlabs kde and xfce --- oem/starlabs-oem-kde/Packages-Desktop | 323 ++++++++++++++++++ oem/starlabs-oem-kde/Packages-Live | 5 + oem/starlabs-oem-kde/Packages-Root | 1 + .../etc/X11/xorg.conf.d/30-touchpad.conf | 6 + .../desktop-overlay/etc/pam.d/sddm | 8 + .../desktop-overlay/etc/sddm.conf | 129 +++++++ .../etc/sysctl.d/50-max_user_watches.conf | 1 + .../usr/share/icons/default/index.theme | 2 + oem/starlabs-oem-kde/live-overlay/etc/default | 1 + oem/starlabs-oem-kde/live-overlay/etc/fstab | 1 + oem/starlabs-oem-kde/live-overlay/etc/issue | 1 + .../live-overlay/etc/localtime | 1 + oem/starlabs-oem-kde/live-overlay/etc/pam.d | 1 + .../skel/.config/autostart/calamares.desktop | 14 + .../.config/autostart/manjaro-hello.desktop | 1 + .../.config/autostart/no-lock-screen.desktop | 7 + .../etc/skel/.config/kcmdisplayrc | 9 + .../etc/skel/.config/kscreenlockerrc | 3 + .../live-overlay/etc/skel/.config/kwalletrc | 11 + .../live-overlay/etc/skel/.config/manjaro | 1 + .../skel/.local/share/konsole/Breath2.profile | 7 + .../live-overlay/usr/bin/calamares_polkit | 3 + .../calamares/branding/manjaro/branding.desc | 23 ++ oem/starlabs-oem-kde/profile.conf | 78 +++++ oem/starlabs-oem-xfce/Packages-Desktop | 278 +++++++++++++++ oem/starlabs-oem-xfce/Packages-Live | 5 + oem/starlabs-oem-xfce/Packages-Root | 93 +++++ .../etc/fonts/conf.d/70-no-bitmaps.conf | 1 + .../etc/lightdm/lightdm-gtk-greeter.conf | 16 + .../usr/share/icons/default/index.theme | 2 + .../live-overlay/etc/default/grub | 49 +++ .../live-overlay/etc/default/tlp | 221 ++++++++++++ oem/starlabs-oem-xfce/live-overlay/etc/fstab | 5 + oem/starlabs-oem-xfce/live-overlay/etc/issue | 13 + .../live-overlay/etc/pam.d/su | 6 + .../skel/.config/autostart/calamares.desktop | 14 + .../.config/autostart/manjaro-hello.desktop | 1 + .../.config/autostart/no-lock-screen.desktop | 7 + .../manjaro/manjaro-settings-manager.conf | 7 + .../live-overlay/etc/sudoers.d/g_wheel | 1 + .../root/.config/Kvantum/kvantum.kvconfig | 2 + .../root/.config/qt5ct/qt5ct.conf | 24 ++ oem/starlabs-oem-xfce/live-overlay/usr | 1 + oem/starlabs-oem-xfce/profile.conf | 77 +++++ 44 files changed, 1460 insertions(+) create mode 100644 oem/starlabs-oem-kde/Packages-Desktop create mode 100644 oem/starlabs-oem-kde/Packages-Live create mode 120000 oem/starlabs-oem-kde/Packages-Root create mode 100644 oem/starlabs-oem-kde/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf create mode 100644 oem/starlabs-oem-kde/desktop-overlay/etc/pam.d/sddm create mode 100644 oem/starlabs-oem-kde/desktop-overlay/etc/sddm.conf create mode 100644 oem/starlabs-oem-kde/desktop-overlay/etc/sysctl.d/50-max_user_watches.conf create mode 100644 oem/starlabs-oem-kde/desktop-overlay/usr/share/icons/default/index.theme create mode 120000 oem/starlabs-oem-kde/live-overlay/etc/default create mode 120000 oem/starlabs-oem-kde/live-overlay/etc/fstab create mode 120000 oem/starlabs-oem-kde/live-overlay/etc/issue create mode 120000 oem/starlabs-oem-kde/live-overlay/etc/localtime create mode 120000 oem/starlabs-oem-kde/live-overlay/etc/pam.d create mode 100755 oem/starlabs-oem-kde/live-overlay/etc/skel/.config/autostart/calamares.desktop create mode 100644 oem/starlabs-oem-kde/live-overlay/etc/skel/.config/autostart/manjaro-hello.desktop create mode 100644 oem/starlabs-oem-kde/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop create mode 100644 oem/starlabs-oem-kde/live-overlay/etc/skel/.config/kcmdisplayrc create mode 100755 oem/starlabs-oem-kde/live-overlay/etc/skel/.config/kscreenlockerrc create mode 100644 oem/starlabs-oem-kde/live-overlay/etc/skel/.config/kwalletrc create mode 120000 oem/starlabs-oem-kde/live-overlay/etc/skel/.config/manjaro create mode 100644 oem/starlabs-oem-kde/live-overlay/etc/skel/.local/share/konsole/Breath2.profile create mode 100755 oem/starlabs-oem-kde/live-overlay/usr/bin/calamares_polkit create mode 100644 oem/starlabs-oem-kde/live-overlay/usr/share/calamares/branding/manjaro/branding.desc create mode 100644 oem/starlabs-oem-kde/profile.conf create mode 100644 oem/starlabs-oem-xfce/Packages-Desktop create mode 100644 oem/starlabs-oem-xfce/Packages-Live create mode 100644 oem/starlabs-oem-xfce/Packages-Root create mode 120000 oem/starlabs-oem-xfce/desktop-overlay/etc/fonts/conf.d/70-no-bitmaps.conf create mode 100644 oem/starlabs-oem-xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf create mode 100644 oem/starlabs-oem-xfce/desktop-overlay/usr/share/icons/default/index.theme create mode 100644 oem/starlabs-oem-xfce/live-overlay/etc/default/grub create mode 100644 oem/starlabs-oem-xfce/live-overlay/etc/default/tlp create mode 100644 oem/starlabs-oem-xfce/live-overlay/etc/fstab create mode 100644 oem/starlabs-oem-xfce/live-overlay/etc/issue create mode 100644 oem/starlabs-oem-xfce/live-overlay/etc/pam.d/su create mode 100755 oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/autostart/calamares.desktop create mode 100644 oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/autostart/manjaro-hello.desktop create mode 100644 oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop create mode 100644 oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/manjaro/manjaro-settings-manager.conf create mode 100644 oem/starlabs-oem-xfce/live-overlay/etc/sudoers.d/g_wheel create mode 100644 oem/starlabs-oem-xfce/live-overlay/root/.config/Kvantum/kvantum.kvconfig create mode 100644 oem/starlabs-oem-xfce/live-overlay/root/.config/qt5ct/qt5ct.conf create mode 120000 oem/starlabs-oem-xfce/live-overlay/usr create mode 100644 oem/starlabs-oem-xfce/profile.conf diff --git a/oem/starlabs-oem-kde/Packages-Desktop b/oem/starlabs-oem-kde/Packages-Desktop new file mode 100644 index 0000000..cfca69a --- /dev/null +++ b/oem/starlabs-oem-kde/Packages-Desktop @@ -0,0 +1,323 @@ +## Network +avahi +networkmanager +networkmanager-openconnect +networkmanager-openvpn +networkmanager-pptp +networkmanager-vpnc +nss-mdns # NSS support for mDNS (optdepend for avahi) +ntp +mobile-broadband-provider-info +modemmanager +openresolv +openssh +samba +usb_modeswitch + +## Libraries for Sound/Audio/Video +alsa-firmware +alsa-utils +ffmpeg +gst-libav +gst-plugins-bad +gst-plugins-base +gst-plugins-good +gst-plugins-ugly +libcanberra +>multilib lib32-libcanberra +libcanberra-pulse +>multilib lib32-libcanberra-pulse +libcanberra-gstreamer +libdvdcss +manjaro-alsa +manjaro-pulse +phonon-qt5-gstreamer +pulseaudio-bluetooth +pulseaudio-ctl +pulseaudio-zeroconf + +## Connect Packages +android-tools +android-udev +gvfs +gvfs-afc +gvfs-gphoto2 +gvfs-mtp +gvfs-nfs +gvfs-smb +kamera +mtpfs +udiskie +udisks2 + +## AUR Support/Development +# Missing base-devel packages +>extra autoconf +>extra automake +>extra binutils +>extra bison +>extra fakeroot +>extra flex +>extra gcc +>extra >multilib gcc-libs-multilib +>extra >multilib gcc-multilib +>extra libtool +>extra m4 +>extra make +>extra patch +>extra pkg-config +>extra >multilib lib32-flex +# Extra packages for AUR support +>extra git +>extra patchutils +>extra subversion + +## Fonts +# cantarell-fonts # Installed as gnome-themes-standard dependency +noto-fonts # default font +noto-fonts-cjk # asian fonts - needed big package, ~76 mb compressed +>extra noto-fonts-emoji +terminus-font +>extra ttf-bitstream-vera +# ttf-dejavu # Installed as gnome-themes-standard dependency +# ttf-hack # Installed as plasma-integration dependency +>extra ttf-inconsolata +>extra ttf-indic-otf +>extra ttf-liberation +>extra ttf-droid + +## Games +>x86_64 >extra steam-manjaro + +## Package management +>extra appimagelauncher +pamac-gtk +pamac-tray-appindicator +pamac-cli +>extra apparmor +>extra snapd +>extra snapd-glib +>extra pamac-snap-plugin +>extra pamac-flatpak-plugin +#discover-snap +#discover +#packagekit-qt5 +>extra fwupd +#octopi +#octopi-cachecleaner +#octopi-repoeditor +#octopi-notifier-frameworks +#pamac-qt +manjaro-application-utility + +## Printing +>extra manjaro-printer +>extra gtk3-print-backends + +## Optional dependencies for hplip +>extra python-pillow +>extra python-pip +>extra python-pyqt5 +>extra python-reportlab + +## Optional dependencies for print-manager +>extra system-config-printer # auto-detect the printer driver +>extra python-pysmbc # SMB browser support + +## Display manager +sddm +sddm-kcm + +## Plasma5 +bluedevil +kde-gtk-config +kdeplasma-addons +kgamma5 +kinfocenter +kmenuedit +kscreen +kscreenlocker +ksshaskpass +ksysguard +kwallet-pam +kwayland-integration +kwin +qt5-virtualkeyboard # Virtual keyboard support for kwin-wayland +kwrited +milou +plasma-desktop +plasma-nm +plasma-pa +plasma-simplemenu +plasma-workspace +>extra plasma-workspace-wallpapers +powerdevil +systemsettings +user-manager + +## Themes QT/GTK/SDDM +gnome-icon-theme +gnome-themes-standard +oxygen # needed to provide KDE system sounds +oxygen-icons +sddm-breath2-theme +grub-theme-manjaro +illyria-wallpaper +>extra wallpapers-juhraya +>extra wallpapers-2018 +>extra manjaro-wallpapers-18.0 + +## KDE Applications +ark +#>extra digikam +dolphin +dolphin-plugins +>extra filelight +>extra k3b +kate +kcalc +>extra keditbookmarks +kfind +kdeconnect +okular +>extra >x86_64 kget +>extra >x86_64 libktorrent +>extra >i686 kdenetwork-kget +kdenetwork-filesharing +#>extra kdenlive +kde-servicemenus-rootactions +khelpcenter +khotkeys +kio-extras +#>extra kleopatra +konsole +konversation +ksystemlog +kwalletmanager +gwenview +partitionmanager +>extra print-manager +>extra skanlite +spectacle + +## Optional dependencies for ark +p7zip # 7Z format support +unarchiver # RAR format support + +## Optional dependency for digikam +#>extra kipi-plugins # export to various online services +#>extra hugin # panorama tool + +## Optional dependencies for dolphin +kdegraphics-thumbnailers # PDF and PS thumbnails +ffmpegthumbs # video thumbnails +ruby # installing new service menus with GHNS + +## Optional dependencies for gwenview +kimageformats # support for dds, xcf, exr, psd, and more image formats +qt5-imageformats # support for tiff, webp, and more image formats + +## Optional dependencies for k3b +>extra cdparanoia # for cd ripping support +>extra cdrdao # for disk-at-once (DAO) mode support +>extra dvd+rw-tools # for dvd burning support +>extra emovix # for bootable multimedia cd/dvd support +>extra transcode # for advanced mpeg conversion support +>extra vcdimager # for vcd burning support + +## Optional dependencies for kaccounts-integration +kaccounts-providers + +## Optional dependencies for kdeconnect +sshfs # remote filesystem browser + +## Optional dependencies for kdenlive +#>extra cdrtools # for creation of DVD ISO images +#>extra dvdauthor # for creation of DVD +#>extra dvgrab # for firewire capture +#>extra recordmydesktop # for screen capture +#>extra vlc-nightly # for DVD preview, needs xine-ui or vlc, vlc is in "Applications" section +#>extra movit # for GPU video processing + +## Optional dependencies for okular +poppler-data # encoding data to display PDF documents containing CJK characters + +## Applications +>extra cantata +dmidecode # for inxi -m output +>extra etcher +firefox +htop +inxi +#>extra krita +#ms-office-online +#>extra freeoffice +>extra libreoffice-still +manjaro-hello +manjaro-application-utility +manjaro-settings-manager-kcm +manjaro-settings-manager-knotifier +powertop +>extra qbittorrent +screenfetch +systemd-kcm +>extra thunderbird +>extra vlc +yakuake + +## Optional dependencis for cantata +>extra mpd # playback +>extra perl-uri # dynamic playlist + +## Optional dependencies for libreoffice +#>extra jre8-openjdk +#>extra jdk8-openjdk + +## Documentation +manjaro-documentation-en + +## Settings packages +manjaro-kde-settings-19.0 +manjaro-browser-settings + +## Xorg Input Drivers +xf86-input-elographics +xf86-input-evdev +xf86-input-libinput +xf86-input-void + +## Xorg Server and Graphics +>multilib lib32-libva-intel-driver +>multilib lib32-libva-mesa-driver +>multilib lib32-libva-vdpau-driver +libva-intel-driver +libva-mesa-driver +libva-vdpau-driver +mesa-demos +>multilib lib32-mesa-demos +numlockx +xdg-user-dirs +xorg-server +xorg-twm +xorg-xinit +xorg-xkill + +## Desktop Utils +perl-file-mimeinfo +xdg-utils +xdg-su +>extra timeshift +>extra kernel-alive + +## Misc +manjaro-hotfixes +>basic squashfs-tools + +## Flatpak support +>extra xdg-desktop-portal +>extra xdg-desktop-portal-kde + +## OEM +calamares-git +calamares-oem-modules +calamares-oem-starlabs-kde-settings diff --git a/oem/starlabs-oem-kde/Packages-Live b/oem/starlabs-oem-kde/Packages-Live new file mode 100644 index 0000000..a6851f2 --- /dev/null +++ b/oem/starlabs-oem-kde/Packages-Live @@ -0,0 +1,5 @@ +grub-theme-live-manjaro +manjaro-live-skel +manjaro-live-systemd +mkinitcpio-nfs-utils +nbd diff --git a/oem/starlabs-oem-kde/Packages-Root b/oem/starlabs-oem-kde/Packages-Root new file mode 120000 index 0000000..60cc7bd --- /dev/null +++ b/oem/starlabs-oem-kde/Packages-Root @@ -0,0 +1 @@ +../../shared/Packages-Root \ No newline at end of file diff --git a/oem/starlabs-oem-kde/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf b/oem/starlabs-oem-kde/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf new file mode 100644 index 0000000..4bd1a17 --- /dev/null +++ b/oem/starlabs-oem-kde/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf @@ -0,0 +1,6 @@ +Section "InputClass" + Identifier "touchpad" + Driver "libinput" + MatchIsTouchpad "on" + Option "Tapping" "on" +EndSection diff --git a/oem/starlabs-oem-kde/desktop-overlay/etc/pam.d/sddm b/oem/starlabs-oem-kde/desktop-overlay/etc/pam.d/sddm new file mode 100644 index 0000000..1ed30b3 --- /dev/null +++ b/oem/starlabs-oem-kde/desktop-overlay/etc/pam.d/sddm @@ -0,0 +1,8 @@ +#%PAM-1.0 + +auth include system-login +auth optional pam_kwallet5.so +account include system-login +password include system-login +session include system-login +session optional pam_kwallet5.so auto_start diff --git a/oem/starlabs-oem-kde/desktop-overlay/etc/sddm.conf b/oem/starlabs-oem-kde/desktop-overlay/etc/sddm.conf new file mode 100644 index 0000000..5d22e78 --- /dev/null +++ b/oem/starlabs-oem-kde/desktop-overlay/etc/sddm.conf @@ -0,0 +1,129 @@ +[Autologin] +# Whether sddm should automatically log back into sessions when they exit +Relogin=false + +# Name of session file for autologin session (if empty try last logged in) +Session=plasma.desktop + +# Username for autologin session +User= + + +[General] +# Halt command +HaltCommand=/usr/bin/systemctl poweroff + +# Input method module +InputMethod= + +# Initial NumLock state. Can be on, off or none. +# If property is set to none, numlock won't be changed +# NOTE: Currently ignored if autologin is enabled. +Numlock=none + +# Reboot command +RebootCommand=/usr/bin/systemctl reboot + + +[Theme] +# Current theme name +Current=breath2 + +# Cursor theme used in the greeter +CursorTheme=breeze_cursors + +# Number of users to use as threshold +# above which avatars are disabled +# unless explicitly enabled with EnableAvatars +DisableAvatarsThreshold=7 + +# Enable display of custom user avatars +EnableAvatars=true + +# Global directory for user avatars +# The files should be named .face.icon +FacesDir=/usr/share/sddm/faces + +# Theme directory path +ThemeDir=/usr/share/sddm/themes + + +[Users] +# Default $PATH for logged in users +DefaultPath=/usr/local/sbin:/usr/local/bin:/usr/bin + +# Comma-separated list of shells. +# Users with these shells as their default won't be listed +HideShells= + +# Comma-separated list of users that should not be listed +HideUsers= + +# Maximum user id for displayed users +MaximumUid=60000 + +# Minimum user id for displayed users +MinimumUid=1000 + +# Remember the session of the last successfully logged in user +RememberLastSession=true + +# Remember the last successfully logged in user +RememberLastUser=true + +# When logging in as the same user twice, restore the original session, rather than create a new one +ReuseSession=false + + +[Wayland] +# Enable Qt's automatic high-DPI scaling +EnableHiDPI=false + +# Path to a script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/wayland-session + +# Directory containing available Wayland sessions +SessionDir=/usr/share/wayland-sessions + +# Path to the user session log file +SessionLogFile=.local/share/sddm/wayland-session.log + + +[X11] +# Path to a script to execute when starting the display server +DisplayCommand=/usr/share/sddm/scripts/Xsetup + +# Path to a script to execute when stopping the display server +DisplayStopCommand=/usr/share/sddm/scripts/Xstop + +# Enable Qt's automatic high-DPI scaling +EnableHiDPI=false + +# The lowest virtual terminal number that will be used. +MinimumVT=1 + +# Arguments passed to the X server invocation +ServerArguments=-nolisten tcp + +# Path to X server binary +ServerPath=/usr/bin/X + +# Path to a script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/Xsession + +# Directory containing available X sessions +SessionDir=/usr/share/xsessions + +# Path to the user session log file +SessionLogFile=.local/share/sddm/xorg-session.log + +# Path to the Xauthority file +UserAuthFile=.Xauthority + +# Path to xauth binary +XauthPath=/usr/bin/xauth + +# Path to Xephyr binary +XephyrPath=/usr/bin/Xephyr + + diff --git a/oem/starlabs-oem-kde/desktop-overlay/etc/sysctl.d/50-max_user_watches.conf b/oem/starlabs-oem-kde/desktop-overlay/etc/sysctl.d/50-max_user_watches.conf new file mode 100644 index 0000000..afb47d1 --- /dev/null +++ b/oem/starlabs-oem-kde/desktop-overlay/etc/sysctl.d/50-max_user_watches.conf @@ -0,0 +1 @@ +fs.inotify.max_user_watches = 16384 diff --git a/oem/starlabs-oem-kde/desktop-overlay/usr/share/icons/default/index.theme b/oem/starlabs-oem-kde/desktop-overlay/usr/share/icons/default/index.theme new file mode 100644 index 0000000..05623f3 --- /dev/null +++ b/oem/starlabs-oem-kde/desktop-overlay/usr/share/icons/default/index.theme @@ -0,0 +1,2 @@ +[icon theme] +Inherits=xcursor-breeze diff --git a/oem/starlabs-oem-kde/live-overlay/etc/default b/oem/starlabs-oem-kde/live-overlay/etc/default new file mode 120000 index 0000000..812b9ff --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/default @@ -0,0 +1 @@ +../../../../shared/manjaro/live-overlay/etc/default \ No newline at end of file diff --git a/oem/starlabs-oem-kde/live-overlay/etc/fstab b/oem/starlabs-oem-kde/live-overlay/etc/fstab new file mode 120000 index 0000000..8750aca --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/fstab @@ -0,0 +1 @@ +../../../../shared/manjaro/live-overlay/etc/fstab \ No newline at end of file diff --git a/oem/starlabs-oem-kde/live-overlay/etc/issue b/oem/starlabs-oem-kde/live-overlay/etc/issue new file mode 120000 index 0000000..c519805 --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/issue @@ -0,0 +1 @@ +../../../../shared/manjaro/live-overlay/etc/issue \ No newline at end of file diff --git a/oem/starlabs-oem-kde/live-overlay/etc/localtime b/oem/starlabs-oem-kde/live-overlay/etc/localtime new file mode 120000 index 0000000..5df1bb1 --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/localtime @@ -0,0 +1 @@ +../../../../shared/manjaro/live-overlay/etc/localtime \ No newline at end of file diff --git a/oem/starlabs-oem-kde/live-overlay/etc/pam.d b/oem/starlabs-oem-kde/live-overlay/etc/pam.d new file mode 120000 index 0000000..68de596 --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/pam.d @@ -0,0 +1 @@ +../../../../shared/manjaro/live-overlay/etc/pam.d \ No newline at end of file diff --git a/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/autostart/calamares.desktop b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/autostart/calamares.desktop new file mode 100755 index 0000000..40b4464 --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/autostart/calamares.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Install Manjaro Linux +GenericName=Live Installer +Comment=Install the operating system to disk +Comment[de]=Manjaro Linux installieren +X-GNOME-Autostart-enabled=true +Exec=kstart5 --fullscreen calamares_polkit +Icon=calamares +Terminal=false +StartupNotify=true +Type=Application +Categories=Qt;System; diff --git a/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/autostart/manjaro-hello.desktop b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/autostart/manjaro-hello.desktop new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/autostart/manjaro-hello.desktop @@ -0,0 +1 @@ + diff --git a/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop new file mode 100644 index 0000000..014d3ea --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Deactive lock screen +Comment=Deactive the gnome lock screen in the live session +Type=Application +Icon=nautilus +Exec=sh -c "gsettings set org.gnome.desktop.screensaver lock-enabled false" + diff --git a/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/kcmdisplayrc b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/kcmdisplayrc new file mode 100644 index 0000000..32d417f --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/kcmdisplayrc @@ -0,0 +1,9 @@ +[X11] +exportKDEColors=true +exportKDEFonts=false + +[DisplayEnergy] +displayEnergySaving=false +displayStandby=7 +displaySuspend=13 +displayPowerOff=19 diff --git a/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/kscreenlockerrc b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/kscreenlockerrc new file mode 100755 index 0000000..d9c11d9 --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/kscreenlockerrc @@ -0,0 +1,3 @@ +[Daemon] +Autolock=false +Timeout=0 \ No newline at end of file diff --git a/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/kwalletrc b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/kwalletrc new file mode 100644 index 0000000..ba04734 --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/kwalletrc @@ -0,0 +1,11 @@ +[Wallet] +Close When Idle=false +Close on Screensaver=false +Enabled=false +Idle Timeout=10 +Launch Manager=false +Leave Manager Open=false +Leave Open=true +Prompt on Open=false +Use One Wallet=true + diff --git a/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/manjaro b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/manjaro new file mode 120000 index 0000000..3a25db6 --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/skel/.config/manjaro @@ -0,0 +1 @@ +../../../../../../shared/manjaro/live-overlay/etc/skel/.config/manjaro \ No newline at end of file diff --git a/oem/starlabs-oem-kde/live-overlay/etc/skel/.local/share/konsole/Breath2.profile b/oem/starlabs-oem-kde/live-overlay/etc/skel/.local/share/konsole/Breath2.profile new file mode 100644 index 0000000..14fbd40 --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/etc/skel/.local/share/konsole/Breath2.profile @@ -0,0 +1,7 @@ +[Appearance] +ColorScheme=Breeze +Font=Noto Mono,10,-1,0,50,0,0,0,0,0 + +[General] +Name=Breath2 +Parent=FALLBACK/ diff --git a/oem/starlabs-oem-kde/live-overlay/usr/bin/calamares_polkit b/oem/starlabs-oem-kde/live-overlay/usr/bin/calamares_polkit new file mode 100755 index 0000000..7100969 --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/usr/bin/calamares_polkit @@ -0,0 +1,3 @@ +#!/bin/bash + +sudo -E /usr/bin/calamares "$@" diff --git a/oem/starlabs-oem-kde/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/oem/starlabs-oem-kde/live-overlay/usr/share/calamares/branding/manjaro/branding.desc new file mode 100644 index 0000000..a1cbd1a --- /dev/null +++ b/oem/starlabs-oem-kde/live-overlay/usr/share/calamares/branding/manjaro/branding.desc @@ -0,0 +1,23 @@ +--- +componentName: manjaro + +strings: + productName: Manjaro Linux + shortProductName: Manjaro + version: 19.0.2 OEM + shortVersion: 19.0.2 OEM + versionedName: Manjaro Linux 19.0.2 "Kyria" OEM + shortVersionedName: Manjaro 19.0.2 OEM + bootloaderEntryName: Manjaro + +images: + productLogo: "logo.png" + productIcon: "logo.png" + productWelcome: "languages.png" + +slideshow: "show.qml" + +style: + sidebarBackground: "#454948" + sidebarText: "#efefef" + sidebarTextSelect: "#9E4F5D" diff --git a/oem/starlabs-oem-kde/profile.conf b/oem/starlabs-oem-kde/profile.conf new file mode 100644 index 0000000..d847b88 --- /dev/null +++ b/oem/starlabs-oem-kde/profile.conf @@ -0,0 +1,78 @@ +########################################## +###### use this file in the profile ###### +########################################## + +# use multilib packages; x86_64 only +# multilib="true" + +displaymanager="sddm" + +# Set to false to disable autologin in the livecd +# autologin="true" + +# nonfree mhwd drivers +# nonfree_mhwd="true" + +# use extra packages as defined in pkglist to activate a full profile +# extra="false" +# extra="true" + +################ install ################ + +# unset defaults to given value +# efi_boot_loader="grub" + +# configure calamares for netinstall +# netinstall="false" + +# configure calamares to use chrootcfg instead of unpackfs +# chrootcfg="false" + +# use geoip for localization +# geoip='true' + +# configure calamares for mhwd +mhwd_used="false" + +# configure calamares for oem +oem_used="true" + +windowexp=fullscreen + +# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store" +# strict_snaps="" +# add classic snaps: classic_snaps="code" +# classic_snaps="" +# choose the snap channel. Possible options are: stable, candidate, beta, edge +# snap_channel="candidate" + +# unset defaults to given values +# names must match systemd service names +enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'fstrim.timer' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd') +disable_systemd=('pacman-init') + +# the same workgroup name if samba is used +# smb_workgroup="" + +################# livecd ################# + +# unset defaults to given value +# hostname="manjaro" + +# unset defaults to given value +# username="manjaro" + +# unset defaults to given value +# password="manjaro" + +# the login shell +# defaults to bash +# login_shell=/bin/bash + +# unset defaults to given values +# addgroups="lp,network,power,wheel" + +# unset defaults to given values +# names must match systemd service names +# services in enable_systemd array don't need to be listed here +enable_systemd_live=('manjaro-live' 'pacman-init' 'mirrors-live') diff --git a/oem/starlabs-oem-xfce/Packages-Desktop b/oem/starlabs-oem-xfce/Packages-Desktop new file mode 100644 index 0000000..9092584 --- /dev/null +++ b/oem/starlabs-oem-xfce/Packages-Desktop @@ -0,0 +1,278 @@ +## Network +avahi +networkmanager +networkmanager-openconnect +networkmanager-openvpn +networkmanager-pptp +networkmanager-vpnc +nss-mdns # NSS support for mDNS (optdepend for avahi) +ntp +mobile-broadband-provider-info +modemmanager +openresolv +openssh +samba +usb_modeswitch + +## Libraries for Sound/Audio/Video +alsa-firmware +alsa-utils +ffmpeg +gst-libav +gst-plugins-bad +gst-plugins-base +gst-plugins-good +gst-plugins-ugly +libdvdcss +>multilib manjaro-alsa +manjaro-pulse +pulseaudio-bluetooth +pulseaudio-ctl +pulseaudio-zeroconf + +## Connect Packages +android-tools +android-udev +gvfs +gvfs-afc +gvfs-gphoto2 +gvfs-mtp +gvfs-nfs +gvfs-smb +mtpfs +udiskie +udisks2 + +## AUR Support/Development +# Missing base-devel packages +>extra autoconf +>extra automake +>extra binutils +>extra bison +>extra fakeroot +>extra flex +>extra gcc +>extra >multilib gcc-libs-multilib +>extra >multilib gcc-multilib +>extra libtool +>extra m4 +>extra make +>extra patch +>extra pkg-config +>extra >multilib lib32-flex +# Extra packages for AUR support +>extra git +>extra patchutils +>extra subversion + +## Fonts +cantarell-fonts +noto-fonts # default font +noto-fonts-cjk # asian fonts - needed big package, ~76 mb compressed +# >extra noto-fonts-emoji +terminus-font +ttf-bitstream-vera # xfce4-terminal default Monospace +# ttf-dejavu # Installed as gnome-themes-standard dependency +>extra ttf-inconsolata +>extra ttf-indic-otf +>extra ttf-liberation +>extra ttf-droid + +## Games +>x86_64 >extra steam-manjaro + +## Package management +>extra apparmor +#>extra gnome-software-snap +pamac-gtk +>extra snapd +>extra snapd-glib +>extra pamac-snap-plugin +>extra pamac-flatpak-plugin + +## Java +>extra jdk8-openjdk +>extra jre8-openjdk-headless +>extra jre8-openjdk + +## Printing +>extra manjaro-printer + +## Display manager +lightdm +lightdm-gtk-greeter +lightdm-gtk-greeter-settings +accountsservice # Enhanced user accounts handling + +## XFCE Group +exo +garcon +thunar +thunar-volman +tumbler +xfce4-appfinder +xfce4-panel +xfce4-power-manager +xfce4-session +xfce4-settings +xfce4-terminal +xfconf +xfdesktop +xfwm4 + +## XFCE Extras +blueman +ffmpegthumbnailer # tumbler - for video thumbnails +freetype2 # tumbler - for font thumbnails +gksu +gnome-keyring # fix wlan segfault +libgsf # tumbler - for ODF thumbnails +libopenraw # tumbler - for RAW thumbnails +light-locker +network-manager-applet +menulibre +orage +poppler-glib # tumbler - for PDF thumbnails +thunar-archive-plugin +thunar-media-tags-plugin +# >extra xfce4-artwork +xfce4-battery-plugin +xfce4-clipman-plugin +>extra xfce4-cpufreq-plugin +>extra xfce4-cpugraph-plugin +# xfce4-datetime-plugin +>extra xfce4-dict +>extra xfce4-diskperf-plugin +>extra xfce4-fsguard-plugin +>extra xfce4-genmon-plugin +>extra xfce4-mailwatch-plugin +>extra xfce4-mount-plugin +>extra xfce4-mpc-plugin +>extra xfce4-netload-plugin +>extra xfce4-notes-plugin +xfce4-notifyd +xfce4-screenshooter +>extra xfce4-sensors-plugin +>extra xfce4-smartbookmark-plugin +>extra xfce4-systemload-plugin +xfce4-taskmanager +>extra xfce4-time-out-plugin +>extra xfce4-timer-plugin +>extra xfce4-verve-plugin +>extra xfce4-wavelan-plugin +>extra xfce4-weather-plugin +xfce4-whiskermenu-plugin +xfce4-xkb-plugin +xfce4-pulseaudio-plugin +pavucontrol + +## Themes +>extra manjaro-wallpapers-18.0 +>extra wallpapers-2018 +>extra wallpapers-juhraya +gnome-icon-theme +gnome-themes-standard +grub-theme-manjaro +matcha-gtk-theme +xcursor-simpleandsoft +xcursor-vanilla-dmz-aa + +## Applications +>extra catfish +dmidecode # optional dependency inxi +engrampa +>extra etcher +>extra firefox +# >extra flashplugin +>extra galculator-gtk2 +gcolor2 +>extra gimp +gparted +gufw +>extra audacious +>extra hexchat +htop +qpdfview +inxi +>extra libreoffice-still +#>extra microsoft-office-online-jak +#>extra freeoffice +manjaro-hello +manjaro-application-utility +manjaro-settings-manager +manjaro-settings-manager-notifier +>basic midori +>extra mlocate +mousepad +mugshot +>basic parole # media player +>extra pidgin +powertop +screenfetch +>extra poppler-data # CKJ support for pdf +#>basic sylpheed # mail client +>extra thunderbird +>extra vlc +>extra viewnior +>extra xfburn +>extra yelp + +# Optional dependencies engrampa +p7zip # 7Z and ARJ archive support +unace # ACE archive support +unrar # RAR archive support + +## Documentation +manjaro-documentation-en + +## Settings packages +>extra manjaro-xfce-gtk3-settings +>basic manjaro-xfce-gtk3-minimal-settings +manjaro-browser-settings + +## Xorg Input Drivers +xf86-input-elographics +xf86-input-evdev +xf86-input-libinput +xf86-input-void + +## Xorg Server and Graphics +>multilib lib32-libva-intel-driver +>multilib lib32-libva-mesa-driver +>multilib lib32-libva-vdpau-driver +libva-intel-driver +libva-mesa-driver +libva-vdpau-driver +mesa-demos +>multilib lib32-mesa-demos +numlockx +xdg-user-dirs +xorg-server +xorg-twm +xorg-xinit +xorg-xkill + +## Desktop Utils +perl-file-mimeinfo +xdg-utils +xdg-su +>extra timeshift +>extra kernel-alive + +## Misc +gtkhash-thunar +manjaro-hotfixes +>basic squashfs-tools +xiccd # enable color profile settings + +## Handshake tools +#faucet-tool +#hnsd-git +#hsd-git +#veracrypt +#cryptoseed + +## OEM +calamares-git +calamares-oem-modules +calamares-oem-starlabs-xfce-settings diff --git a/oem/starlabs-oem-xfce/Packages-Live b/oem/starlabs-oem-xfce/Packages-Live new file mode 100644 index 0000000..a6851f2 --- /dev/null +++ b/oem/starlabs-oem-xfce/Packages-Live @@ -0,0 +1,5 @@ +grub-theme-live-manjaro +manjaro-live-skel +manjaro-live-systemd +mkinitcpio-nfs-utils +nbd diff --git a/oem/starlabs-oem-xfce/Packages-Root b/oem/starlabs-oem-xfce/Packages-Root new file mode 100644 index 0000000..3b47a4f --- /dev/null +++ b/oem/starlabs-oem-xfce/Packages-Root @@ -0,0 +1,93 @@ +>i686 archlinux32-keyring +>manjaro manjaro-release +>multilib gcc-libs-multilib +acpi +acpid +amd-ucode +b43-fwcutter +bash-completion +btrfs-progs +bzip2 +coreutils +cpupower +crda +cronie +cryptsetup +dbus-x11 +device-mapper +dhclient +dhcpcd +diffutils +dmraid +dnsmasq +dosfstools +e2fsprogs +ecryptfs-utils +efibootmgr +exfat-utils +f2fs-tools +file +filesystem +findutils +gawk +gcc-libs +gettext +glibc +grep +grub +gzip +haveged +inetutils +intel-ucode +iproute2 +iptables +iputils +ipw2100-fw +ipw2200-fw +jfsutils +KERNEL +less +licenses +linux-firmware +logrotate +lsb-release +lvm2 +man-db +man-pages +manjaro-firmware +manjaro-system +mdadm +memtest86+ +mhwd +mhwd-db +mkinitcpio-openswap +nano +nfs-utils +ntfs-3g +os-prober +pacman +pciutils +perl +procps-ng +psmisc +reiserfsprogs +rsync +s-nail +sed +shadow +spectre-meltdown-checker +sudo +sysfsutils +systemd-fsck-silent +systemd-sysvcompat +tar +texinfo +tlp +usbutils +util-linux +vi +wget +which +wpa_supplicant +xfsprogs +zsh diff --git a/oem/starlabs-oem-xfce/desktop-overlay/etc/fonts/conf.d/70-no-bitmaps.conf b/oem/starlabs-oem-xfce/desktop-overlay/etc/fonts/conf.d/70-no-bitmaps.conf new file mode 120000 index 0000000..d6c7fc1 --- /dev/null +++ b/oem/starlabs-oem-xfce/desktop-overlay/etc/fonts/conf.d/70-no-bitmaps.conf @@ -0,0 +1 @@ +/etc/fonts/conf.avail/70-no-bitmaps.conf \ No newline at end of file diff --git a/oem/starlabs-oem-xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf b/oem/starlabs-oem-xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf new file mode 100644 index 0000000..a18f780 --- /dev/null +++ b/oem/starlabs-oem-xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf @@ -0,0 +1,16 @@ +[greeter] +background = /usr/share/backgrounds/illyria-default-lockscreen.jpg +user-background = false +font-name = Cantarell Bold 12 +xft-antialias = true +icon-theme-name = Adapta-Papirus-Maia +screensaver-timeout = 60 +theme-name = Matcha-sea +cursor-theme-name = xcursor-breeze +show-clock = false +default-user-image = #manjaro +xft-hintstyle = hintfull +position = 50%,center 57%,center +clock-format = +panel-position = bottom +indicators = ~host;~spacer;~clock;~spacer;~language;~session;~a11y;~power diff --git a/oem/starlabs-oem-xfce/desktop-overlay/usr/share/icons/default/index.theme b/oem/starlabs-oem-xfce/desktop-overlay/usr/share/icons/default/index.theme new file mode 100644 index 0000000..05623f3 --- /dev/null +++ b/oem/starlabs-oem-xfce/desktop-overlay/usr/share/icons/default/index.theme @@ -0,0 +1,2 @@ +[icon theme] +Inherits=xcursor-breeze diff --git a/oem/starlabs-oem-xfce/live-overlay/etc/default/grub b/oem/starlabs-oem-xfce/live-overlay/etc/default/grub new file mode 100644 index 0000000..933c5c6 --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/etc/default/grub @@ -0,0 +1,49 @@ +GRUB_DEFAULT=saved +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="Manjaro" +GRUB_CMDLINE_LINUX_DEFAULT="" +GRUB_CMDLINE_LINUX="" + +# If you want to enable the save default function, uncomment the following +# line, and set GRUB_DEFAULT to saved. +GRUB_SAVEDEFAULT=true + +# Preload both GPT and MBR modules so that they are not missed +GRUB_PRELOAD_MODULES="part_gpt part_msdos" + +# Uncomment to enable Hidden Menu, and optionally hide the timeout count +#GRUB_HIDDEN_TIMEOUT=5 +#GRUB_HIDDEN_TIMEOUT_QUIET=true + +# Uncomment to use basic console +GRUB_TERMINAL_INPUT=console + +# Uncomment to disable graphical terminal +#GRUB_TERMINAL_OUTPUT=console + +# The resolution used on graphical terminal +# note that you can use only modes which your graphic card supports via VBE +# you can see them in real GRUB with the command `vbeinfo' +GRUB_GFXMODE=auto + +# Uncomment to allow the kernel use the same resolution used by grub +GRUB_GFXPAYLOAD_LINUX=keep + +# Uncomment if you want GRUB to pass to the Linux kernel the old parameter +# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" +#GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +GRUB_DISABLE_RECOVERY=true + +# Uncomment and set to the desired menu colors. Used by normal and wallpaper +# modes only. Entries specified as foreground/background. +GRUB_COLOR_NORMAL="light-gray/black" +GRUB_COLOR_HIGHLIGHT="green/black" + +# Uncomment one of them for the gfx desired, a image background or a gfxtheme +#GRUB_BACKGROUND="/usr/share/grub/background.png" +#GRUB_THEME="/path/to/gfxtheme" + +# Uncomment to get a beep at GRUB start +#GRUB_INIT_TUNE="480 440 1" diff --git a/oem/starlabs-oem-xfce/live-overlay/etc/default/tlp b/oem/starlabs-oem-xfce/live-overlay/etc/default/tlp new file mode 100644 index 0000000..c33ece3 --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/etc/default/tlp @@ -0,0 +1,221 @@ +# ------------------------------------------------------------------------------ +# tlp - Parameters for power save + +# Hint: some features are disabled by default, remove the leading # to enable them + +# Set to 0 to disable/1 to enable TLP +TLP_ENABLE=1 + +# Seconds laptop mode has to to wait after the disk goes idle before doing a sync. +# Non-zero value enables, zero disables laptop mode. +DISK_IDLE_SECS_ON_AC=0 +DISK_IDLE_SECS_ON_BAT=2 + +# Dirty page values (timeouts in secs). +MAX_LOST_WORK_SECS_ON_AC=15 +MAX_LOST_WORK_SECS_ON_BAT=60 + +# Select a cpu frequency scaling governor: ondemand/powersave/performance/conservative +# Important: +# - You *must* disable your distribution's governor settings or conflicts will occur +# - ondemand is sufficient for *almost all* workloads, you should know what you're doing! +#CPU_SCALING_GOVERNOR_ON_AC=ondemand +#CPU_SCALING_GOVERNOR_ON_BAT=ondemand + +# Set the min/max frequency available for the scaling governor. +# Possible values strongly depend on your cpu. For available frequencies see +# tlp-stat output, Section "+++ Processor". +# Hint: Parameters are disabled by default, remove the leading # to enable them, +# otherwise kernel default values are used. +#CPU_SCALING_MIN_FREQ_ON_AC=0 +#CPU_SCALING_MAX_FREQ_ON_AC=0 +#CPU_SCALING_MIN_FREQ_ON_BAT=0 +#CPU_SCALING_MAX_FREQ_ON_BAT=0 + +# Set the cpu "turbo boost" feature: 0=disable / 1=allow +# Requires an Intel Core i processor and kernel 3.7 or later. +# Important: +# - This may conflict with your distribution's governor settings +# - A value of 1 does *not* activate boosting, it just allows it +#CPU_BOOST_ON_AC=1 +#CPU_BOOST_ON_BAT=0 + +# Minimize number of used cpu cores/hyper-threads under light load conditions +SCHED_POWERSAVE_ON_AC=0 +SCHED_POWERSAVE_ON_BAT=1 + +# Kernel NMI Watchdog +# 0=disable (default, saves power) / 1=enable (for kernel debugging only) +NMI_WATCHDOG=0 + +# Change CPU voltages aka "undervolting" - Kernel with PHC patch required +# Freq:voltage pairs are written to /sys/devices/system/cpu/cpu0/cpufreq/phc_controls +# CAUTION: only use this, if you thoroughly understand what you are doing! +#PHC_CONTROLS="F:V F:V F:V F:V" + +# Hard disk devices, separate multiple devices with spaces (default: sda). +# Devices can be specified by disk id too (lookup with: tlp diskid). +DISK_DEVICES="sda sdb" + +# Hard disk advanced power management level: 1(max saving)..254(off) +# Levels 1..127 may spin down the disk. +# Separate values for multiple devices with spaces. +DISK_APM_LEVEL_ON_AC="254 254" +DISK_APM_LEVEL_ON_BAT="254 254" + +# Hard disk spin down timeout: +# 0: spin down disabled +# 1..240: timeouts from 5s to 20min (in units of 5s) +# 241..251: timeouts from 30min to 5.5 hours (in units of 30min) +# (see 'man hdparm' for details) +#DISK_SPINDOWN_TIMEOUT_ON_AC="0 0" +#DISK_SPINDOWN_TIMEOUT_ON_BAT="0 0" + +# Select io scheduler for the disk devices: noop/deadline/cfq (Default: cfq) +# Separate values for multiple devices with spaces. +#DISK_IOSCHED="cfq cfq" + +# SATA aggressive link power management (ALPM): +# min_power/medium_power/max_performance +SATA_LINKPWR_ON_AC=max_performance +SATA_LINKPWR_ON_BAT=min_power + +# PCI Express Active State Power Management (PCIe ASPM): +# default/performance/powersave +# Hint: needs kernel boot option pcie_aspm=force on some machines +PCIE_ASPM_ON_AC=performance +PCIE_ASPM_ON_BAT=powersave + +# Radeon graphics clock speed (profile method): low/mid/high/auto/default +# auto = mid on BAT, high on AC; default = use hardware defaults +# (Kernel >= 2.6.35 only, not with fglrx driver!) +RADEON_POWER_PROFILE_ON_AC=high +RADEON_POWER_PROFILE_ON_BAT=low + +# New radeon dynamic power management method (dpm): battery/performance +# (Kernel >= 3.11 only, requires boot option radeon.dpm=1) +RADEON_DPM_STATE_ON_AC=performance +RADEON_DPM_STATE_ON_BAT=battery + +# New radeon dpm performance level: auto/low/high (auto is recommended) +RADEON_DPM_PERF_LEVEL_ON_AC=auto +RADEON_DPM_PERF_LEVEL_ON_BAT=auto + +# WiFi power saving mode: 1=disable/5=enable +# (Linux 2.6.32 and later, some adapters only!) +WIFI_PWR_ON_AC=1 +WIFI_PWR_ON_BAT=5 + +# Disable wake on lan: Y/N +WOL_DISABLE=Y + +# Enable audio power saving for Intel HDA, AC97 devices (timeout in secs). +# A value of 0 disables / >=1 enables power save. +SOUND_POWER_SAVE_ON_AC=0 +SOUND_POWER_SAVE_ON_BAT=1 + +# Disable controller too (HDA only): Y/N +SOUND_POWER_SAVE_CONTROLLER=Y + +# Set to 1 to power off optical drive in UltraBay (ThinkPads only) +# when running on battery. A value of 0 disables this Feature (Default). +# Drive can be powered on again by releasing (and reinserting) the +# eject lever or by pressing the disc eject button on newer models. +# Note: an UltraBay hard disk is never powered off. +BAY_POWEROFF_ON_BAT=0 +# Optical drive device to power off (default sr0) +BAY_DEVICE="sr0" + +# Runtime Power Management for pci(e) bus devices +# (Kernel >= 2.6.35 only): on=disable/auto=enable +RUNTIME_PM_ON_AC=on +RUNTIME_PM_ON_BAT=auto + +# Runtime PM for *all* pci(e) bus devices, expect backlisted ones: +# 0=disable / 1=enable +# Warning: experimental option, could cause system instabilities +RUNTIME_PM_ALL=0 + +# Exclude pci(e) device adresses the following list from Runtime PM +# (separate with spaces). Use lspci to get the adresses (1st column). +#RUNTIME_PM_BLACKLIST="bb:dd.f 11:22.3 44:55.6" + +# Set to 0 to disable/1 to enable usb autosuspend feature +USB_AUTOSUSPEND=1 + +# Devices from the following list are excluded from usb autosuspend +# (separate with spaces). Use lsusb to get the ids. +# Note: input devices (usbhid) are excluded automatically +#USB_BLACKLIST="1111:2222 3333:4444" + +# WWAN devices are excluded from usb autosuspend: +# 0=do not exclude / 1=exclude +# Note: works for ids 05c6:* 0bdb:* 1199:* only +USB_BLACKLIST_WWAN=1 + +# Set to 1 to disable autosuspend before shutdown/0 to do nothing +# (workaround for usb devices that cause shutdown problems) +#USB_AUTOSUSPEND_DISABLE_ON_SHUTDOWN=1 + +# Restore radio device state (bluetooth, wifi, wwan) from previous shutdown +# on system startup: 0=disable/1=enable +# Hint: the parameters DEVICES_TO_DISABLE/ENABLE_ON_STARTUP/SHUTDOWN below +# are ignored when this is enabled! +RESTORE_DEVICE_STATE_ON_STARTUP=0 + +# Radio devices to disable on startup: bluetooth wifi wwan +#DEVICES_TO_DISABLE_ON_STARTUP="bluetooth wifi wwan" + +# Radio devices to enable on startup: bluetooth wifi wwan +#DEVICES_TO_ENABLE_ON_STARTUP="wifi" + +# Radio devices to disable on shutdown: bluetooth wifi wwan +# (workaround for devices that are blocking shutdown) +#DEVICES_TO_DISABLE_ON_SHUTDOWN="bluetooth wifi wwan" + +# Radio devices to enable on shutdown: bluetooth wifi wwan +# (to prevent other operating systems from missing radios) +#DEVICES_TO_ENABLE_ON_SHUTDOWN="wwan" + +# Radio devices to enable when wireless radio switch is turned on: +# bluetooth wifi wwan (Ubuntu + ThinkPad only) +#DEVICES_TO_ENABLE_ON_RADIOSW="wifi wwan" + +# Battery charge thresholds (ThinkPad only, tp-smapi or acpi-call kernel module required) +# Charging starts when the remaining capacity falls below the START_CHARGE_TRESH +# value and stops when exceeding the STOP_CHARGE_TRESH value. +# Main battery (values in %) +#START_CHARGE_THRESH_BAT0=75 +#STOP_CHARGE_THRESH_BAT0=80 +# Ultrabay or slice battery (values in %) +#START_CHARGE_THRESH_BAT1=75 +#STOP_CHARGE_THRESH_BAT1=80 + +# Set to 1 to disable use of tpacpi-bat on Sandy Bridge or newer Thinkpads +# and force usage of tp-smapi instead +#DISABLE_TPACPIBAT=1 + +# ------------------------------------------------------------------------------ +# tlp-rdw - Parameters for the radio device wizard +# Possible devices: bluetooth/wifi/wwan + +# Hint: parameters are disabled by default, remove the leading # to enable them + +# Radio devices to disable on connect +#DEVICES_TO_DISABLE_ON_LAN_CONNECT="wifi wwan" +#DEVICES_TO_DISABLE_ON_WIFI_CONNECT="wwan" +#DEVICES_TO_DISABLE_ON_WWAN_CONNECT="wifi" + +# Radio devices to enable on disconnect +#DEVICES_TO_ENABLE_ON_LAN_DISCONNECT="wifi wwan" +#DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT="" +#DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT="" + +# Radio devices to enable/disable when docked +#DEVICES_TO_ENABLE_ON_DOCK="" +#DEVICES_TO_DISABLE_ON_DOCK="" + +# Radio devices to enable/disable when undocked +#DEVICES_TO_ENABLE_ON_UNDOCK="wifi" +#DEVICES_TO_DISABLE_ON_UNDOCK="" + diff --git a/oem/starlabs-oem-xfce/live-overlay/etc/fstab b/oem/starlabs-oem-xfce/live-overlay/etc/fstab new file mode 100644 index 0000000..0df0cba --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/etc/fstab @@ -0,0 +1,5 @@ +# +# /etc/fstab: static file system information +# +# +/dev/mapper/root-image / auto defaults 0 0 diff --git a/oem/starlabs-oem-xfce/live-overlay/etc/issue b/oem/starlabs-oem-xfce/live-overlay/etc/issue new file mode 100644 index 0000000..75720d4 --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/etc/issue @@ -0,0 +1,13 @@ + +Manjaro Live ISO (\l) - \s-\r \m + + + + # Welcome to Manjaro # + + + login for the live environment: + user 'manjaro' + password 'manjaro' + + diff --git a/oem/starlabs-oem-xfce/live-overlay/etc/pam.d/su b/oem/starlabs-oem-xfce/live-overlay/etc/pam.d/su new file mode 100644 index 0000000..a291042 --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/etc/pam.d/su @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth sufficient pam_wheel.so trust use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/autostart/calamares.desktop b/oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/autostart/calamares.desktop new file mode 100755 index 0000000..40b4464 --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/autostart/calamares.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Install Manjaro Linux +GenericName=Live Installer +Comment=Install the operating system to disk +Comment[de]=Manjaro Linux installieren +X-GNOME-Autostart-enabled=true +Exec=kstart5 --fullscreen calamares_polkit +Icon=calamares +Terminal=false +StartupNotify=true +Type=Application +Categories=Qt;System; diff --git a/oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/autostart/manjaro-hello.desktop b/oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/autostart/manjaro-hello.desktop new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/autostart/manjaro-hello.desktop @@ -0,0 +1 @@ + diff --git a/oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop b/oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop new file mode 100644 index 0000000..014d3ea --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/autostart/no-lock-screen.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Deactive lock screen +Comment=Deactive the gnome lock screen in the live session +Type=Application +Icon=nautilus +Exec=sh -c "gsettings set org.gnome.desktop.screensaver lock-enabled false" + diff --git a/oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/manjaro/manjaro-settings-manager.conf b/oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/manjaro/manjaro-settings-manager.conf new file mode 100644 index 0000000..0e4675d --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/etc/skel/.config/manjaro/manjaro-settings-manager.conf @@ -0,0 +1,7 @@ +[notifications] +checkLanguagePackages=false +checkNewKernel=false +checkNewKernelLts=false +checkNewKernelRecommended=false +checkUnsupportedKernel=false +checkUnsupportedKernelRunning=false diff --git a/oem/starlabs-oem-xfce/live-overlay/etc/sudoers.d/g_wheel b/oem/starlabs-oem-xfce/live-overlay/etc/sudoers.d/g_wheel new file mode 100644 index 0000000..8c45359 --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/etc/sudoers.d/g_wheel @@ -0,0 +1 @@ +%wheel ALL=(ALL) NOPASSWD: ALL diff --git a/oem/starlabs-oem-xfce/live-overlay/root/.config/Kvantum/kvantum.kvconfig b/oem/starlabs-oem-xfce/live-overlay/root/.config/Kvantum/kvantum.kvconfig new file mode 100644 index 0000000..c470e30 --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/root/.config/Kvantum/kvantum.kvconfig @@ -0,0 +1,2 @@ +[General] +theme=Matchama diff --git a/oem/starlabs-oem-xfce/live-overlay/root/.config/qt5ct/qt5ct.conf b/oem/starlabs-oem-xfce/live-overlay/root/.config/qt5ct/qt5ct.conf new file mode 100644 index 0000000..372a44a --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/root/.config/qt5ct/qt5ct.conf @@ -0,0 +1,24 @@ +[Appearance] +color_scheme_path= +custom_palette=false +icon_theme=Papirus-Adapta-Maia +style=kvantum + +[Fonts] +fixed=@Variant(\0\0\0@\0\0\0\x12\0\x43\0\x61\0n\0t\0\x61\0r\0\x65\0l\0l@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) +general=@Variant(\0\0\0@\0\0\0\x12\0\x43\0\x61\0n\0t\0\x61\0r\0\x65\0l\0l@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) + +[Interface] +activate_item_on_single_click=1 +buttonbox_layout=0 +cursor_flash_time=1000 +dialog_buttons_have_icons=1 +double_click_interval=400 +gui_effects=@Invalid() +menus_have_icons=true +stylesheets=@Invalid() +toolbutton_style=4 +wheel_scroll_lines=3 + +[SettingsWindow] +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\x1\x9a\0\0\0\x80\0\0\x3\xd6\0\0\x2\xff\0\0\x1\x9a\0\0\0\xa2\0\0\x3\xd6\0\0\x2\xff\0\0\0\0\0\0\0\0\x5V) diff --git a/oem/starlabs-oem-xfce/live-overlay/usr b/oem/starlabs-oem-xfce/live-overlay/usr new file mode 120000 index 0000000..8aca2d5 --- /dev/null +++ b/oem/starlabs-oem-xfce/live-overlay/usr @@ -0,0 +1 @@ +../../../shared/oem/live-overlay/usr \ No newline at end of file diff --git a/oem/starlabs-oem-xfce/profile.conf b/oem/starlabs-oem-xfce/profile.conf new file mode 100644 index 0000000..e74680d --- /dev/null +++ b/oem/starlabs-oem-xfce/profile.conf @@ -0,0 +1,77 @@ +########################################## +###### use this file in the profile ###### +########################################## + +# use multilib packages; x86_64 only +# multilib="true" + +displaymanager="lightdm" + +# Set to false to disable autologin in the livecd +# autologin="true" + +# nonfree mhwd drivers +# nonfree_mhwd="true" + +# use extra packages as defined in pkglist to activate a full profile +#extra="true" + +################ install ################ + +# unset defaults to given value +# efi_boot_loader="grub" + +# configure calamares for netinstall +# netinstall="false" + +# configure calamares to use chrootcfg instead of unpackfs +# chrootcfg="false" + +# use geoip for localization +# geoip='true' + +# configure calamares for mhwd +mhwd_used="false" + +# configure calamares for oem +oem_used="true" + +windowexp=fullscreen + +# unset defaults to given values +# names must match systemd service names +enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'fstrim.timer' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd') +disable_systemd=('pacman-init') + +# add strict snaps: strict_snaps="snapd core core18 gnome-3-28-1804 gtk-common-themes snap-store" +# strict_snaps="" +# add classic snaps: classic_snaps="code" +# classic_snaps="" +# choose the snap channel. Possible options are: stable, candidate, beta, edge +# snap_channel="candidate" + +# the same workgroup name if samba is used +# smb_workgroup="" + +################# livecd ################# + +# unset defaults to given value +# hostname="manjaro" + +# unset defaults to given value +# username="manjaro" + +# unset defaults to given value +# password="manjaro" + +# the login shell +# defaults to bash +# login_shell=/bin/bash + +# unset defaults to given values +# addgroups="lp,network,power,wheel" + +# unset defaults to given values +# names must match systemd service names +# services in enable_systemd array don't need to be listed here +enable_systemd_live=('manjaro-live' 'pacman-init' 'mirrors-live') From 49ce1c2e38edaffd0cf3162dd517c0eaea432c31 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Wed, 8 Apr 2020 18:38:49 +0200 Subject: [PATCH 10/16] [starlabs kde, xfce] add gnome-firmware --- oem/starlabs-oem-kde/Packages-Desktop | 1 + oem/starlabs-oem-xfce/Packages-Desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/oem/starlabs-oem-kde/Packages-Desktop b/oem/starlabs-oem-kde/Packages-Desktop index cfca69a..22a318a 100644 --- a/oem/starlabs-oem-kde/Packages-Desktop +++ b/oem/starlabs-oem-kde/Packages-Desktop @@ -308,6 +308,7 @@ xdg-utils xdg-su >extra timeshift >extra kernel-alive +gnome-firmware ## Misc manjaro-hotfixes diff --git a/oem/starlabs-oem-xfce/Packages-Desktop b/oem/starlabs-oem-xfce/Packages-Desktop index 9092584..3a4f42a 100644 --- a/oem/starlabs-oem-xfce/Packages-Desktop +++ b/oem/starlabs-oem-xfce/Packages-Desktop @@ -258,6 +258,7 @@ xdg-utils xdg-su >extra timeshift >extra kernel-alive +gnome-firmware ## Misc gtkhash-thunar From 374e5b502f529142344d6059bb699e4008108804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Fri, 10 Apr 2020 19:54:07 +0200 Subject: [PATCH 11/16] [prepare] 20.0-rc1 --- diff | 178 ------------------------------------------- shared/Packages-Live | 2 +- 2 files changed, 1 insertion(+), 179 deletions(-) delete mode 100644 diff diff --git a/diff b/diff deleted file mode 100644 index f5d724b..0000000 --- a/diff +++ /dev/null @@ -1,178 +0,0 @@ -diff -rupN manjaro/gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop oem/starlite-oem-gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop ---- manjaro/gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop 1970-01-01 01:00:00.000000000 +0100 -+++ oem/starlite-oem-gnome/live-overlay/etc/skel/.config/autostart/calamares.desktop 2020-01-06 20:00:26.000000000 +0100 -@@ -0,0 +1,14 @@ -+[Desktop Entry] -+Type=Application -+Version=1.0 -+Name=Install Manjaro Linux -+GenericName=Live Installer -+Comment=Install the operating system to disk -+Comment[de]=Manjaro Linux installieren -+X-GNOME-Autostart-enabled=true -+Exec=kstart5 --fullscreen calamares_polkit -+Icon=calamares -+Terminal=false -+StartupNotify=true -+Type=Application -+Categories=Qt;System; -diff -rupN manjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/branding.desc oem/starlite-oem-gnome/live-overlay/usr/share/calamares/branding/manjaro/branding.desc ---- manjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/branding.desc 1970-01-01 01:00:00.000000000 +0100 -+++ oem/starlite-oem-gnome/live-overlay/usr/share/calamares/branding/manjaro/branding.desc 2020-04-06 12:50:05.018055214 +0200 -@@ -0,0 +1,23 @@ -+--- -+componentName: manjaro -+ -+strings: -+ productName: Manjaro Linux -+ shortProductName: Manjaro -+ version: 19.0.2 OEM -+ shortVersion: 19.0.2 OEM -+ versionedName: Manjaro Linux 19.0.2 "Kyria" OEM -+ shortVersionedName: Manjaro 19.0.2 OEM -+ bootloaderEntryName: Manjaro -+ -+images: -+ productLogo: "logo.png" -+ productIcon: "logo.png" -+ productWelcome: "languages.png" -+ -+slideshow: "show.qml" -+ -+style: -+ sidebarBackground: "#454948" -+ sidebarText: "#efefef" -+ sidebarTextSelect: "#9E4F5D" -diff -rupN manjaro/gnome/Packages-Desktop oem/starlite-oem-gnome/Packages-Desktop ---- manjaro/gnome/Packages-Desktop 2020-04-07 22:28:02.611539427 +0200 -+++ oem/starlite-oem-gnome/Packages-Desktop 2020-04-07 22:28:02.611539427 +0200 -@@ -187,3 +188,8 @@ xorg-xinit - - >basic lighter-gnome - >basic disable-tracker -+ -+## OEM -+calamares-git -+calamares-oem-modules -+calamares-oem-starlite-gnome-settings -diff -rupN manjaro/gnome/Packages-Live oem/starlite-oem-gnome/Packages-Live ---- manjaro/gnome/Packages-Live 2020-04-08 09:38:11.053630984 +0200 -+++ oem/starlite-oem-gnome/Packages-Live 2020-04-04 11:22:15.000000000 +0200 -@@ -1,9 +1,5 @@ --calamares-git - grub-theme-live-manjaro --gsmartcontrol --manjaro-architect - manjaro-live-skel - manjaro-live-systemd - mkinitcpio-nfs-utils - nbd --clonezilla -diff -rupN manjaro/gnome/Packages-Mhwd oem/starlite-oem-gnome/Packages-Mhwd ---- manjaro/gnome/Packages-Mhwd 2020-04-04 11:22:15.645595953 +0200 -+++ oem/starlite-oem-gnome/Packages-Mhwd 1970-01-01 01:00:00.000000000 +0100 -@@ -1,63 +0,0 @@ --## The following is only temp for 18.1-rc7 -->extra libreoffice-still -->extra freeoffice -- --## Normal MHWD package list -- --KERNEL-bbswitch --KERNEL-broadcom-wl --#KERNEL-r8168 --#KERNEL-zfs --zfs-utils --#KERNEL-rt3562sta --KERNEL-virtualbox-guest-modules --KERNEL-headers --zfs-dkms --libva-intel-driver --libva-mesa-driver --libva-vdpau-driver -->multilib lib32-libva-vdpau-driver --libxaw --libxpm --libxvmc --mesa-vdpau -->multilib lib32-mesa-vdpau -->multilib lib32-libxvmc -->multilib lib32-primus --#>nonfree_default catalyst-utils --#>nonfree_default KERNEL-catalyst --#>nonfree_default KERNEL-nvidia-340xx -->nonfree_default KERNEL-nvidia-390xx -->nonfree_x86_64 KERNEL-nvidia-440xx -->nonfree_default nvidia-340xx-utils -->nonfree_default nvidia-390xx-utils -->nonfree_x86_64 nvidia-440xx-utils --#>nonfree_multilib lib32-catalyst-utils -->nonfree_multilib lib32-nvidia-440xx-utils --#>nonfree_multilib lib32-nvidia-340xx-utils -->nonfree_multilib lib32-nvidia-390xx-utils --opencl-mesa --open-vm-tools --pangox-compat --primus --bumblebee --nvidia-prime --gtkmm3 --spice-vdagent --virtualbox-guest-utils --vulkan-radeon -->multilib lib32-vulkan-radeon --vulkan-intel -->multilib lib32-vulkan-intel --xf86-input-vmmouse --xf86-video-amdgpu --xf86-video-ati --xf86-video-dummy --xf86-video-fbdev --xf86-video-intel --xf86-video-nouveau --xf86-video-openchrome --xf86-video-sisusb --xf86-video-vesa --xf86-video-vmware --xf86-video-voodoo -diff -rupN manjaro/gnome/profile.conf oem/starlite-oem-gnome/profile.conf ---- manjaro/gnome/profile.conf 2020-04-05 16:30:12.251311211 +0200 -+++ oem/starlite-oem-gnome/profile.conf 2020-04-06 12:58:01.865141618 +0200 -@@ -32,17 +32,19 @@ displaymanager="gdm" - # use geoip - # geoip="true" - -+# configure calamares for mhwd -+mhwd_used="false" -+ -+# configure calamares for oem -+oem_used="true" -+ -+windowexp=fullscreen -+ - # unset defaults to given values - # names must match systemd service names --enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'avahi-demon' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd') --#enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-demon' 'haveged' 'ufw') -+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'fstrim.timer' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd') - disable_systemd=('pacman-init') - --# unset defaults to given values, --# names must match openrc service names --# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') --# disable_openrc=() -- - # unset defaults to given values - # addgroups="lp,network,power,wheel" - -@@ -74,9 +76,4 @@ login_shell=/usr/bin/zsh - # unset defaults to given values - # names must match systemd service names - # services in enable_systemd array don't need to be listed here --# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live') -- --# unset defaults to given values, --# names must match openrc service names --# services in enable_openrc array don't need to be listed here --# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live') -+enable_systemd_live=('manjaro-live' 'pacman-init' 'mirrors-live') diff --git a/shared/Packages-Live b/shared/Packages-Live index ee15e0d..138c6a0 100644 --- a/shared/Packages-Live +++ b/shared/Packages-Live @@ -1,4 +1,4 @@ -calamares-git +calamares grub-theme-live-manjaro gsmartcontrol manjaro-architect From aab8aca7a1749f4cc2c61f9f33a17d84f29067df Mon Sep 17 00:00:00 2001 From: Matti Hyttinen Date: Sun, 12 Apr 2020 13:07:09 +0200 Subject: [PATCH 12/16] Update Packages-Desktop --- manjaro/gnome/Packages-Desktop | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index c622c18..ced7ac0 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -71,6 +71,7 @@ inxi #cli tool# pacui mc +manjaro-ranger-settings bmenu ######## manjaro-alsa @@ -168,9 +169,9 @@ xorg-xinit >extra geary >extra gnome-calendar >extra lollypop ->extra empathy ->extra telepathy ->extra uget +#>extra empathy +#>extra telepathy +#>extra uget >extra transmission-gtk >extra manjaro-documentation-en #>extra jre8-openjdk From 68c8ef1f4fbd8a9d4e2624bac6b2370ac0c9b272 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Mon, 13 Apr 2020 09:10:24 +0300 Subject: [PATCH 13/16] Add deja-dub --- manjaro/gnome/Packages-Desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index ced7ac0..d7d2592 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -182,6 +182,7 @@ xorg-xinit >extra simple-scan >extra ffmpegthumbnailer >extra timeshift +>extra deja-dub >extra kernel-alive >extra gnome-shell-extension-gsconnect >extra manjaro-aur-support #introduce for testing in community From 109cbb0db9e9b3d421c2c8ce77ba4e5bbca7974c Mon Sep 17 00:00:00 2001 From: Matti Hyttinen Date: Sun, 19 Apr 2020 13:51:13 +0200 Subject: [PATCH 14/16] Update Packages-Desktop --- manjaro/gnome/Packages-Desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index d7d2592..ec0ce81 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -182,7 +182,7 @@ xorg-xinit >extra simple-scan >extra ffmpegthumbnailer >extra timeshift ->extra deja-dub +>extra deja-dup >extra kernel-alive >extra gnome-shell-extension-gsconnect >extra manjaro-aur-support #introduce for testing in community From f384d086871f7089a6bf05934dbd53d1521f1d4d Mon Sep 17 00:00:00 2001 From: Matti Hyttinen Date: Sun, 19 Apr 2020 19:33:14 +0200 Subject: [PATCH 15/16] Update Packages-Mhwd --- shared/Packages-Mhwd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd index 96ef955..bdf18ed 100644 --- a/shared/Packages-Mhwd +++ b/shared/Packages-Mhwd @@ -7,7 +7,7 @@ KERNEL-bbswitch KERNEL-broadcom-wl #KERNEL-r8168 -#KERNEL-zfs +KERNEL-zfs zfs-utils #KERNEL-rt3562sta KERNEL-virtualbox-guest-modules From ccdf1e58c950e72264471de24a8d06d617330538 Mon Sep 17 00:00:00 2001 From: Matti Hyttinen Date: Tue, 21 Apr 2020 20:01:48 +0200 Subject: [PATCH 16/16] Update Packages-Desktop --- manjaro/gnome/Packages-Desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index ec0ce81..f1ab49a 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -46,6 +46,7 @@ gnome-wallpapers gparted papirus-maia-icon-theme >extra gnome-calendar +>extra evolution-data-server >extra gnome-characters >extra gnome-clocks >extra gnome-weather