Merge branch 'all-editions' of https://github.com/JPyke3/mbp-manjaro into all-editions

README.md

@@ -1,4 +1,4 @@
-# mbp-manjaro
+# Manjaro for T2 MacBooks
 
 This repository contains the build scripts for compiling isos using the mbp-manjaro-kernel. With these iso files you can run Manjaro on 2018+ Macbook models with the T2 Chip.
 
@@ -8,25 +8,11 @@ Extra Modules: https://github.com/JPyke3/extramodules-mbp-manjaro
 
 Repository: https://jacobpyke.xyz/archlinux/
 
-**NOTE: The old repository was on port 8080, this is no longer how I want to move forward and this repo will soon be taken down and off this port. The repo will remain up until the 31st of july, this should give people enough time to switch to the new repo.**
-
-In order to switch to the new repository run this in a terminal:
-```
-sudo sed -i 's/http:\/\/jacobpyke.xyz:8080/https:\/\/jacobpyke.xyz/' /etc/pacman.conf
-```
-
-All Drivers/Patches Featured:
-
-* Keyboard, Trackpad, Audio and Suspend: https://github.com/MCMrARM/mbp2018-bridge-drv
-* Arch Linux Kernel Patches: https://github.com/aunali1/linux-mbp-arch
-* DKMS Module for loading Patches: https://github.com/aunali1/apple-bce-arch
-
 ## Releases
 
