diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..1d953f4
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use nix
diff --git a/arch-portable/PKGBUILD b/arch-portable/PKGBUILD
index 76acd23..f3213e5 100644
--- a/arch-portable/PKGBUILD
+++ b/arch-portable/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Tobias Reisinger <tobias@msrg.cc>
 # shellcheck disable=SC2034
-pkgname=serguzim-system-portalo
+pkgname=serguzim-system-portable
 pkgver=1
 pkgrel=1
 epoch=
@@ -10,11 +10,11 @@ url="https://git.serguzim.me/serguzim/system"
 license=("unknown")
 groups=()
 depends=(
-	"intel-ucode"
+	#"intel-ucode"
 
-	"amdgpu-fan"
-	"xf86-video-amdgpu"
-	"vulkan-radeon"
+	#"amdgpu-fan"
+	#"xf86-video-amdgpu"
+	#"vulkan-radeon"
 )
 source=(
 	"boot_loader_entries_portable.conf"
diff --git a/arch-portable/etc_fstab b/arch-portable/etc_fstab
index 6c2648a..0e27f1a 100644
--- a/arch-portable/etc_fstab
+++ b/arch-portable/etc_fstab
@@ -1,5 +1,5 @@
 LABEL=arch_portable	/         		ext4      	rw,relatime	0 1
 
-LABEL=BOOT_PORTABLE	/boot 			 vfat      	rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,utf8,errors=remount-ro	0 2
+LABEL=BOOT_PRTBLE	/boot 			vfat      	rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,utf8,errors=remount-ro	0 2
 
 LABEL=home_portable	/home     		ext4      	rw,relatime	0 2
diff --git a/arch-portable/etc_hostname b/arch-portable/etc_hostname
index 4af1ba4..77d5f51 100644
--- a/arch-portable/etc_hostname
+++ b/arch-portable/etc_hostname
@@ -1 +1 @@
-portalo
+portable
diff --git a/arch-portable/etc_systemd_network_20-wired.network b/arch-portable/etc_systemd_network_20-wired.network
index 30a36df..a61291d 100644
--- a/arch-portable/etc_systemd_network_20-wired.network
+++ b/arch-portable/etc_systemd_network_20-wired.network
@@ -1,5 +1,5 @@
 [Match]
-Name=enp0s31f6
+Type=ether
 
 [Network]
 DHCP=yes
diff --git a/arch-portable/format_disk.sh b/arch-portable/format_disk.sh
new file mode 100755
index 0000000..de028fb
--- /dev/null
+++ b/arch-portable/format_disk.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+device="$1"
+
+echo "Target device is $device"
+
+[ -b "$1" ] || exit
+
+echo "Continue?"
+
+read -r
+
+part_boot="${device}1"
+part_root="${device}2"
+part_home="${device}3"
+
+sudo umount "$part_home" "$part_boot" "$part_root"
+
+set -e
+
+sudo sfdisk "$device" << EOF
+,500M,c
+,64G,L
+,+,L
+EOF
+
+sudo mkfs.vfat -n "BOOT_PRTBLE" "$part_boot"
+yes | sudo mkfs.ext4 -L "arch_portable" "$part_root"
+yes | sudo mkfs.ext4 -L "home_portable" "$part_home"
+
+mount_root=$(mktemp -d)
+mount_boot="$mount_root/boot"
+mount_home="$mount_root/home"
+
+sudo mount "$part_root" "$mount_root"
+
+sudo mkdir "$mount_boot"
+sudo mkdir "$mount_home"
+
+sudo mount "$part_boot" "$mount_boot"
+sudo mount "$part_home" "$mount_home"
+
+sudo pacstrap -Kc "$mount_root" base linux linux-firmware #\
+	#--asdeps mkinitcpio xdg-desktop-portal-gtk wireplumber pipewire-jack
+
+flags=(--root "$mount_root") #--noconfirm)
+
+pacman -Qq "${flags[@]}" | sudo pacman -S "${flags[@]}" --asdeps -
+
+cd "../arch" || exit
+paru -Ui --rebuild "${flags[@]}" \
+	--overwrite "$mount_root/etc/mkinitcpio.conf" \
+	--overwrite "$mount_root/etc/pacman.conf" \
+	--overwrite "$mount_root/etc/xdg/reflector/reflector.conf"
+
+cd "../arch-portable" || exit
+paru -Ui --rebuild "${flags[@]}" \
+	--overwrite "$mount_root/etc/fstab"
diff --git a/arch-portalo/etc_fstab b/arch-portalo/etc_fstab
index 20e2f66..48c7cdf 100644
--- a/arch-portalo/etc_fstab
+++ b/arch-portalo/etc_fstab
@@ -1,6 +1,6 @@
 LABEL=arch_portalo	/         	ext4      	rw,relatime	0 1
 
-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=BOOT_PRTLO	/boot     	vfat      	rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,utf8,errors=remount-ro	0 2
 
 LABEL=games_portalo	/mnt/games	ext4      	rw,relatime	0 2
 
diff --git a/arch/PKGBUILD b/arch/PKGBUILD
index c6f3a16..4ecda3e 100644
--- a/arch/PKGBUILD
+++ b/arch/PKGBUILD
@@ -9,6 +9,11 @@ arch=("any")
 url="https://git.serguzim.me/serguzim/system"
 license=("unknown")
 groups=()
+makedepends=(
+	"mkinitcpio" # initramfs
+	"xdg-desktop-portal-gtk" # xdg-desktop-portal-impl
+	"wireplumber" # pipewire-session-manager
+	"pipewire-jack" # libjack.so
 depends=(
 	### BASE
 	"base"
@@ -20,7 +25,7 @@ depends=(
 	"zsh" "htop" "git" "wireguard-tools"
 	"cups" "cups-pdf"
 	"docker" "docker-buildx" "docker-compose"
-	#"xdg-user-dirs"
+	"pcsclite"
 
 	### BASE-DEVEL
 	"archlinux-keyring" "autoconf" "automake" "binutils" "bison" "debugedit"
@@ -29,7 +34,7 @@ depends=(
 	"texinfo" "which"
 
 	### OTHER PACKAGE MANAGERS
-	"nix" "flatpak"
+	"flatpak" "nix" "paru-bin"
 
 	### ARCH UTILS
 	"archlinux-contrib" "pacman-contrib"
@@ -54,7 +59,7 @@ depends=(
 	#"bemenu" "bemenu-x11" "j4-dmenu-desktop"
 	"bspwm"
 	#"sxhkd" "polybar"
-	"pipewire-pulse" "vorbis-tools" "alsa-utils"
+	"pipewire-pulse" "wireplumber" "vorbis-tools" "alsa-utils"
 	"gst-plugins-good" "gst-plugins-good" "gst-plugins-bad" "gst-plugins-ugly"
 	"polkit-gnome"
 	"alacritty"
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..1c589a8
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,6 @@
+with import <nixpkgs> {};
+mkShell {
+	nativeBuildInputs = [
+		arch-install-scripts
+	];
+}