diff --git a/install.sh b/install.sh
index 0fb1e64..30ca7b1 100755
--- a/install.sh
+++ b/install.sh
@@ -35,19 +35,20 @@ hwclock --systohc
 echo "$HOSTNAME" >> /etc/hostname
 echo "KEYMAP=trq" >> /etc/vconsole.conf
 
-pacman -S --noconfirm base-devel # base programs
+pacman -S --noconfirm base-devel sudo # base programs
 pacman -S --noconfirm alsa-utils bluez bluez-utils bridge-utils networkmanager nvidia-open nvidia-utils pantum-universal-driver pavucontrol pipewire pipewire-alsa pipewire-jack pipewire-pulse polykit-gnome usbutils
 pacman -S --noconfirm alacritty firefox eog flameshot keepassxc ly sway swaybg zip unzip
 
 pacman -S --noconfirm ufw clamav
 
-pacman -S --noconfirm cmake cloc code cppcheck emacs cups docker docker-compose efibootmgr gdb ghidra ghostscript git git-lfs libvirtman-db man-pages mkcert nasm net-tools openssh qemu-base qemu-full rustup valgrind virt-manager virt-viewer wireplumber wireguard-tools wireshark-qt wmenu wofi xdg-desktop-portal-gtk xdg-desktop-portal-wlr xorg-xwayland
+pacman -S --noconfirm cmake cloc vim emacs cups docker docker-compose efibootmgr gdb ghidra ghostscript git git-lfs man-db man-pages mkcert nasm net-tools openssh qemu-base qemu-full rustup valgrind virt-manager virt-viewer wireplumber wireguard-tools wireshark-qt wmenu wofi xdg-desktop-portal-gtk xdg-desktop-portal-wlr xorg-xwayland
 
 systemctl enable NetworkManager
 systemctl enable ufw
 systemctl enable clamav-daemon
-systemctl enable ly
 systemctl disable getty@tty0.service
+systemctl disable getty@tty1.service
+systemctl enable ly@tty1.service
 systemctl enable bluetooth
 
 ufw default deny incoming
@@ -57,14 +58,20 @@ ufw enable
 sed -i 's/HOOKS=(base systemd autodetect microcode modconf kms keyboard keymap sd-vconsole block filesystems fsck)/HOOKS=(base systemd autodetect microcode modconf kms keyboard keymap sd-vconsole block sd-encrypt filesystems fsck)/' /etc/mkinitcpio.conf
 mkinitcpio -P
 
+printf "Configuring users..."
+
 echo -n "root:$ROOT_PASS" | chpasswd
+useradd -m -G wheel,docker,libvirt,video,audio "$USERNAME"
+echo "$USERNAME:$PASS" | chpasswd
+
+sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
 
 bootctl install
 
 printf "default  arch.conf\ntimeout  3\nconsole-mode max\neditor   no" >> /boot/loader/loader.conf
 
-UUID=$(blkid -s UUID -o value "${PART}3")
+UUID=\$(blkid -s UUID -o value "${PART}3")
 
-printf "title   Arch Linux\nlinux   /vmlinuz-linux\ninitrd  /initramfs-linux.img\noptions rd.luks.name=$UUID:roothome root=/dev/mapper/roothome rw" > /boot/loader/entries/arch.conf
+printf "title   Arch Linux\nlinux   /vmlinuz-linux\ninitrd  /initramfs-linux.img\noptions rd.luks.name=\$UUID:roothome root=/dev/mapper/roothome rw" > /boot/loader/entries/arch.conf
 
 EOF