diff --git a/common/default.nix b/common/default.nix
index bf6f19f..4436185 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -30,15 +30,7 @@
   boot.tmp.useTmpfs = true;
 
   nix = {
-    # FIXME: https://github.com/nix-community/home-manager/issues/4692#issuecomment-2054003365
-    package = pkgs.nixVersions.unstable.overrideAttrs (o: {
-      src = pkgs.fetchFromGitHub {
-        owner = "NixOS";
-        repo = "nix";
-        rev = "60824fa97c588a0faf68ea61260a47e388b0a4e5";
-        sha256 = "10z/SoidVl9/lh56cMLj7ntJZHtVrumFvmn1YEqXmaM=";
-      };
-    });
+    package = pkgs.nixVersions.nix_2_21;
 
     # Edit nix.conf
     settings = {
diff --git a/devices/nos/modules/arion/media/calibre/images/calibre.nix b/devices/nos/modules/arion/media/calibre/images/calibre.nix
index df456c6..ff410aa 100644
--- a/devices/nos/modules/arion/media/calibre/images/calibre.nix
+++ b/devices/nos/modules/arion/media/calibre/images/calibre.nix
@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "ghcr.io/linuxserver/calibre";
-  imageDigest = "sha256:1175ad34511e6c8e82d7ce882123623433013bc2da9dee1c7d1c518996394443";
-  sha256 = "0k2pgsg9b305lkyr1rzpaav8x080iyh2kcnhzv5969f0fd9d3mkf";
+  imageDigest = "sha256:f0ea48698961325a542d00c3894e62f5aec405e1ca2736d6dedec9a0d2df4bbc";
+  sha256 = "0vbnhidl1bxfkm5xidv577zk61yv92yjnxw86x20193mhkg5cxy1";
   finalImageName = "ghcr.io/linuxserver/calibre";
   finalImageTag = "latest";
 }
diff --git a/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix b/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix
index 648cc97..4af3682 100644
--- a/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix
+++ b/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix
@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "ghcr.io/linuxserver/sabnzbd";
-  imageDigest = "sha256:0c3a6644a21fc365c5a3ef44525e961e458f862e74852bf1828d35f478463566";
-  sha256 = "1qxv8vg65ix4yiiwq9y0bxn9s3spd95vbj6slaw5rd1qrj1sn6zn";
+  imageDigest = "sha256:8ee3019ca921f6c46294f2e363453fa41875d309c7e68028a73f8169eb35a691";
+  sha256 = "02cdw87rgbnc8iryx2x02ccgybb7ic70mgia6dvsgds8l4xwz2nf";
   finalImageName = "ghcr.io/linuxserver/sabnzbd";
   finalImageTag = "latest";
 }
diff --git a/devices/nos/modules/arion/media/sonarr/images/sonarr.nix b/devices/nos/modules/arion/media/sonarr/images/sonarr.nix
index c96f130..af70726 100644
--- a/devices/nos/modules/arion/media/sonarr/images/sonarr.nix
+++ b/devices/nos/modules/arion/media/sonarr/images/sonarr.nix
@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "ghcr.io/linuxserver/sonarr";
-  imageDigest = "sha256:58fca88cafda8915f45b780124c767d5b63b7a1194d4781edc8c4b7fb0d6e9c3";
-  sha256 = "0dzvqrd7c2ajzi404qm3ziar31hyy5kpvjimdy9gxlpdz8mcd5wk";
+  imageDigest = "sha256:230ebe3521fbfc5fd7b30e169e3219953a132bdfcca88ef595360e1364e477e8";
+  sha256 = "0bjpx1vbisfghqlikpyrp33af7c5wj3d546xqxgfl64bn4v0z0iw";
   finalImageName = "ghcr.io/linuxserver/sonarr";
   finalImageTag = "latest";
 }
diff --git a/devices/servivi/modules/binary-cache.nix b/devices/servivi/modules/binary-cache.nix
index 57f5e78..8bb10d2 100644
--- a/devices/servivi/modules/binary-cache.nix
+++ b/devices/servivi/modules/binary-cache.nix
@@ -34,11 +34,14 @@ in {
         Group = config.users.users.${mainUser}.group;
       };
 
