diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf
new file mode 100644
index 0000000..4d9f09d
--- /dev/null
+++ b/hypr/hypridle.conf
@@ -0,0 +1,17 @@
+listener {
+    timeout = 300                           # 5min
+    on-timeout = hyprlock                   # lock screen when timeout has passed
+    #on-resume = notify-send "Welcome back!" # notification activity is detected after timeout has fired.
+}
+
+listener {
+    timeout = 330                           # 5.5min
+    on-timeout = hyprctl dispatch dpms off  # screen off when timeout has passed
+    on-resume = hyprctl dispatch dpms on    # screen on when activity is detected after timeout has fired.
+}
+
+listener {
+    timeout = 1800                          # 30min
+    on-timeout = systemctl suspend          # suspend pc
+}
+
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 42aa607..dbe5c08 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -20,6 +20,8 @@ monitor=,preferred,auto,auto
 # Execute your favorite apps at launch
 # exec-once = waybar & hyprpaper & firefox
 
+exec-once = waybar & hypridle
+
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
 
@@ -27,7 +29,7 @@ monitor=,preferred,auto,auto
 $terminal = kitty
 $fileManager = Thunar
 $menu = wofi --show drun
-$lockScreen = swaylock
+$lockScreen = hyprlock
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER
diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf
new file mode 100644
index 0000000..41b7ad8
--- /dev/null
+++ b/hypr/hyprlock.conf
@@ -0,0 +1,52 @@
+#  _                      _            _    
+# | |__  _   _ _ __  _ __| | ___   ___| | __
+# | '_ \| | | | '_ \| '__| |/ _ \ / __| |/ /
+# | | | | |_| | |_) | |  | | (_) | (__|   < 
+# |_| |_|\__, | .__/|_|  |_|\___/ \___|_|\_\
+#        |___/|_|                           
+# 
+
+background {
+    monitor =
+    #path = $HOME/dotfiles/.settings/lockscreen.png   # only png supported for now
+    color = rgba(25, 20, 20, 1.0)
+
+    # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+    blur_passes = 4 # 0 disables blurring
+    blur_size = 2
+    noise = 0.0117
+    contrast = 0.8916
+    brightness = 0.8172
+    vibrancy = 0.1696
+    vibrancy_darkness = 0.0
+}
+
+input-field {
+    monitor =
+    size = 200, 50
+    outline_thickness = 1
+    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    outer_color = rgb(000000)
+    inner_color = rgb(200, 200, 200)
+    font_color = rgb(10, 10, 10)
+    fade_on_empty = true
+    placeholder_text = <i>Input Password...</i> # Text rendered in the input box when it's empty.
+    hide_input = false
+    position = 0, -20
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = Enter your password to unlock
+    color = rgba(200, 200, 200, 1.0)
+    font_size = 25
+    font_family = Noto Sans
+
+    position = 0, 200
+    halign = center
+    valign = center
+}
diff --git a/hypr/keybinds.conf b/hypr/keybinds.conf
index 95e2c79..c5b818d 100644
--- a/hypr/keybinds.conf
+++ b/hypr/keybinds.conf
@@ -8,7 +8,7 @@ bind = $mainMod, V, togglefloating,
 bind = $mainMod, R, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
-bind = $mainMod, L, exec, $lockScreen # swaylock
+bind = $mainMod, L, exec, $lockScreen # hyprlock
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l