diff --git a/home/alex/home.nix b/home/alex/home.nix
index a5a313c..9c336be 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -8,6 +8,7 @@
     ./services/dunst
     ./services/udiskie
     ./services/picom
+    ./services/screen-locker
   ];
 
   home = {
@@ -70,8 +71,6 @@
       };
     };
     mpv.enable = true;
-    rofi.enable = true;
-    rofi.pass.enable = true;
     zathura.enable = true;
 
     zsh = let
diff --git a/home/alex/services/screen-locker/default.nix b/home/alex/services/screen-locker/default.nix
new file mode 100644
index 0000000..43d5e3d
--- /dev/null
+++ b/home/alex/services/screen-locker/default.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+{
+  config.services.screen-locker = {
+    enable = true;
+    inactiveInterval = 30;
+    lockCmd = "${pkgs.betterlockscreen}/bin/betterlockscreen -l dim";
+    xautolock.extraOptions = [ "Xautolock.killer: systemctl suspend" ];
+  };
+}
diff --git a/modules/wm/x.nix b/modules/wm/x.nix
index 86e2a86..0159bf6 100644
--- a/modules/wm/x.nix
+++ b/modules/wm/x.nix
@@ -7,9 +7,7 @@
 
     xserver = {
       enable = true;
-      exportConfiguration = true;
 
-      # Configure keymap in X11
       layout = "us";
 
       xkbOptions = "terminate:ctrl_alt_bksp,caps:escape,compose:ralt";
diff --git a/modules/wm/xmonad/config.hs b/modules/wm/xmonad/config.hs
index 9c561a9..4943790 100644
--- a/modules/wm/xmonad/config.hs
+++ b/modules/wm/xmonad/config.hs
@@ -63,6 +63,8 @@ myConfig = ewmhFullscreen $ ewmh $ Docks.docks $ nav $ def
   , ("M-r", WS.nextWS)
   , ("<XF86MonBrightnessDown>", spawn "xbacklight -dec 5")
   , ("<XF86MonBrightnessUp>", spawn "xbacklight -inc 5")
+  , ("<F5>", spawn "xbacklight -dec 5")
+  , ("<F6>", spawn "xbacklight -inc 5")
   , ("M-S-c", sendMessage $ MoveSplit U)
   , ("M-S-h", sendMessage $ MoveSplit L)
   , ("M-S-t", sendMessage $ MoveSplit D)