From 63eafab885e63eb1a8ae7d406b25689c2cfe42c9 Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Fri, 13 Jan 2023 17:14:45 +0100
Subject: [PATCH] Update partition names

---
 arch-portalo/PKGBUILD                          |  7 +++++++
 arch-portalo/boot_loader_entries_arch.conf     |  5 +++++
 {arch => arch-portalo}/boot_loader_loader.conf |  0
 arch-portalo/etc_fstab                         |  8 ++++----
 arch/PKGBUILD                                  | 17 ++++++-----------
 arch/boot_loader_entries_arch.conf             |  5 -----
 6 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100755 arch-portalo/boot_loader_entries_arch.conf
 rename {arch => arch-portalo}/boot_loader_loader.conf (100%)
 delete mode 100755 arch/boot_loader_entries_arch.conf

diff --git a/arch-portalo/PKGBUILD b/arch-portalo/PKGBUILD
index f1f7c88..72de810 100644
--- a/arch-portalo/PKGBUILD
+++ b/arch-portalo/PKGBUILD
@@ -17,6 +17,8 @@ depends=(
 	"vulkan-radeon"
 )
 source=(
+	"boot_loader_entries_arch.conf"
+	"boot_loader_loader.conf"
 	"etc_fstab"
 	"etc_hostname"
 	"etc_systemd_network_20-wired.network"
@@ -29,6 +31,8 @@ sha256sums=(
 	"SKIP"
 	"SKIP"
 	"SKIP"
+	"SKIP"
+	"SKIP"
 )
 backup=()
 
@@ -45,6 +49,9 @@ _install() {
 
 
 package() {
+	_install "boot/loader/entries/arch.conf" "755"
+	_install "boot/loader/loader.conf" "755"
+
 	_install "etc/fstab"
 	_install "etc/hostname"
 	_install "etc/systemd/network/20-wired.network"
diff --git a/arch-portalo/boot_loader_entries_arch.conf b/arch-portalo/boot_loader_entries_arch.conf
new file mode 100755
index 0000000..a776c99
--- /dev/null
+++ b/arch-portalo/boot_loader_entries_arch.conf
@@ -0,0 +1,5 @@
+title   Arch Linux Portalo
+linux   /vmlinuz-linux
+initrd  /intel-ucode.img
+initrd  /initramfs-linux.img
+options root="LABEL=arch_portalo" rw quiet splash acpi_enforce_resources=lax mitigations=off
diff --git a/arch/boot_loader_loader.conf b/arch-portalo/boot_loader_loader.conf
similarity index 100%
rename from arch/boot_loader_loader.conf
rename to arch-portalo/boot_loader_loader.conf
diff --git a/arch-portalo/etc_fstab b/arch-portalo/etc_fstab
index 6a8df77..20e2f66 100644
--- a/arch-portalo/etc_fstab
+++ b/arch-portalo/etc_fstab
@@ -1,7 +1,7 @@
-LABEL=arch			/         	ext4      	rw,relatime	0 1
+LABEL=arch_portalo	/         	ext4      	rw,relatime	0 1
 
-LABEL=BOOT      	/boot     	vfat      	rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,utf8,errors=remount-ro	0 2
+LABEL=BOOT_PORTALO	/boot     	vfat      	rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,utf8,errors=remount-ro	0 2
 
-LABEL=games			/mnt/games	ext4      	rw,relatime	0 2
+LABEL=games_portalo	/mnt/games	ext4      	rw,relatime	0 2
 
-LABEL=home			/home     	ext4      	rw,relatime	0 2
+LABEL=home_portalo	/home     	ext4      	rw,relatime	0 2
diff --git a/arch/PKGBUILD b/arch/PKGBUILD
index 742b36d..c6f3a16 100644
--- a/arch/PKGBUILD
+++ b/arch/PKGBUILD
@@ -15,12 +15,12 @@ depends=(
 	"linux" "linux-firmware" "linux-headers"
 	"man-db" "man-pages" "usbutils" "sudo"
 	"mlocate" "vim"
-	"exfat-utils" "logrotate"
+	"exfat-utils" "logrotate" "udisks2"
 
 	"zsh" "htop" "git" "wireguard-tools"
 	"cups" "cups-pdf"
 	"docker" "docker-buildx" "docker-compose"
-	"xdg-user-dirs"
+	#"xdg-user-dirs"
 
 	### BASE-DEVEL
 	"archlinux-keyring" "autoconf" "automake" "binutils" "bison" "debugedit"
@@ -59,16 +59,16 @@ depends=(
 	"polkit-gnome"
 	"alacritty"
 	"lxappearance" "qt5ct" "gnome-icon-theme-extras" "gnome-themes-extra"
-	"gtkspell"
+	#"thunar" "tumbler" "ffmpegthumbnailer"
+	#"gtkspell"
 	"thunderbird"
 	"qutebrowser" "python-adblock" "python-pynacl" "pdfjs-legacy"
 	"ungoogled-chromium" "firefox"
 	"chromium-widevine" "qt5-webengine-widevine" 
-	"kdeconnect" "keepassxc" "syncthing"
+	#"kdeconnect" "keepassxc"
+	"syncthing"
 )
 source=(
-	"boot_loader_entries_arch.conf"
-	"boot_loader_loader.conf"
 	"etc_locale.conf"
 	"etc_mkinitcpio.conf"
 	"etc_pacman.conf"
@@ -95,8 +95,6 @@ sha256sums=(
 	"SKIP"
 	"SKIP"
 	"SKIP"
-	"SKIP"
-	"SKIP"
 )
 backup=(
 	"boot/loader/loader.conf"
@@ -115,9 +113,6 @@ _install() {
 
 
 package() {
-	_install "boot/loader/entries/arch.conf" "755"
-	_install "boot/loader/loader.conf" "755"
-
 	_install "etc/locale.conf"
 	_install "etc/mkinitcpio.conf"
 	_install "etc/pacman.conf"
diff --git a/arch/boot_loader_entries_arch.conf b/arch/boot_loader_entries_arch.conf
deleted file mode 100755
index c4a1971..0000000
--- a/arch/boot_loader_entries_arch.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-title   Arch Linux
-linux   /vmlinuz-linux
-initrd  /intel-ucode.img
-initrd  /initramfs-linux.img
-options root="/dev/nvme0n1p3" rw quiet splash acpi_enforce_resources=lax mitigations=off