From b517a86dbee3283ac09df81ed24e2a86dcab1ca8 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Thu, 3 May 2018 13:59:43 +0200
Subject: [PATCH] fix

---
 arch-graphical-install-auto |  2 +-
 arch-install                |  2 +-
 packages_manjaro.txt        | 11 ++++++-----
 pacman.conf_manjaro         | 33 +++++++++++++++------------------
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index 7d41d3e..156fa35 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -713,7 +713,7 @@ pacman -Syu --needed --noconfirm
 if [ "${version}" == "libre" ]; then
     mkinitcpio -p linux-libre
 else
-    mkinitcpio -p linux -c /etc/mkinitcpio.conf
+    mkinitcpio -P -c /etc/mkinitcpio.conf
 fi
 
 echo "Fertig!!!"
diff --git a/arch-install b/arch-install
index 3c76832..1fceaa4 100755
--- a/arch-install
+++ b/arch-install
@@ -1060,7 +1060,7 @@ then
     if [ "${version}" == "libre" ]; then
         arch-chroot ${mountpoint} mkinitcpio -p linux-libre
     else
-        arch-chroot ${mountpoint} mkinitcpio -p linux -c /etc/mkinitcpio.conf
+        arch-chroot ${mountpoint} mkinitcpio -P -c /etc/mkinitcpio.conf
         #arch-chroot ${mountpoint} mkinitcpio -p linux-lts -c /etc/mkinitcpio-lts.conf
     fi
     echo ""
diff --git a/packages_manjaro.txt b/packages_manjaro.txt
index a726fb2..d387e65 100644
--- a/packages_manjaro.txt
+++ b/packages_manjaro.txt
@@ -43,13 +43,8 @@ fish
 freeciv
 gdisk
 git
-gnome
 gnome-calculator
-gnome-extra
-gnome-flashback
 gnome-keyring
-gnome-power-manager
-gnome-screensaver
 gnuchess
 gnupg
 gparted
@@ -141,6 +136,12 @@ wpa_supplicant
 x11vnc
 xdg-utils
 xf86-input-synaptics
+xfce4
+xfce4-goodies
+xfce4-power-manager
+xfce4-pulseaudio-plugin
+xfce4-sensors-plugin
+xfce4-xkb-plugin
 xorg
 xorg-drivers
 xorg-server
diff --git a/pacman.conf_manjaro b/pacman.conf_manjaro
index f725931..319d018 100644
--- a/pacman.conf_manjaro
+++ b/pacman.conf_manjaro
@@ -11,15 +11,15 @@
 # If you wish to use different paths, uncomment and update the paths.
 #RootDir     = /
 #DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
+CacheDir = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -4 -v -C - -f %u > %o
-#XferCommand = /usr/bin/wget -4 --passive-ftp -c -t 0 -O %o %u
-#XferCommand = /usr/bin/snarf -N %u
-#XferCommand = /usr/bin/aria2c --allow-overwrite=true --continue=true --file-allocation=none --log-level=error --max-tries=2 --max-connection-per-server=2 --max-file-not-found=5 --min-split-size=5M --no-conf --remote-time=true --summary-interval=60 --timeout=5 --dir=/ --out %o %u
+HoldPkg      = pacman glibc manjaro-system
+# If upgrades are available for these packages they will be asked for first
+SyncFirst    = manjaro-system archlinux-keyring manjaro-keyring
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 #UseDelta    = 0.7
 Architecture = auto
@@ -33,8 +33,9 @@ Architecture = auto
 
 # Misc options
 #UseSyslog
-Color
+#Color
 #TotalDownload
+# We cannot check disk space from within a chroot environment
 CheckSpace
 #VerbosePkgLists
 
@@ -45,8 +46,8 @@ LocalFileSigLevel = Optional
 RemoteFileSigLevel = Never
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
+# keyring can then be populated with the keys of all official Manjaro Linux
+# packagers with `pacman-key --populate archlinux manjaro`.
 
 #
 # REPOSITORIES
@@ -71,28 +72,23 @@ RemoteFileSigLevel = Never
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
 [core]
+#SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist_manjaro
 
 [extra]
+#SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist_manjaro
 
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
 [community]
+#SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist_manjaro
 
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the multilib repositories as required here.
 
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
 [multilib]
+#SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist_manjaro
 
 # An example of a custom package repository.  See the pacman manpage for
@@ -100,3 +96,4 @@ Include = /etc/pacman.d/mirrorlist_manjaro
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+