diff --git a/common/desktop.nix b/common/desktop.nix
index 7a50b13..d6976ff 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -2,24 +2,15 @@
   services.xserver = {
     enable = true;
     displayManager = {
-      startx.enable = true;
-      /*
-       gdm = {
-       */
-      /*
-       enable = true;
-       */
-      /*
-       wayland = false;
-       */
-      /*
-       };
-       */
       lightdm = {
         enable = true;
       };
     };
-    desktopManager.gnome.enable = true;
+    desktopManager = {
+      gnome = {
+        enable = true;
+      };
+    };
   };
 
   services.logrotate.checkConfig = false;
diff --git a/common/packages.nix b/common/packages.nix
index 7d153b2..6e36793 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -182,6 +182,7 @@ in {
         gnomeExtensions.appindicator
         google-chrome
         guake
+        i3lock-fancy-rapid
         kazam
         keyleds
         linuxPackages.perf
@@ -206,6 +207,7 @@ in {
         virtmanager
         vlc
         wireshark-qt
+        xautolock
         yaru-theme
         zoom-us
       ];
diff --git a/flake.nix b/flake.nix
index abd4148..ee25cbb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,6 +39,7 @@
 
         ./services/netdata/default.nix
         ./services/keyleds/default.nix
+        ./services/xautolock/default.nix
 
         ({
           config,
diff --git a/services/xautolock/default.nix b/services/xautolock/default.nix
new file mode 100644
index 0000000..73e7735
--- /dev/null
+++ b/services/xautolock/default.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  pkgs,
+  ...
+}: let
+in {
+  systemd.services.xautolock = {
+    description = "Lock the screen automatically after a timeout";
+    wantedBy = ["graphical.target"];
+
+    serviceConfig = {
+      Type = "simple";
+      User = "dave";
+      Environment = "DISPLAY=:0";
+      ExecStart = "${pkgs.xautolock}/bin/xautolock -time 1 -detectsleep -locker /home/dave/lock";
+    };
+  };
+}