diff --git a/flake.nix b/flake.nix
index f3ec258..aecf5b5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -212,7 +212,7 @@
                     ./home/apps
                     ./home/games
                     ./home/hosts/${hostname}
-                    ./home/kde
+                    # ./home/kde
                     ./home/services
                     ./home/terminal
                     ./home/tiling
diff --git a/home/tiling/default.nix b/home/tiling/default.nix
index 512ea0f..2196fec 100644
--- a/home/tiling/default.nix
+++ b/home/tiling/default.nix
@@ -47,6 +47,67 @@
     };
   };
 
+  programs.swaylock = with config.scheme; {
+    enable = true;
+    package = pkgs.swaylock;
+    settings = {
+      # this would sometimes load the previous day's wallpaper
+      # when it is run before the bing retrieval script finishes
+      # image = "~/.local/share/wallpaper/daily-colored.jpg";
+      # effect-blur = "7x5";
+      color = "000000"; # black
+      font-size = 24;
+      indicator-idle-visible = true;
+      indicator-radius = 100;
+      show-failed-attempts = true;
+
+      bs-hl-color = base09; # peach
+      caps-lock-bs-hl-color = base09; # peach
+      caps-lock-key-hl-color = base0E; # mauve
+      inside-color = base00; # base
+      inside-clear-color = base00; # base
+      inside-caps-lock-color = base00; # base
+      inside-ver-color = base00; # base
+      inside-wrong-color = base00; # base
+      key-hl-color = base0D; # blue
+      layout-bg-color = base00; # base
+      layout-border-color = base00; # base
+      layout-text-color = base05; # text
+      line-color = base00; # base
+      line-clear-color = base00; # base
+      line-caps-lock-color = base00; # base
+      line-ver-color = base00; # base
+      line-wrong-color = base00; # base
+      ring-color = base00; # base
+      ring-clear-color = base09; # peach
+      ring-caps-lock-color = base00; # base
+      ring-ver-color = base0B; # green
+      ring-wrong-color = base00; # base
+      separator-color = "00000000"; # transparent
+      text-color = base05; # text
+      text-clear-color = base09; # peach
+      text-caps-lock-color = base0E; # mauve
+      text-ver-color = base05; # text
+      text-wrong-color = base08; # red
+    };
+  };
+
+  systemd.user.services.swaylock = {
+    Unit = {
+      After = [ "niri.service" ];
+      PartOf = [ "niri.service" ];
+      Description = "Screen locker";
+      Documentation = "https://github.com/swaywm/swaylock";
+    };
+
+    Service = {
+      ExecStart = "${pkgs.swaylock}/bin/swaylock";
+      Restart = "on-failure";
+    };
+
+    Install.WantedBy = [ "niri.service" ];
+  };
+
   xsession = {
     enable = true;
     windowManager.command = "niri";
diff --git a/system/default.nix b/system/default.nix
index 886ba31..1ffbb72 100755
--- a/system/default.nix
+++ b/system/default.nix
@@ -102,11 +102,12 @@
   };
 
   services = {
-    desktopManager.plasma6.enable = true;
     displayManager = {
+      autoLogin.enable = true;
+      autoLogin.user = "sckova";
+      defaultSession = "niri";
       sddm.enable = true;
       sddm.wayland.enable = true;
-      defaultSession = "niri";
     };
     gnome.gnome-keyring.enable = true;
     libinput.enable = true;
@@ -137,6 +138,12 @@
   ];
 
   security.pam.services.niri.enableGnomeKeyring = config.services.gnome.gnome-keyring.enable;
+  security.pam.services.swaylock = {
+    name = "swaylock";
+    enableGnomeKeyring = config.services.gnome.gnome-keyring.enable;
+    gnupg.enable = true;
+    gnupg.noAutostart = true;
+  };
   security.polkit.enable = true;
   networking.firewall.enable = false;
   networking.networkmanager.enable = true;
diff --git a/system/hosts/peach/default.nix b/system/hosts/peach/default.nix
index 76d8105..61efae0 100644
--- a/system/hosts/peach/default.nix
+++ b/system/hosts/peach/default.nix
@@ -26,6 +26,12 @@ in
     }
   ];
 
+  services.logind.settings.Login = {
+    HandleSuspendKey = "ignore";
+    HandlePowerKey = "lock";
+    HandleLidSwitch = "lock";
+  };
+
   virtualisation.docker = {
     enable = true;
     # Use the rootless mode - run Docker daemon as non-root user