-      path = with pkgs; [
-        git
-        nix-fast-buildPkg
-        openssh
-      ];
+      path =
+        [
+          nix-fast-buildPkg
+        ]
+        ++ (with pkgs; [
+          git
+          openssh
+        ]);
 
       script = ''
         cd /tmp
diff --git a/flake.lock b/flake.lock
index 9d83b5c..1147c30 100644
--- a/flake.lock
+++ b/flake.lock
@@ -86,11 +86,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714374379,
-        "narHash": "sha256-CZU1I6V2Iw26F9IHv0pzSjP+Gg5LEhpZ7ZA46ZlVdz0=",
+        "lastModified": 1714719959,
+        "narHash": "sha256-gTAgC3cIg4ZQsdrYQTwo7c63qcy+YZNLWWO+KFl//BU=",
         "owner": "matt1432",
         "repo": "nixos-caddy-cloudflare",
-        "rev": "12aa149f2de32995ecb44fb6503fb0555652ba13",
+        "rev": "3b27039bb3e27ca3e7835a2d4648493fa21a457f",
         "type": "github"
       },
       "original": {
@@ -527,11 +527,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714515075,
-        "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=",
+        "lastModified": 1714865296,
+        "narHash": "sha256-02r2Qzh4fGYBPB/3Lj8vwPMtE6H/UchZnN7A/dQMHIA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef",
+        "rev": "e0825ea2112d09d9f0680833cd716f6aee3b973f",
         "type": "github"
       },
       "original": {
@@ -552,11 +552,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714613493,
-        "narHash": "sha256-OhEh+iBiDRMnMNTWz5cHhfg+63+F71DKM2Xj9a21rw0=",
+        "lastModified": 1714862850,
+        "narHash": "sha256-j1DPSl7FMy3JeWpmzXxcmZhxXbIOfteTozSfqtZ7KBQ=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "18daf37b7c4e6e51ca2bf8953ce4cff1c38ca725",
+        "rev": "fd133914bf1921db2a26627698f914478f6a9471",
         "type": "github"
       },
       "original": {
@@ -630,11 +630,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1714663293,
-        "narHash": "sha256-1XZi9ZRGn2Wob2WHYUjcshA/jeIIuPvbGHvAsZFNysw=",
+        "lastModified": 1714867666,
+        "narHash": "sha256-Xe7DtgMrb2onuoEDZ+/z/jb6HNof9ZfV203TQk5c/cI=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "a3ca016d42283ce1d2d5ffca40b93123b4290f4b",
+        "rev": "09ed6910552c7e898d629191e63c8997443eb202",
         "type": "github"
       },
       "original": {
@@ -727,11 +727,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714589749,
-        "narHash": "sha256-zzkb5vc4n/YI5KHrMie7oMZlgCKxs7zm/ybVXNL02Z0=",
+        "lastModified": 1714755542,
+        "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "c8c2151c607a036ddfc790f5f70237ab984266aa",
+        "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
         "type": "github"
       },
       "original": {
@@ -1232,11 +1232,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1714663048,
-        "narHash": "sha256-wU/VvEannX4QPBZOuARivd82xZpGhRyvJ3oo97hkp8w=",
+        "lastModified": 1714864555,
+        "narHash": "sha256-aJZN9gkqoIynucUGdX7eNADAdYl32LLcuJ6cummZhiI=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "31eca66436d2873ff5cb713fdf4113822258a299",
+        "rev": "0ae270975bd07b4dda3ae219098a97621f7dfc69",
         "type": "github"
       },
       "original": {
@@ -1295,11 +1295,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1714253743,
-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
+        "lastModified": 1714635257,
+        "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
+        "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
         "type": "github"
       },
       "original": {
@@ -1327,11 +1327,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1714253743,
-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
+        "lastModified": 1714635257,
+        "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
+        "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
         "type": "github"
       },
       "original": {
@@ -1449,11 +1449,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1714674317,
-        "narHash": "sha256-XMmuZpqvLngz1HIbw6VqyeFEeyi1L2e9UgY+kUJ9PX4=",
+        "lastModified": 1714866376,
+        "narHash": "sha256-TNHj9ARs7ny3l7pubZO4/9r4wPpZZiKIUrBobLB35is=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "1d73c3f1d477f047fef15f8d07e865145790999f",
+        "rev": "059f6c2bf1f8b8ee1789f2692c2be200514d29b8",
         "type": "github"
       },
       "original": {