diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 1b5475ad..2069bbf3 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -260,8 +260,5 @@ in ''
   exec-once = ${pkgs.protonmail-bridge}/bin/protonmail-bridge -n
   exec-once = ${pkgs.dex}/bin/dex --autostart
   exec-once = kidex
-
   exec = pkill -HUP kanshi
-
-  exec-once = ${pkgs.gtklock}/bin/gtklock
 ''
diff --git a/home/pass.nix b/home/pass.nix
index 55bf4288..c84dd780 100644
--- a/home/pass.nix
+++ b/home/pass.nix
@@ -15,10 +15,11 @@
       "${pkgs.gitFull}/bin/git-credential-libsecret";
   };
   services = {
-    gpg-agent = {
+    gpg-agent = rec {
       enable = true;
-      defaultCacheTtl = 7200;
-      defaultCacheTtlSsh = 7200;
+      maxCacheTtl = 86400;
+      defaultCacheTtl = maxCacheTtl;
+      defaultCacheTtlSsh = maxCacheTtl;
       pinentryFlavor = "gtk2";
       extraConfig = ''
         no-allow-external-cache
diff --git a/system/desktop.nix b/system/desktop.nix
index 7f68c148..8b2af354 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -3,7 +3,6 @@
 {
   environment.systemPackages = with pkgs;
     with libsForQt5.qt5; [
-      gtklock
       dex
       mesa
       libnotify
@@ -12,13 +11,17 @@
       qtgraphicaleffects
       qtsvg
       qtquickcontrols2
+      catppuccin-sddm-corners
       protonvpn-cli
       protonvpn-gui
       qbittorrent
     ];
   security = {
     rtkit.enable = true;
-    pam.services.gtklock.gnupg.enable = true;
+    pam.services = {
+      sddm.gnupg.enable = true;
+      gtklock = { };
+    };
   };
   sound.enable = true;
   hardware = {
@@ -26,7 +29,6 @@
     bluetooth.enable = true;
   };
   services = {
-    greetd.enable = true;
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -34,8 +36,15 @@
       pulse.enable = true;
     };
     xserver = {
+      enable = true;
       layout = "gb";
       xkbVariant = "";
+      displayManager.sddm = {
+        enable = true;
+        theme = "catppuccin-sddm-corners";
+        autoNumlock = true;
+        settings = { General = { InputMethod = ""; }; };
+      };
     };
   };
   console.keyMap = "uk";
diff --git a/system/hyprland.nix b/system/hyprland.nix
index 9806d5b0..6c330779 100644
--- a/system/hyprland.nix
+++ b/system/hyprland.nix
@@ -30,13 +30,7 @@
     blueman.enable = true;
     gvfs.enable = true;
     tumbler.enable = true;
-    greetd.settings = rec {
-      default_session.command = "Hyprland";
-      initial_session = {
-        inherit user;
-        inherit (default_session) command;
-      };
-    };
+    xserver.displayManager.defaultSession = "hyprland";
   };
   fonts = {
     packages = with pkgs; [