From a2e5fb4401371d7ff6184625a1a65eab478eed7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Mon, 30 Nov 2020 11:18:01 +0100
Subject: [PATCH] [pm] use plymouth-shim

---
 editions/plasma-mobile         |  1 +
 editions/plasma-mobile-dev     |  1 +
 overlays/phosh/etc/pacman.conf | 84 ----------------------------------
 services/plasma-mobile         |  1 +
 services/plasma-mobile-dev     |  1 +
 5 files changed, 4 insertions(+), 84 deletions(-)
 delete mode 100644 overlays/phosh/etc/pacman.conf

diff --git a/editions/plasma-mobile b/editions/plasma-mobile
index 369cacb6..16f632c6 100644
--- a/editions/plasma-mobile
+++ b/editions/plasma-mobile
@@ -56,6 +56,7 @@ plasma-phone-components
 plasma-phonebook
 #plasma-pix
 plasma-settings
+plymouth-shim
 qmlkonsole
 spacebar
 telepathy-mission-control
diff --git a/editions/plasma-mobile-dev b/editions/plasma-mobile-dev
index 65e16e87..956e4def 100644
--- a/editions/plasma-mobile-dev
+++ b/editions/plasma-mobile-dev
@@ -56,6 +56,7 @@ plasma-phone-components-git
 plasma-phonebook-git
 #plasma-pix-git
 plasma-settings-git
+plymouth-shim
 qmlkonsole-git
 spacebar-git
 telepathy-mission-control
diff --git a/overlays/phosh/etc/pacman.conf b/overlays/phosh/etc/pacman.conf
deleted file mode 100644
index 41b56d6b..00000000
--- a/overlays/phosh/etc/pacman.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg      = pacman glibc manjaro-system
-# If upgrades are available for these packages they will be asked for first
-SyncFirst    = manjaro-system manjaro-keyring manjaro-arm-keyring archlinux-keyring archlinuxarm-keyring
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = aarch64
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-#TotalDownload
-CheckSpace
-#VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Manjaro Linux
-# packagers with `pacman-key --populate archlinuxarm manjaro-arm`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-[mobile]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
diff --git a/services/plasma-mobile b/services/plasma-mobile
index 7ada716f..81151214 100644
--- a/services/plasma-mobile
+++ b/services/plasma-mobile
@@ -7,6 +7,7 @@ tlp.service
 zswap-arm.service
 bootsplash-hide-when-booted.service
 bootsplash-show-on-shutdown.service
+plymouth-shim.service
 >pinephone pinephone-post-install.service
 >pinephone ofono.service
 >pinephone ofonoctl.service
diff --git a/services/plasma-mobile-dev b/services/plasma-mobile-dev
index 7ada716f..81151214 100644
--- a/services/plasma-mobile-dev
+++ b/services/plasma-mobile-dev
@@ -7,6 +7,7 @@ tlp.service
 zswap-arm.service
 bootsplash-hide-when-booted.service
 bootsplash-show-on-shutdown.service
+plymouth-shim.service
 >pinephone pinephone-post-install.service
 >pinephone ofono.service
 >pinephone ofonoctl.service
-- 
GitLab