diff --git a/config/headful.nix b/config/headful.nix
index 7273e54..0cd46a5 100644
--- a/config/headful.nix
+++ b/config/headful.nix
@@ -32,6 +32,8 @@
         rofi
         polybar
         alacritty
+        i3lock-fancy
+        xautolock
         autorandr
         arandr
         xsel
diff --git a/config/omen.nix b/config/omen.nix
index 263a7d7..b463a6f 100644
--- a/config/omen.nix
+++ b/config/omen.nix
@@ -12,10 +12,12 @@
   # Supported Filesystems
   boot.supportedFilesystems = [ "ntfs" ];
 
-  # Hostname and User
-  networking.hostName = "randomctf";
+  # Import default user config
   users.users.random = import ./user.nix;
 
+  # Networking
+  networking.hostName = "randomctf";
+
   # Temporary fix for service failure.
   systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
 
diff --git a/dotfiles/.config/i3/config b/dotfiles/.config/i3/config
index f544d89..c0798db 100644
--- a/dotfiles/.config/i3/config
+++ b/dotfiles/.config/i3/config
@@ -19,6 +19,9 @@ bindsym $mod+Shift+f exec "google-chrome-stable"
 bindsym $mod+Shift+e exec "emacsclient -c"
 bindsym $mod+Shift+d exec "discord"
 
+# Lock screen with i3lock-fancy
+bindsym $mod+Shift+x exec "i3lock-fancy"
+
 # kill focused window
 bindsym $mod+q kill
 bindsym $mod+Shift+q kill
@@ -148,6 +151,9 @@ client.focused #555555 #555555 #ffffff #333333 #0000ff
 client.focused_inactive #333333 #222222 #888888 #292d2e #eeeeee
 client.unfocused #333333 #222222 #888888 #292d2e #eeeeee
 
+# Auto lock the screen after X minutes
+exec "xautolock -detectsleep -time 3 -locker i3lock-fancy"
+
 # Startup Applications
 exec_always  --no-startup-id "$HOME/.screenlayout/launch.sh &" # setup screen layout and wallpapers
 exec_always  --no-startup-id "$HOME/.scripts/autostart_desktop.sh &" # run autostart desktop apps