Updated the install procedure

integrating the new `calamares-mbp` package, we can now just use the regular Manjaro install process.

README.md

@@ -8,6 +8,8 @@ Extra Modules: https://github.com/JPyke3/extramodules-mbp-manjaro
 
 Repository: http://mbp-repo.jacobpyke.xyz/archlinux/
 
+Roadmap: https://github.com/JPyke3/mbp-manjaro/projects/1
+
 ## Important Notice for all users!
 
 My repository has changed due to issues with my previous content delivery network. You can replace the repository by opening a terminal and running the following command:
@@ -15,154 +17,11 @@ My repository has changed due to issues with my previous content delivery networ
 sudo sed -i 's/https:\/\/jacobpyke.xyz/http:\/\/mbp-repo.jacobpyke.xyz/' /etc/pacman.conf
 ```
 
-## Releases
-
-### [Download the latest releases here](https://drive.google.com/drive/folders/16BK16Ig2BX3MzktFFPaX04-B2PTAhd8R?usp=sharing)
-
 ## Installation Proccess
 
-#### Hardware requirements: 
-* USB-C to ethernet cable adapter.
-  * Whilst you can install this over WiFi, it would make it alot easier to use an Adapter. If you would like to use the WiFi to set up Manjaro then refer to the "In order to get WiFi working" Section after you have booted Manjaro
-* USB-C to USB Adapter
+[See the wiki for installation procedure](https://github.com/JPyke3/mbp-manjaro/wiki/Installation)
 
-### 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. 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.  
-  
-   b. When you see the macOS Utilities window, choose Utilities > Startup Security Utility from the menu bar.
-  
-   c. When you're asked to authenticate, click Enter macOS Password, then choose an administrator account and enter its password.
-  
-   d. Set the first option to "No Security", and the second to "Allow booting from External Media".
-  
-   e. Reboot your Mac.
-  
-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.
-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:
-```
-systemctl start systemd-timesyncd.service
-```
-8. Open the installer and proceed normally until you hit the partitioning stage
-9. Click Manual Partitioning
-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'
-
-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).
-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
-```
-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 "/ "
-```
-20. Open a new terminal, and run this command
-```
-manjaro-chroot /mnt
-```
-21. Run this command to install systemd-boot
-```
-bootctl --path=/boot --no-variables install 
-```
-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 
-```
-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
-```
-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.7-x86_64-mbp
-initrd  /intel-ucode.img
-initrd  /initramfs-5.7-x86_64-mbp.img
-options root="UUID={change_this_value}" rw
-```
-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
-```
-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 :)
-
-## In order to get WiFi working
-1. Boot into OSX and run the following in terminal: `ioreg -l | grep C-4364`
-
-It will show something like:
-```
-"RequestedFiles" = ({"Firmware"="C-4364__s-B2/kauai.trx","TxCap"="C-4364__s-B2/kauai-X3.txcb","Regulatory"="C-4364__s-B2/kauai-X3.clmb","NVRAM"="C-4364__s-B2/P-kauai-X3_M-HRPN_V-u__m-7.5.txt"})
-
-    | |   |         |       "images" = {"C-4364__s-B2/kauai-X3.txcb"={"imagetype"="TxCap","required"=No,"imagename"="C-4364__s-B2/kauai-X3.txcb"},"C-4364__s-B2/P-kauai-X3_M-HRPN_V-u__m-7.5.txt"={"imagetype"="NVRAM","required"=Yes,"imagename"="C-4364__s-B2/P-kauai-X3_M-HRPN_V-u__m-7.5.txt"},"C-4364__s-B2/kauai-X3.clmb"={"imagetype"="Regulatory","required"=Yes,"imagename"="C-4364__s-B2/kauai-X3.clmb"},"C-4364__s-B2/kauai.trx"={"imagetype"="Firmware","required"=Yes,"imagename"="C-4364__s-B2/kauai.trx"}}
-```
-It'll be different depending on your exact model.
-
-2. There are three files to note down. A `.trx` (for me: `C-4364__s-B2/kauai.trx`), a `.clmb` (for me: `C-4364__s-B2/kauai-X3.clmb` and a `.txt` (for me: `C-4364__s-B2/P-kauai-X3_M-HRPN_V-u__m-7.5.txt`
-3. Look for the corrisponding files in this repository: https://packages.aunali1.com/apple/wifi-fw/18G2022/ (Thank you Aunali1)
-4. Boot back into linux and place the files in the following locations:
-5. Copy the trx to `/lib/firmware/brcm/brcmfmac4364-pcie.bin` (e.g. `sudo cp kauai.trx /lib/firmware/brcm/brcmfmac4364-pcie.bin`)
-6. The clmb to `/lib/firmware/brcm/brcmfmac4364-pcie.clm_blob` (e.g. `sudo cp kauai-X3.clmb /lib/firmware/brcm/brcmfmac4364-pcie.clm_blob`)
-7. The txt to something like `/lib/firmware/brcm/brcmfmac4364-pcie.Apple Inc.-MacBookPro15,1.txt`. You will need to replace `15,1` with your model number. (e.g. `sudo cp P-kauai-X3_M-HRPN_V-u__m-7.5.txt /lib/firmware/brcm/brcmfmac4364-pcie.Apple Inc.-MacBookPro15,1.txt`).
-
-   a. [Identifying your MacBook Pro Model](https://support.apple.com/en-us/HT201300) or [Identifying your MacBook Air Model](https://support.apple.com/en-au/HT201862)
-
-- Credit to [@mikeeq](https://github.com/mikeeq) for the write up.
-
-#### Footnote - WiFi using iwd (Recommended!)
-The way I recommend getting WiFi to work in linux is using iwd instead of wpa_supplicant. Below is how you would configure iwd.
-```
-sudo pacman -S iwd
-systemctl stop wpa_supplicant
-systemctl mask wpa_supplicant
-sudo nano /etc/NetworkManager/NetworkManager.conf
-```
-paste in this at the end:
-```
-[device]
-wifi.backend=iwd
-```
-Run:
-```
-systemctl enable iwd
-```
-then reboot.
-
-#### Footnote - WiFi using wpa_supplicant
-In the next release this will not be required, but in order to have the wifi work after reboot run the following commands (NOTE: This is a bit tempremental as wpa_supplicant really doesn't work that well with the chips in the MacBooks):
-```
-sudo pacman -S wifi-fix-mbp
-systemctl start wifi-fix.service; systemctl enable wifi-fix.service
-```
-
-## Useful Packages:
+## Distro Specific Packages:
  - `audio-fix-mbp`
    - Installs files needed for pulseaudio rules
  - `wifi-fix-mbp`
@@ -170,121 +29,12 @@ systemctl start wifi-fix.service; systemctl enable wifi-fix.service
    - Fixes a bug where the wifi firmware won't load on boot
 
 ## FAQ
-#### Installing alongside Windows
-If you install Manjaro whilst Windows is also installed on your system, Manjaro will use the same Boot entry as the Windows Boot Manager on the MacOS Boot Loader.
 
-After clicking on the Windows entry on the MacOS bootloader, you will be taken to systemd-boot, from there you can choose if you would like to boot into Manjaro or use the Windows Boot Manager.
-
-#### 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
-```
-sudo pacman-key --recv-key 2BA2DFA128BBD111034F7626C7833DB15753380A --keyserver keyserver.ubuntu.com
-```
-
-#### When I click on the EFI Partition I boot into MacOS!
-
-Yes, sadly I made a mistake in the very early builds. This is because the earlier builds used a different naming scheme before i adopted the manjaro standard of naming the kernel `linuxXX-mbp` 
-
-In order to fix this fire up the live usb again. Once you boot into manjaro mount your EFI partition mount `/dev/nvme0n1p1 /mnt` edit the file `nano /mnt/loader/entries/manjaro.conf` and chane the line:
-```
-linux   /vmlinuz-linux56-mbp
-```
-to
-```
-linux   /vmlinuz-5.6-x86_64-mbp
-```
-and also change line:
-```
-initrd  /initramfs-linux56-mbp.img
-```
-to
-```
-initrd  /initramfs-5.6-x86_64-mbp.img
-```
-After that try the EFI System partition again.
-
-**Note, after your first update with pacman the kernel will revert back to the old names, in order to ensure you still get the latest updates revert these lines back after runing sudo pacman -Syu once.**
-
-#### Switch Touchbar to Function Keys
-Run this in your terminal:
-```
-sudo bash -c "echo 2 > /sys/class/input/*/device/fnmode"
-```
+[See the wiki for a FAQ](https://github.com/JPyke3/mbp-manjaro/wiki/FAQ)
 
 ## Building for yourself
 
-### 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 - For Linux**
-```
-sh -c "$(curl -fsSL "https://raw.githubusercontent.com/JPyke3/mbp-manjaro/master/build-in-docker.sh")"
-```
-
-**Docker Command**
-
-```
-docker run --privileged \
-          -v ~/manjaro-mbp-iso:/root/out \
-          -v {PATH-TO-REPO}:/root/iso-profiles\
-          --env KERNEL=linux57-mbp\
-          --env EDITION=gnome\
-          jpyke3/mbp-manjaro-buildiso
-```
-
-#### Command Breakdown
- - `--privileged`
-   - This is required for allowing the filesystems to be created. (This is a security risk! Read for yourself the documentation on this flag)
- - `-v`
-   - Create a folder on your host filesystem to retrieve the compiled files from the container
-   - Ensure that `{PATH-TO-REPO}` is replaced by the absolute path to this repo's files.
- - `--env`
-   - There are two environment variables:
-     - `KERNEL`: This is used for defining which kernel version to use. All packages will follow the `-mbp` naming scheme.
-     - `EDITION`: This is used for defining which edition of manjaro you would like to install.
-
-
-## Option 2: Manually on an existing Manjaro Install
-
-First Install Manjaro Tools:
-```
-pamac install manjaro-tools-iso git
-```
-
-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:
-
-```
-buildiso -f -p {edition} -k linux57-mbp
-```
-
-*Available Options are:*
-```
-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 a official edition go to:
-```
-cd /var/cache/manjaro-tools/iso/manjaro/{NAME_OF_EDITION}/20.0.3/
-```
-If using a community edition to:
-```
-cd /var/cache/manjaro-tools/iso/community/{NAME_OF_EDITION}/20.0.3/
-```
-
-## Known Limitations
-
-### No Openbox
-
-At this stage the packages for openbox are really out of date, when their respective packages are updated Openbox will be added back in
+[See the wiki for build instructions](https://github.com/JPyke3/mbp-manjaro/wiki/Building)
 
 ## Notable Resources
 * Build Manjaro ISOs with Buildiso: https://wiki.manjaro.org/Build_Manjaro_ISOs_with_buildiso
@@ -304,8 +54,20 @@ At this stage the packages for openbox are really out of date, when their respec
 * 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
+
+# Donations
+*There is absolutley no obligation to donate, this software is free and will remain that way, this is just if you wanna help support my caffeine addiction ☕️*
+
+I accept donations either through Patreon (See the right hand side bar). Or via crypto (BTC and Lightning).
+
+### On Chain
+My On Chain address is: `36MMVwfxRyZKA4SJyUkB8QptMvBip9jLzS`
+
+![btc-on-chain](https://s3.eu-central-1.wasabisys.com/mbp-repo.jacobpyke.xyz/images/btc-address.png)
+
+### Lightning
+[tippin.me](https://tippin.me) is currently not accepting sign ups, once they do I will create an account then I will accept tips via Lightning

community/bspwm-mate/Packages-Live

@@ -6,4 +6,4 @@ squashfs-tools
 manjaro-live-systemd
 >manjaro grub-theme-live-manjaro
 gsmartcontrol
-calamares
+calamares-mbp

community/cinnamon/Packages-Live

@@ -1,4 +1,4 @@
-calamares
+calamares-mbp
 cinnamon-live
 clonezilla
 grub-theme-live-manjaro

community/deepin/Packages-Live

@@ -1,4 +1,4 @@
-calamares
+calamares-mbp
 deepin-live
 grub-theme-live-manjaro
 gsmartcontrol

shared/Packages-Live

@@ -1,4 +1,4 @@
-calamares
+calamares-mbp
 grub-theme-live-manjaro
 gsmartcontrol
 manjaro-architect