diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock
index 2f5760e..c8d2cde 100644
--- a/dot_config/flake/flake.lock
+++ b/dot_config/flake/flake.lock
@@ -245,11 +245,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764534535,
-        "narHash": "sha256-TkAB7JTfQXq8wpBcCZ8cH/Dlkd/96J0VjFKqwhKl7kI=",
+        "lastModified": 1764361670,
+        "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "784a83782ce00985bee65c588d4c315ec0b5a172",
+        "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
         "type": "github"
       },
       "original": {
@@ -265,11 +265,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764534535,
-        "narHash": "sha256-TkAB7JTfQXq8wpBcCZ8cH/Dlkd/96J0VjFKqwhKl7kI=",
+        "lastModified": 1764361670,
+        "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "784a83782ce00985bee65c588d4c315ec0b5a172",
+        "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
         "type": "github"
       },
       "original": {
@@ -289,11 +289,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1764488513,
-        "narHash": "sha256-xBUnv+ndZxRbY9mYSPEP0afaZRUVXDFcJx0WMD4ypfs=",
+        "lastModified": 1764405884,
+        "narHash": "sha256-TnvBRPmcpcyinvLgsitHS7w5soSa6yNBfRYEI2TK1Ts=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "9e3bbd170669d10846bae68d23dabef11832f8f2",
+        "rev": "10aae4855ee275f7d80d85f4328c24265fb20f1f",
         "type": "github"
       },
       "original": {
@@ -322,11 +322,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1764485473,
-        "narHash": "sha256-RlGEcuZFB/IdvYLrYsf0RpgvNtCMyIuBLt3lS+GZvP8=",
+        "lastModified": 1764399944,
+        "narHash": "sha256-FC9eYtSmplgxllCX4/3hJq5J3sXWKLSc7at8ZUxycVw=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "311ca6b5da19f5acd7d3e481620de57240ce8f7c",
+        "rev": "b35bcae35b3f9665043c335e55ed5828af77db85",
         "type": "github"
       },
       "original": {
@@ -466,16 +466,16 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1764494334,
-        "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=",
+        "lastModified": 1764316264,
+        "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d542db745310b6929708d9abea513f3ff19b1341",
+        "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix
index e576e18..657fb04 100644
--- a/dot_config/flake/flake.nix
+++ b/dot_config/flake/flake.nix
@@ -4,7 +4,7 @@
   inputs = {
     # System configuration
     determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
       url = "github:nix-community/home-manager";
diff --git a/dot_config/flake/machines/saffron/configuration.nix b/dot_config/flake/machines/saffron/configuration.nix
index 7769e5b..6232a9e 100644
--- a/dot_config/flake/machines/saffron/configuration.nix
+++ b/dot_config/flake/machines/saffron/configuration.nix
@@ -31,7 +31,7 @@
   };
 
   networking.hostName = "saffron"; # Define your hostname.
-  networking.firewall.allowedTCPPorts = [ 443 ];
+  networking.firewall.allowedTCPPorts = [443 80];
 
   # Caddy reverse proxy with DNS challenge
   services.caddy = {
@@ -73,14 +73,6 @@
         reverse_proxy serenity.pizzly-bortle.ts.net:3000
       '';
     };
-    virtualHosts."ssh.gitforge.mayoff.ca" = {
-      extraConfig = ''
-        tls {
-          dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-        }
-        reverse_proxy serenity.pizzly-bortle.ts.net:3022
-      '';
-    };
     virtualHosts."immich.mayoff.ca" = {
       extraConfig = ''
         tls {
diff --git a/dot_config/flake/machines/wash/configuration.nix b/dot_config/flake/machines/wash/configuration.nix
index a86e691..1f10968 100644
--- a/dot_config/flake/machines/wash/configuration.nix
+++ b/dot_config/flake/machines/wash/configuration.nix
@@ -40,7 +40,7 @@
     trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="];
   };
 
-  hardware.fw-fanctrl.enable = true;
+  programs.fw-fanctrl.enable = true;
 
   # Enable networking
   networking.hostName = "wash";
@@ -133,7 +133,7 @@
   services.flatpak.enable = true;
 
   services.power-profiles-daemon.enable = true;
-  services.logind.settings.Login.HandleLidSwitch = "suspend-then-hibernate";
+  services.logind.lidSwitch = "suspend-then-hibernate";
   systemd.sleep.extraConfig = ''
     HibernateDelaySec=30m
     SuspendState=mem
diff --git a/dot_config/flake/modules/nixos/android-studio.nix b/dot_config/flake/modules/nixos/android-studio.nix
index 3f75887..3e1ab9e 100644
--- a/dot_config/flake/modules/nixos/android-studio.nix
+++ b/dot_config/flake/modules/nixos/android-studio.nix
@@ -6,5 +6,6 @@
 
   programs.adb.enable = true;
   services.udev.packages = [
+    pkgs.android-udev-rules
   ];
 }
diff --git a/dot_config/flake/modules/nixos/niri.nix b/dot_config/flake/modules/nixos/niri.nix
index 58faf78..dc8548b 100644
--- a/dot_config/flake/modules/nixos/niri.nix
+++ b/dot_config/flake/modules/nixos/niri.nix
@@ -9,7 +9,7 @@
 
   programs.niri.package = pkgs.niri-unstable;
 
-  services.displayManager.gdm.enable = true;
+  services.xserver.displayManager.gdm.enable = true;
   niri-flake.cache.enable = true;
   programs.niri.enable = true;
   services.upower.enable = true;