diff --git a/user/daniel/home.nix b/user/daniel/home.nix
index bbd1c86..9ea2edd 100644
--- a/user/daniel/home.nix
+++ b/user/daniel/home.nix
@@ -10,9 +10,6 @@
 		../progs/rofi
 	];
 
-	# Let Home Manager install and manage itself.
-	programs.home-manager.enable = true;
-
 	home = {
 		username = "daniel";
 		homeDirectory = "/home/daniel";
@@ -108,6 +105,9 @@
 
 	programs = {
 
+		# Let Home Manager install and manage itself.
+		home-manager.enable = true;
+
 		git = {
 			enable = true;
 			package = pkgs.gitFull;
@@ -157,6 +157,11 @@
 		syncthing = {
 			enable = true;
 		};
+
+		screen-locker = {
+			enable = true;
+			lockCmd = "${pkgs.i3lock}/bin/i3lock -i /home/daniel/wallpapers/lock.png";
+		};
 	};
 
 }
diff --git a/user/progs/i3/default.nix b/user/progs/i3/default.nix
index d690124..4f1abb2 100644
--- a/user/progs/i3/default.nix
+++ b/user/progs/i3/default.nix
@@ -153,8 +153,7 @@ in {
 					"${mod}+Shift+j" = "exec --no-startup-id i3utils window move next";
 
 					"${mod}+p" = "scratchpad show";
-					"${mod}+Escape" = "exec i3lock -i /home/daniel/wallpapers/lock.png";
-					"${mod}+Shift+Escape" = "exec i3lock -i /home/daniel/wallpapers/lock.png && systemctl suspend";
+					"${mod}+Escape" = "exec loginctl lock-session";
 
 					"XF86MonBrightnessUp" = "exec xbacklight -inc 10";
 					"XF86MonBrightnessDown" = "exec xbacklight -dec 10";