diff --git a/modules/desktops/hyprland-desktop.nix b/modules/desktops/hyprland-desktop.nix
index f05732a..31bacc7 100644
--- a/modules/desktops/hyprland-desktop.nix
+++ b/modules/desktops/hyprland-desktop.nix
@@ -12,9 +12,9 @@
     # X11 server configuration (for compatibility)
     xserver = {
       enable = true;
-      displayManager.gdm.enable = false; # Disable GDM in favor of regreet
       excludePackages = [pkgs.xterm]; # Exclude xterm from the list of packages to install
     };
+    displayManager.gdm.enable = false; # Disable GDM in favor of regreet
 
     # Lightweight Wayland-native display manager
     greetd.enable = true;
diff --git a/modules/hm/hyprsunset.nix b/modules/hm/hyprsunset.nix
index 33f338e..2c2c9b8 100644
--- a/modules/hm/hyprsunset.nix
+++ b/modules/hm/hyprsunset.nix
@@ -1,19 +1,17 @@
 {
   services.hyprsunset = {
     enable = true;
-    transitions = {
-      sunrise = {
-        calendar = "*-*-* 06:00:00";
-        requests = [
-          ["identity"]
-        ];
-      };
-      sunset = {
-        calendar = "*-*-* 20:00:00";
-        requests = [
-          ["temperature" "5000"]
-        ];
-      };
+    settings = {
+      profile = [
+        {
+          time = "06:00";
+          identity = true;
+        }
+        {
+          time = "20:00";
+          temperature = 5000;
+        }
+      ];
     };
   };
 }
diff --git a/modules/hm/ssh.nix b/modules/hm/ssh.nix
index e982433..45b413f 100644
--- a/modules/hm/ssh.nix
+++ b/modules/hm/ssh.nix
@@ -1,11 +1,11 @@
 {
   programs.ssh = {
     enable = true;
-    serverAliveInterval = 60;
-    serverAliveCountMax = 2;
-
+    enableDefaultConfig = false;
     matchBlocks = {
       "*" = {
+        serverAliveInterval = 60;
+        serverAliveCountMax = 2;
         sendEnv = ["TERM"];
         setEnv = {
           TERM = "xterm-256color"; # Fix ghostty issue