diff --git a/.config/hypr/land/monitors.conf##default b/.config/hypr/land/monitors.conf##default
new file mode 100644
index 0000000..958c769
--- /dev/null
+++ b/.config/hypr/land/monitors.conf##default
@@ -0,0 +1,6 @@
+################
+### MONITORS ###
+################
+
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor=,preferred,auto,1
\ No newline at end of file
diff --git a/.config/hypr/land/monitors.conf b/.config/hypr/land/monitors.conf##hostname.GOLBAT
similarity index 100%
rename from .config/hypr/land/monitors.conf
rename to .config/hypr/land/monitors.conf##hostname.GOLBAT
diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
deleted file mode 100755
index 34302b8..0000000
--- a/.config/yadm/bootstrap
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-sudo pacman -S base-devel git --needed --noconfirm
-
-if ! command -v paru &> /dev/null; then
-  echo "Installing paru..."
-  TEMP_DIR=`mktemp -d`
-
-  git clone https://aur.archlinux.org/paru.git $TEMP_DIR/paru
-  cd $TEMP_DIR/paru
-
-  makepkg -si --noconfirm
-fi
-
-sudo -v
-
-paru -S --noconfirm --needed - < ./data/packages.txt
-
-sudo chsh -s /bin/fish $USER
diff --git a/.config/yadm/bootstrap##os.Linux,distro_family.arch b/.config/yadm/bootstrap##os.Linux,distro_family.arch
new file mode 100755
index 0000000..0d8316a
--- /dev/null
+++ b/.config/yadm/bootstrap##os.Linux,distro_family.arch
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+echo "Installing paru dependencies"
+sudo pacman -S base-devel git --needed --noconfirm
+
+if ! command -v paru &>/dev/null; then
+    echo "Installing paru..."
+    TEMP_DIR=$(mktemp -d)
+    
+    git clone https://aur.archlinux.org/paru.git $TEMP_DIR/paru
+    cd $TEMP_DIR/paru
+    
+    makepkg -si --noconfirm
+fi
+
+echo "Installing packages"
+sudo -v
+paru -S --noconfirm --needed - <$HOME/.config/yadm/data/packages.txt
+
+echo "Changing default shell"
+sudo chsh -s /bin/fish $USER
+
+echo "Applying arrpc fix"
+sudo cp /usr/lib/systemd/user/arrpc.service /etc/systemd/system/arrpc.service
+sudo systemctl enable arrpc --now
\ No newline at end of file
diff --git a/.config/yadm/data/packages.txt b/.config/yadm/data/packages.txt
deleted file mode 100644
index 1a41f17..0000000
--- a/.config/yadm/data/packages.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-vim
-fish
-fastfetch
-hyfetch
-tree
-git
-nerd-fonts
-reflector
-pokeget
-oh-my-posh
-
-
-# nodejs
-# arrpc
-# hyprland
-# hyprshot
-# hyprlock
-# hyprpaper
-# hypridle
-# brightnessctl
-# playerctl
-# pavucontrol
-# nm-connection-editor
-# uswm
-# sddm
-# waybar
-# ttf-font-awesome
-# swaync
-# libnotify
-# kitty
-# wofi
-# nutilus
-# sddm-theme-corners-git
-# wlogout
diff --git a/.config/yadm/data/packages.txt##os.Linux,distro_family.arch b/.config/yadm/data/packages.txt##os.Linux,distro_family.arch
new file mode 100644
index 0000000..f5f4d66
--- /dev/null
+++ b/.config/yadm/data/packages.txt##os.Linux,distro_family.arch
@@ -0,0 +1,12 @@
+vim
+fish
+fastfetch
+hyfetch
+tree
+git
+nerd-fonts
+reflector
+pokeget
+oh-my-posh
+nodejs
+arrpc
diff --git a/.config/yadm/data/packages.txt##os.Linux,distro_family.arch,class.desktop-hyprland b/.config/yadm/data/packages.txt##os.Linux,distro_family.arch,class.desktop-hyprland
new file mode 100644
index 0000000..73529ed
--- /dev/null
+++ b/.config/yadm/data/packages.txt##os.Linux,distro_family.arch,class.desktop-hyprland
@@ -0,0 +1,33 @@
+vim
+fish
+fastfetch
+hyfetch
+tree
+git
+nerd-fonts
+reflector
+pokeget
+oh-my-posh
+nodejs
+arrpc
+hyprland
+hyprshot
+hyprlock
+hyprpaper
+hypridle
+brightnessctl
+playerctl
+pavucontrol
+nm-connection-editor
+uswm
+ly
+waybar
+ttf-font-awesome
+swaync
+libnotify
+kitty
+wofi
+nautilus
+# sddm
+# sddm-theme-corners-git
+wlogout