diff --git a/home/alex/home.nix b/home/alex/home.nix
index 9c336be..a5a313c 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -8,7 +8,6 @@
     ./services/dunst
     ./services/udiskie
     ./services/picom
-    ./services/screen-locker
   ];
 
   home = {
@@ -71,6 +70,8 @@
       };
     };
     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
deleted file mode 100644
index 43d5e3d..0000000
--- a/home/alex/services/screen-locker/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ 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 0159bf6..86e2a86 100644
--- a/modules/wm/x.nix
+++ b/modules/wm/x.nix
@@ -7,7 +7,9 @@
 
     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 4943790..9c561a9 100644
--- a/modules/wm/xmonad/config.hs
+++ b/modules/wm/xmonad/config.hs
@@ -63,8 +63,6 @@ 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)