-[Download the latest releases here](https://drive.google.com/drive/folders/16BK16Ig2BX3MzktFFPaX04-B2PTAhd8R?usp=sharing)
+### [Download the latest releases here](https://drive.google.com/drive/folders/16BK16Ig2BX3MzktFFPaX04-B2PTAhd8R?usp=sharing)
 
 ## Installation Proccess
-Flash your iso to a USB Stick, If you want a easy way to do this. Use [Balena Etcher](https://www.balena.io/etcher/). For a more command line way of doing this, use dd.
 
 #### Hardware requirements: 
 * USB-C to ethernet cable adapter.
@@ -35,7 +21,7 @@ Flash your iso to a USB Stick, If you want a easy way to do this. Use [Balena Et
 
 ### Steps
 1. Partition your drive in MacOS ready for a linux install. You can either use Disk Utility or use Bootcamp, important thing is, is that you have two partitions (Your MacOS partition and your new linux one) (It isn't recommended that you totally delete MacOS as firmware updates are applied through it).
-2. Take ISO and flash to a USB stick
+2. Flash your iso to a USB Stick, If you want a easy way to do this. Use [Balena Etcher](https://www.balena.io/etcher/). For a more command line way of doing this, use dd.
 3. Disable MacOS secure boot. [Apple's Documentation](https://support.apple.com/en-au/HT208330)
 
    a. Turn on your Mac, then press and hold Command (⌘)-R immediately after you see the Apple logo to start up from macOS Recovery.  
@@ -48,86 +34,79 @@ Flash your iso to a USB Stick, If you want a easy way to do this. Use [Balena Et
   
    e. Reboot your Mac.
   
-4. Hold the option key whilst booting. 
+4. Once Secure boot is diabled, fully shutdown your Computer and Power it on again whilst holding the Option (⌥) key.
 5. Select the yellow EFI System using the arrow keys and hit enter.
-5. When the USB menu first appears, use your arrows to go to the blank option below Boot and type in the following (Keep in mind you cannot use backspace here):
+6. Scroll down to `Boot x86 64 {Your Edition}` using the arrow keys and press enter.
+7. After booting into Manjaro, open a terminal window and run this command:
 ```
-efi=noruntime
+systemctl start systemd-timesyncd.service
 ```
-6. Hit enter scroll to boot and boot Manjaro.
-7. After booting into Manjaro, set the system time using the Manjaro settings
 8. Open the installer and proceed normally until you hit the partitioning stage
 9. Click Manual Partitioning
-10. Click on /dev/nvme0n1p1 then click edit at the bottom of the install window theen change the Change the Mount Point: /boot, after that click okay.
-11. Usually, the MacOS partition is mounted to /dev/nvme0n1p2, ignore this partition
-13. Delete your Linux partition on /dev/nvme0n1p3.
-14. Create a 51200 MiB partition with ext4 as the file system. Change the mount point to / and click okay.
-15. Use the remaining disk space to create an ext4 file system. Change the mount point to /home
-16. Click Next, on the next screen a warning will appear about EFI System Partition Configuration. Just ignore it and click okay.
-17. Continue the rest of the setup as normal. Once the installer has finished do not restart the system. 
-18. Open a terminal, and type: 
+10. Click on `/dev/nvme0n1p1` then press edit at the bottom of the install window, change the Change the Mount Point: `/boot`, after that click okay.
+11. Usually, the MacOS partition is mounted to `/dev/nvme0n1p2` (Double check this, the Installer should recognize this partition as an `Apple APFS` Partition). Ignore the MacOS partition.
+12. Delete the partition you created before, this is usually mounted to `/dev/nvme0n1p3`.
+13. These next steps involve partitioning the `/`(Root) and `/home`(Home) partitions of your Linux filesystem, if you know what you are doing feel free to skip to the next step (15).
+
+  - Create a `51200 MiB` partition with `ext4` as the file system. Change the mount point to `/` and click okay.
+  - Use the remaining disk space to create an `ext4` file system. Change the mount point to `/home`.
+    
+14. Click Next, on the next screen a warning will appear about EFI System Partition Configuration. Just ignore it and click okay.
+15. Continue the rest of the setup as normal. Once the installer has finished do not restart the system. 
+16. Open a terminal, and type: 
 ```
 sudo fdisk -l. 
 ```
 The root password is 'manjaro'
 
-19. Scroll up to the disk named /dev/nvme0n1. Note down the names of the 50G Linux partition and the 300M EFI SYSTEM partition.
+17. Scroll up to the disk named /dev/nvme0n1. Note down the names of the 50G Linux partition and the 300M EFI SYSTEM partition.
 In my case these were mounted at /dev/nvme0n1p1 (EFI System) and /dev/nvme0n1p3 (Linux Filesystem).
-20. Copy this command into a terminal, substitute the two fields in { } with your EFI System and Linux Filesystem names
+18. Copy this command into a terminal, substitute the two fields in { } with your EFI System and Linux Filesystem names
 ```
 sudo mount {Linux Filesystem} /mnt; sudo mount {EFI System} /mnt/boot
 ```
-21. Run this command, take note of the UUID
+19. Run this command, take note of the UUID (Note this command has a space in the grep command `"/ "`, It is there for a reason)
 ```
 cat /mnt/etc/fstab | grep "/ "
 ```
-22. Open a new terminal, and run this command
+20. Open a new terminal, and run this command
 ```
 manjaro-chroot /mnt
 ```
-23. Run this command to install systemd-boot
+21. Run this command to install systemd-boot
 ```
 bootctl --path=/boot --no-variables install 
 ```
-24. and then this one to mask systemd from not touching a EFI var (Causes a kernel panic)
+22. and then this one to mask systemd from not touching a EFI var (Causes a kernel panic)
 ```
 systemctl mask systemd-boot-system-token.service 
 ```
-25. Open the file /boot/loader/entries/manjaro.conf in your favorite text editor (If you are a beginner use the command below)
+23. Open the file /boot/loader/entries/manjaro.conf in your favorite text editor (If you are a beginner use the command below)
 ```
 nano /boot/loader/entries/manjaro.conf
 ```
-26. Paste in the block of text below (Note for beginners to paste into a terminal its usually control + shift + v)
+24. Paste in the block of text below (Note for beginners to paste into a terminal its usually control + shift + v)
 ```
 title   Manjaro Linux
-linux   /vmlinuz-5.6-x86_64-mbp
+linux   /vmlinuz-5.7-x86_64-mbp
 initrd  /intel-ucode.img
-initrd  /initramfs-5.6-x86_64-mbp.img
+initrd  /initramfs-5.7-x86_64-mbp.img
 options root="UUID={change_this_value}" rw
 ```
-27. Change back to your other terminal with the values, And copy the UUID from the other terminal, replacing {change_this_value} (Including the brackets). 
-28. Save the file (Use ctrl+x if you copied my command from above, press the y button and then press enter).
-29. Run the command below:
+25. Change back to your other terminal with the values, And copy the UUID from the other terminal, replacing {change_this_value} (Including the brackets). 
+26. Save the file (Use ctrl+x if you copied my command from above, press the y button and then press enter).
+27. Run the command below:
 ```
 echo -e 'default manjaro.conf\rtimeout 4\rconsole-mode max\reditor no'  > /boot/loader/loader.conf
 ```
-30. Press control + d
-31. Run this command:
+28. Press control + d
+29. Run this command:
 ```
 sudo umount -R /mnt
 ```
 
 Reboot your computer, Remembering to move the USB boot flash drive, and welcome to Manjaro :)
 
-#### Footnote - Touchbar & AUDIO
-
-Small Footnote to the install setup. At this stage I forgot to compile the ISO images with the images to include the touchbar & audio package, this will be fixed upon next release. In the meantime run this on your new system to get your touchbar and audio working:
-
-```
-sudo pacman -S macbook12-spi-driver-dkms audio-fix-mbp
-```
-then reboot.
-
 ## In order to get WiFi working
 1. Boot into OSX and run the following in terminal: `ioreg -l | grep C-4364`
 
@@ -176,6 +155,13 @@ sudo pacman -S wifi-fix-mbp
 systemctl start wifi-fix.service; systemctl enable wifi-fix.service
 ```
 
+## Useful Packages:
+ - `audio-fix-mbp`
+   - Installs files needed for pulseaudio rules
+ - `wifi-fix-mbp`
+   - Usage: `systemctl start wifi-fix.service; systemctl enable wifi-fix.service`
+   - Fixes a bug where the wifi firmware won't load on boot
+
 ## FAQ
 #### Issues Updating Because of the MBP Repository
 When you update the system, you may recieve errors about my key being corrupted, if that occurs open a terminal and run this
@@ -213,16 +199,25 @@ Run this in your terminal:
 sudo bash -c "echo 2 > /sys/class/input/*/device/fnmode"
 ```
 
+#### The Repo doesn't work!
+
+The old repository was on port 8080, this is no longer how I want to move forward and this repo has been taken down and off this port.
+
+In order to switch to the new repository run this in a terminal:
+```
+sudo sed -i 's/http:\/\/jacobpyke.xyz:8080/https:\/\/jacobpyke.xyz/' /etc/pacman.conf
+```
+
 ## Building for yourself
 
-### Option 1: Docker
+### Option 1: Docker - All Linux Distros
 First, you need to ensure that docker isn't using `overlay` or `overlay2` filesystems. This can be verified by running `docker info`. And will be shown next to `Storage Driver`.
 
 In the event that you are running `overlay`, [Look at this docker documentation](https://docs.docker.com/storage/storagedriver/vfs-driver/) on how to switch to VFS.
 
 *Note, this doesn't work on OSX or Windows, I am working closely with the Manjaro Devs on this one.*
 
-**Quick Docker Install Script - Tested on Arch**
+**Quick Docker Install Script - For Linux**
 ```
 sh -c "$(curl -fsSL "https://raw.githubusercontent.com/JPyke3/mbp-manjaro/master/build-in-docker.sh")"
 ```
@@ -262,37 +257,22 @@ Clone the repository to your home directory
 git clone https://github.com/JPyke3/mbp-manjaro ~/iso-profiles
 ```
 run a command corrisponding to your preferred version of Manjaro:
-##### xfce
+
 ```
-buildiso -f -p xfce -k linux56-mbp
+buildiso -f -p {edition} -k linux57-mbp
 ```
-##### GNOME
+
+*Available Options are:*
 ```
-buildiso -f -p gnome -k linux56-mbp
-```
-##### KDE-Plasma
-```
-buildiso -f -p kde -k linux56-mbp
-```
-##### i3wm
-```
-buildiso -f -p i3 -k linux56-mbp
-```
-##### Cinnamon
-```
-buildiso -f -p cinnamon -k linux56-mbp
-```
-##### Budgie
-```
-buildiso -f -p budgie -k linux56-mbp
+architect  gnome  kde nxd  xfce awesome  bspwm-mate  cinnamon  i3    lxqt  openbox  webdad bspwm    budgie      deepin    lxde  mate  ukui
 ```
 
 #### File Locations 
-Navigate to the directory for your iso file. If Using xfce GNOME or KDE go to:
+Navigate to the directory for your iso file. If Using a official edition go to:
 ```
 cd /var/cache/manjaro-tools/iso/manjaro/{NAME_OF_EDITION}/20.0.3/
 ```
-If on i3wm Cinnamon or Budige navigate to:
+If using a community edition to:
 ```
 cd /var/cache/manjaro-tools/iso/community/{NAME_OF_EDITION}/20.0.3/
 ```
@@ -302,15 +282,11 @@ cd /var/cache/manjaro-tools/iso/community/{NAME_OF_EDITION}/20.0.3/
 All TTY's will overscan on these models. This is known and being actively worked on.
 
 ## Notable Resources
-Build Manjaro ISOs with Buildiso: https://wiki.manjaro.org/Build_Manjaro_ISOs_with_buildiso
-
-Apple BCE DKMS Git: https://aur.archlinux.org/packages/apple-bce-dkms-git/
-
-Manjaro Core Packages: https://gitlab.manjaro.org/packages/core
-
-2018+ MBP Discord Server: https://discord.gg/fgDd8Vr
-
-Arch MBP 2018 (Out of Date): https://gist.github.com/TRPB/437f663b545d23cc8a2073253c774be3
+* Build Manjaro ISOs with Buildiso: https://wiki.manjaro.org/Build_Manjaro_ISOs_with_buildiso
+* Apple BCE DKMS Git: https://aur.archlinux.org/packages/apple-bce-dkms-git/
+* Manjaro Core Packages: https://gitlab.manjaro.org/packages/core
+* 2018+ MBP Discord Server: https://discord.gg/fgDd8Vr
+* Arch MBP 2018 (Out of Date): https://gist.github.com/TRPB/437f663b545d23cc8a2073253c774be3
 
 ## Noteworthy Helpers
 * Aunali1 (Arch Linux MBP and DKMS Modules): https://github.com/aunali1
@@ -319,18 +295,12 @@ Arch MBP 2018 (Out of Date): https://gist.github.com/TRPB/437f663b545d23cc8a2073
 * TRPB (Original Arch Linux Guide): https://github.com/TRPB
 * marcosfad (Ubuntu MBP): https://github.com/marcosfad
 
+## Noteworthy GitHub Repo's
+* Keyboard, Trackpad, Audio and Suspend: https://github.com/MCMrARM/mbp2018-bridge-drv
+* Arch Linux Kernel Patches: https://github.com/aunali1/linux-mbp-arch
+* DKMS Module for loading Patches: https://github.com/aunali1/apple-bce-arch
+
 ## Other MBP Distributions
 * Ubuntu: https://github.com/marcosfad/mbp-ubuntu
 * Fedora: https://github.com/mikeeq/mbp-fedora
 * Arch: https://github.com/aunali1/linux-mbp-arch
-
-## TODO
-- [ ] Fix KDE and Budgie Versions
-- [ ] Automate WiFi Installation
-- [ ] Test Installer on Every Edition
-  - [x] xfce
-  - [x] GNOME
-  - [ ] KDE-Plasma
-  - [x] Cinnamon
-  - [ ] Budige
-

Scripts/build-all-in-docker.sh

@@ -1,9 +1,7 @@
-#!/bin/bash
+# Maintainer: github.com/JPyke3 <Jacob Pyke, pyke.jacob1@gmail.com>
+# build-in-docker.sh
 
-# docker run --privileged  --mount type=bind,source="$HOME"/manjaro-mbp-iso,target=/root/out \
-#          -v ~/tmp/buildiso:/var/lib/manjaro-tools/buildiso --env KERNEL=linux57-mbp\
-#          --env EDITION=gnome\
-#          jpyke3/mbp-manjaro-buildiso
+#!/bin/bash
 
 for f in ../manjaro/*; do
     if [ -d "$f" ]; then
@@ -11,7 +9,7 @@ for f in ../manjaro/*; do
         # Make out directory
         mkdir -p ~/mbp-manjaro/out/"$e"
         # Run the container
-        docker run --privileged -v $PWD/../:/root/iso-profiles -v ~/mbp-manjaro/out/"$e":/root/out --env KERNEL=linux57-mbp --env EDITION="$e" jpyke3/mbp-manjaro-buildiso:dev
+        docker run --privileged -v $PWD/../:/root/iso-profiles -v ~/mbp-manjaro/out/"$e":/root/out --env KERNEL=linux57-mbp --env EDITION="$e" jpyke3/mbp-manjaro-buildiso
         # Clean docker system
         docker system prune -f
     fi
@@ -23,7 +21,7 @@ for f in ../community/*; do
         # Make out directory
         mkdir -p ~/mbp-manjaro/out/"$e"
         # Run the container
-        docker run --privileged -v $PWD/../:/root/iso-profiles -v ~/mbp-manjaro/out/"$e":/root/out --env KERNEL=linux57-mbp --env EDITION="$e" jpyke3/mbp-manjaro-buildiso:dev
+        docker run --privileged -v $PWD/../:/root/iso-profiles -v ~/mbp-manjaro/out/"$e":/root/out --env KERNEL=linux57-mbp --env EDITION="$e" jpyke3/mbp-manjaro-buildiso
         # Clean docker system
         docker system prune -f
     fi

Scripts/repo-all-editions.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-for f in ../manjaro/*; do
-    if [ -d "$f" ]; then
-        ln -sf ../../user-repos.conf ../manjaro/"$f"/user-repos.conf 
-    fi
-done
-
-for f in ../community/*; do
-    if [ -d "$f" ]; then
-        ln -sf ../../user-repos.conf ../community/"$f"/user-repos.conf 
-    fi
-done

community/bspwm-mate/Packages-Desktop

@@ -162,7 +162,7 @@ manjaro-pulse
 
 # Themes
 xcursor-breeze
-adwaita-maia-gtk3
+adwaita-maia
 breeze-maia-icon-themes
 gtk-theme-breath
 kvantum-manjaro

community/bspwm/Packages-Desktop

@@ -7,7 +7,6 @@
 >basic xlogin
 >extra accountsservice
 >extra adapta-maia-theme
->extra adwaita-maia-gtk3
 >extra compton
 >extra dconf
 >extra dunstify

manjaro/grub/Packages-Live

@@ -1 +0,0 @@
-grub-theme-live-manjaro

manjaro/grub/Packages-Root

@@ -1,22 +0,0 @@
-amd-ucode
-intel-ucode
-bash
-coreutils
-efibootmgr
-filesystem
-gcc-libs
-glibc
-grub-quiet
-KERNEL
-lsb-release
->manjaro manjaro-release
-systemd-sysvcompat
-nbd
-nfs-utils
-util-linux
-gnupg
-curl
-ca-certificates-utils
-mkinitcpio-nfs-utils
-memtest86+
-licenses

manjaro/grub/profile.conf

@@ -1,74 +0,0 @@
-##########################################
-###### use this file in the profile ######
-##########################################
-
-# use multilib packages; x86_64 only
-multilib="false"
-
-displaymanager="sddm"
-
-# Set to false to disable autologin in the livecd
-# autologin="true"
-
-# nonfree mhwd drivers
-nonfree_mhwd="false"
-
-# 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="true"
-
-# configure calamares to use chrootcfg instead of unpackfs
-chrootcfg="true"
-
-# use geoip for localization
-# geoip='true'
-
-# unset defaults to given value
-# hostname="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
-enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep')
-
-# disable_systemd=('pacman-init')
-
-# unset defaults to given values,
-# names must match openrc service names
-enable_openrc=('acpid' 'elogind' 'cronie' 'dbus' 'syslog-ng' 'NetworkManager')
-
-# disable_openrc=()
-
-# the same workgroup name if samba is used
-# smb_workgroup=""
-
-################# livecd #################
-
-# unset defaults to given value
-# username="manjaro"
-
-# unset defaults to given value
-# password="manjaro"
-
-# 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')
-
-# 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' 'pacman-init' 'mirrors-live')

manjaro/grub/user-repos.conf

@@ -1 +0,0 @@
-../../user-repos.conf

manjaro/kde-dev/Packages-Desktop

@@ -1,311 +0,0 @@
-## 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
-autoconf
-automake
-binutils
-bison
-fakeroot
-flex
-gcc
->multilib gcc-libs-multilib
->multilib gcc-multilib
-libtool
-m4
-make
-patch
-pkg-config
->multilib lib32-flex
-# Extra packages for AUR support
->extra git
->extra patchutils
->extra subversion
-
-## Fonts
-ttf-dejavu
-# 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-inconsolata
->extra ttf-indic-otf
->extra ttf-liberation
->extra ttf-droid
-
-## Games
-#>extra steam-manjaro
-
-## Package management
-#appimagelauncher
-packagekit-qt5
-discover-git
-flatpak
-xdg-desktop-portal
-xdg-desktop-portal-kde
-fwupd
-pamac-cli
-octopi
-
-## Printing
-#>extra cups
-#>extra cups-pdf
-#>extra cups-pk-helper
-#>extra ghostscript
-#>extra gsfonts
-#>extra gtk3-print-backends
-#>extra hplip
-#>extra splix
-
-## 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-git
-
-## Plasma5
-bluedevil-git
-kde-gtk-config-git
-kdeplasma-addons-git
-kgamma5-git
-kinfocenter-git
-kmenuedit-git
-kscreen-git
-kscreenlocker-git
-ksshaskpass-git
-ksysguard-git
-kwallet-pam-git
-kwayland-integration-git
-kwin-git
-qt5-virtualkeyboard  # Virtual keyboard support for kwin-wayland
-kwrited-git
-milou-git
-plasma-desktop-git
-plasma-nm-git
-plasma-pa-git
-plasma-wayland-session-git
-plasma-workspace-git
->extra plasma-workspace-wallpapers-git
-powerdevil-git
-systemsettings-git
-user-manager-git
-
-## Themes QT/GTK/SDDM
-breeze-git
-breeze-gtk-git
-breeze-icons-git
-gnome-icon-theme
-gnome-themes-standard
-#gtk-theme-breath
-oxygen-git
-oxygen-icons-git
-#plasma5-themes-breath  # Default
-#sddm-breath-theme  # Default
-grub-theme-manjaro
-#illyria-wallpaper
-#>extra wallpapers-2018
-#>extra manjaro-wallpapers-18.0
-
-## Better systray/notifications support
-#>extra sni-qt  # A Qt plugin that enables tray icons in qt4 applications
-
-## 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
-khelpcenter
-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
-htop
-#imagewriter
-inxi
-#>extra krita
->extra firefox
->basic falkon
-#ms-office-online
-#>extra libreoffice-fresh
->extra calligra
-#manjaro-hello
-manjaro-settings-manager-kcm
-manjaro-settings-manager-knotifier
-powertop
-#>extra qbittorrent
-screenfetch
-systemd-kcm
-#>extra thunderbird
-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
-#>extra manjaro-kde-settings
-#>basic manjaro-kde-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
-zensu
-
-## Misc
-manjaro-hotfixes

manjaro/kde-dev/Packages-Live

@@ -1,10 +0,0 @@
-calamares-git
->manjaro grub-theme-live-manjaro
-gsmartcontrol
-#manjaro-architect
-manjaro-live-skel
-manjaro-live-systemd
-mkinitcpio-nfs-utils
-nbd
-squashfs-tools
-#clonezilla

manjaro/kde-dev/Packages-Mhwd

@@ -1 +0,0 @@
-../../shared/Packages-Mhwd

manjaro/kde-dev/Packages-Root

@@ -1 +0,0 @@
-../../shared/Packages-Root

manjaro/kde-dev/desktop-overlay/etc/pam.d

@@ -1 +0,0 @@
-../../../kde/desktop-overlay/etc/pam.d

manjaro/kde-dev/desktop-overlay/etc/sddm.conf

@@ -1,129 +0,0 @@
-[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=breeze
-
-# 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 <username>.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
-
-

manjaro/kde-dev/desktop-overlay/etc/sysctl.d

@@ -1 +0,0 @@
-../../../kde/desktop-overlay/etc/sysctl.d/

manjaro/kde-dev/live-overlay/etc/default

@@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/default

manjaro/kde-dev/live-overlay/etc/fstab

@@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/fstab

manjaro/kde-dev/live-overlay/etc/issue

@@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/issue

manjaro/kde-dev/live-overlay/etc/localtime

@@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/localtime

manjaro/kde-dev/live-overlay/etc/pam.d

@@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/pam.d

manjaro/kde-dev/profile.conf

@@ -1,73 +0,0 @@
-##########################################
-###### 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'
-
-# unset defaults to given values
-# names must match systemd service names
-enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
-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=()
-
-# 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' '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')

manjaro/kde-dev/user-repos.conf

@@ -1 +0,0 @@
-../../user-repos.conf