diff --git a/.config/ansible/roles/arch/packages/tasks/modules/base.yml b/.config/ansible/roles/arch/packages/tasks/modules/base.yml
index a8220b0e..1e1566ab 100644
--- a/.config/ansible/roles/arch/packages/tasks/modules/base.yml
+++ b/.config/ansible/roles/arch/packages/tasks/modules/base.yml
@@ -25,7 +25,6 @@
# WM
- hyprland
- swappy
- - swayidle
- wev
- wf-recorder
- wl-clipboard
@@ -120,7 +119,8 @@
- waybar-hyprland-cava-git
- waybar-module-pacman-updates-git
- wleave-git
- - swaylock-effects
+ - hyprlock-git
+ - hypridle-git
- swaync
- swayosd-git
- swww
diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf
new file mode 100644
index 00000000..e174cfea
--- /dev/null
+++ b/.config/hypr/hypridle.conf
@@ -0,0 +1,8 @@
+general {
+ lock_cmd = hyprlock
+}
+
+listener {
+ timeout = 600
+ on-timeout = loginctl lock-session
+}
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
new file mode 100644
index 00000000..7148dc79
--- /dev/null
+++ b/.config/hypr/hyprlock.conf
@@ -0,0 +1,68 @@
+background {
+ monitor =
+ path = $HOME/.config/hypr/themes/luna/walls/neon-dim.png
+ color = rgb(b7bdf8)
+
+ blur_size = 4
+ blur_passes = 3
+ noise = 0.0117
+ contrast = 1.3000
+ brightness = 0.8000
+ vibrancy = 0.2100
+ vibrancy_darkness = 0.0
+}
+
+input-field {
+ monitor = DP-1
+ size = 250, 50
+ outline_thickness = 3
+ dots_size = 0.2
+ dots_spacing = 0.64
+ dots_center = true
+ outer_color = rgb(b7bdf8)
+ inner_color = rgb(24273a)
+ font_color = rgb(cad3f5)
+ fade_on_empty = true
+ placeholder_text = Password...
+ hide_input = false
+ position = 0, 50
+ halign = center
+ valign = bottom
+}
+
+# Current time
+label {
+ monitor = DP-1
+ text = cmd[update:1000] echo " $(date +"%H:%M:%S") "
+ color = rgb(cad3f5)
+ font_size = 64
+ font_family = JetBrains Mono Nerd Font 10
+ position = 0, 16
+ halign = center
+ valign = center
+}
+
+# User label
+label {
+ monitor = DP-1
+ text = Hey $USER
+ color = rgb(cad3f5)
+ font_size = 20
+ font_family = JetBrains Mono Nerd Font 10
+ position = 0, 0
+ halign = center
+ valign = center
+}
+
+
+# Type to unlock
+label {
+ monitor = DP-1
+ text = Type to unlock!
+ color = rgb(cad3f5)
+ font_size = 16
+ font_family = JetBrains Mono Nerd Font 10
+ position = 0, 30
+ halign = center
+ valign = bottom
+}
diff --git a/.config/hypr/scripts/autostart/services b/.config/hypr/scripts/autostart/services
index 0ffdc656..876a51c4 100755
--- a/.config/hypr/scripts/autostart/services
+++ b/.config/hypr/scripts/autostart/services
@@ -27,7 +27,7 @@ udiskie &
devify &
# Idle daemon to screen lock
-swayidle &
+hypridle &
# Clipboard
wl-clip-persist --clipboard regular &
diff --git a/.config/pacman/arch-packages.txt b/.config/pacman/arch-packages.txt
index ed8254b6..3ad871f4 100644
--- a/.config/pacman/arch-packages.txt
+++ b/.config/pacman/arch-packages.txt
@@ -162,7 +162,6 @@ starship 1.17.1-1
steam 1.0.0.78-2
sudo 1.9.15.p5-1
swappy 1.5.1-1
-swayidle 1.8.0-1
syncthing 1.27.3-2
tealdeer 1.6.1-1
texinfo 7.1-2
diff --git a/.config/pacman/aur-packages.txt b/.config/pacman/aur-packages.txt
index 5009af76..122261a7 100644
--- a/.config/pacman/aur-packages.txt
+++ b/.config/pacman/aur-packages.txt
@@ -15,6 +15,8 @@ find-the-command 2.0.1-1
floorp-bin 11.10.5-1
gzdoom 4.11.3-2
heroic-games-launcher 2.12.0-1
+hypridle-git 0.1.1.r2.g029f0880-1
+hyprlock-git 0.1.0.r16.gfa2a875e-1
hyprpicker-git 0.1.1.r2.0889bd5-2
hyprsome-git r24.9636be0-1
lazydocker 0.23.1-1
@@ -48,7 +50,6 @@ sddm-git 0.21.0.0.g63780fc-2
selectdefaultapplication-fork-git r72.4e8501d-1
spicetify-cli 2.33.1-1
spotify 1:1.2.31.1205-2
-swaylock-effects 1.7.0.0-4
swaync 0.10.0-1
swayosd-git r55.a0709bc-1
swww 0.8.2-2
diff --git a/.config/swayidle/.github/README.md b/.config/swayidle/.github/README.md
deleted file mode 100644
index affa9d51..00000000
--- a/.config/swayidle/.github/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
-
-