diff --git a/hypr/.config/hypr/hypridle.conf b/hypr/.config/hypr/hypridle.conf
new file mode 100644
index 0000000..3e268f7
--- /dev/null
+++ b/hypr/.config/hypr/hypridle.conf
@@ -0,0 +1,11 @@
+general {
+    lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
+    before_sleep_cmd = loginctl lock-session    # lock before suspend.
+    after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
+}
+
+listener {
+    timeout = 30                                 # 5min
+    on-timeout = loginctl lock-session            # lock screen when timeout has passed
+}
+
diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf
index dbdea47..f522175 100644
--- a/hypr/.config/hypr/hyprland.conf
+++ b/hypr/.config/hypr/hyprland.conf
@@ -36,6 +36,8 @@ $terminal = kitty
 $fileManager = pcmanfm
 $menu = rofi -show drun
 $screenshot = slurp | grim -g - ~/Pictures/Screenshots/screenshot_$(date "+%Y-%m-%d_%T").png
+$pwmanager = bitwarden-desktop
+$lockscreen = hyprlock
 
 
 #################
@@ -45,10 +47,12 @@ $screenshot = slurp | grim -g - ~/Pictures/Screenshots/screenshot_$(date "+%Y-%m
 # Autostart necessary processes (like notifications daemons, status bars, etc.)
 # Or execute your favorite apps at launch like this:
 
-# exec-once = $terminal
-# exec-once = nm-applet &
 exec-once = waybar 
 exec-once = hyprpaper
+exec-once = bitwarden-desktop
+exec-once = nm-applet
+exec-once = nextcloud --background
+exec-once = hypridle
 
 
 #############################
@@ -163,6 +167,8 @@ input {
     touchpad {
         natural_scroll = false
     }
+
+    numlock_by_default = true
 }
 
 # https://wiki.hyprland.org/Configuring/Variables/#gestures
@@ -195,6 +201,8 @@ bind = $mainMod,       P, exec, $menu
 bind = $mainMod SHIFT, P, pseudo, # dwindle
 bind = $mainMod,       J, togglesplit, # dwindle
 bind = $mainMod SHIFT, S, exec, $screenshot
+bind = $mainMod SHIFT, B, exec, $pwmanager
+bind = $mainMod,       L, exec, $lockscreen
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l
@@ -258,6 +266,8 @@ bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
 
 # Example windowrule v2
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
+#
+windowrule = float, ^(Bitwarden)$
 
 windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
 
@@ -270,3 +280,7 @@ env = NVD_BACKEND,direct
 cursor {
     no_hardware_cursors = true
 }
+
+workspace = 1, monitor:DP-2
+
+
diff --git a/hypr/.config/hypr/hyprlock.conf b/hypr/.config/hypr/hyprlock.conf
new file mode 100644
index 0000000..1524481
--- /dev/null
+++ b/hypr/.config/hypr/hyprlock.conf
@@ -0,0 +1,76 @@
+background {
+    monitor =
+    path = $HOME/Nextcloud/Pictures/Wallpapers/MRR.png
+    color = rgba(59,66,82,1) 
+
+    # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+    blur_size = 5
+    blur_passes = 0 # 0 disables blurring
+    noise = 0.0117
+    contrast = 1.3000 # Vibrant!!!
+    brightness = 0.8000
+    vibrancy = 0.2100
+    vibrancy_darkness = 0.0
+}
+
+input-field {
+    monitor =
+    size = 450, 50
+    outline_thickness = 3
+    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 1.00 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    outer_color = rgba(59,66,82,1)
+    inner_color = rgba(59,66,82,1) 
+    font_color = rgba(235,203,139,1) 
+    fade_on_empty = true
+    placeholder_text = <i>Password...</i> # Text rendered in the input box when it's empty.
+    hide_input = false
+    position = 0, 60
+    halign = center
+    valign = bottom
+}
+
+
+# Current time
+label {
+    monitor =
+    text = cmd[update:1000] echo "<b><big> $(date +"%H") </big></b>"
+    color =rgb(255,255,255) 
+    font_size = 128
+    font_family = HackJBMLigatured-Regular 10
+    position = 0, 140
+    halign = center
+    valign = center
+}
+label {
+    monitor =
+    text = cmd[update:1000] echo "<b><big> $(date +"%M") </big></b>"
+    color =rgb(255,255,255) 
+    font_size = 128
+    font_family = HackJBMLigatured-Regular 10
+    position = 0, -20
+    halign = center
+    valign = center
+}
+label {
+    monitor =
+    text = cmd[update:1000] echo "<b><big> $(date +"%d %b") </big></b>"
+    color =rgb(163,190,140) 
+    font_size = 16
+    font_family = HackJBMLigatured-Regular 10
+    position = 0, -160
+    halign = center
+    valign = center
+}
+label {
+    monitor =
+    text = cmd[update:1000] echo "<b><big> $(date +"%A") </big></b>"
+    color =rgb(163,190,140) 
+    font_size = 16
+    font_family = HackJBMLigatured-Regular 10
+    position = 0, -180
+    halign = center
+    valign = center
+}
+