diff --git a/flake.lock b/flake.lock
index 86c0d80..ce8dd9f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -266,22 +266,6 @@
         "type": "github"
       }
     },
-    "nixpkgs2211": {
-      "locked": {
-        "lastModified": 1688392541,
-        "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -290,8 +274,7 @@
         "hyprland-contrib": "hyprland-contrib",
         "nh": "nh",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs2211": "nixpkgs2211"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index d833a09..eea975d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,6 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs2211.url = "github:nixos/nixpkgs/nixos-22.11";
 
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
 
@@ -49,7 +48,7 @@
         ];
       };
 
-      sombrero = inputs.nixpkgs2211.lib.nixosSystem {
+      sombrero = inputs.nixpkgs.lib.nixosSystem {
         system = "aarch64-linux";
         specialArgs = { inherit inputs; };
         modules = [
diff --git a/hosts/sombrero/configuration.nix b/hosts/sombrero/configuration.nix
index 388e978..cb4597c 100644
--- a/hosts/sombrero/configuration.nix
+++ b/hosts/sombrero/configuration.nix
@@ -28,7 +28,10 @@
       };
     };
 
-    tmpOnTmpfs = true;
+    tmp = {
+     useTmpfs = true;
+    };
+
     kernelPackages = pkgs.linuxPackages_rpi4;
     kernelParams = [
       "8250.nr_uarts=1"
@@ -160,101 +163,104 @@
       key = "/home/alex/backup/sync/hosts/sombrero/syncthing/key.pem";
 
       guiAddress = "0.0.0.0:8384";
-      extraOptions = {
-        gui = {
-          user = "syncthing";
-          password = "CBLPEBrHoGPOnfdZtLibnSAaPAALXfSU";
-          insecureSkipHostcheck = false;
-        };
-      };
 
-      devices = {
-        phone.id = "NJIMX57-C2CGV76-GXMAQYV-ABWDA7Z-TS6UV2X-NVL5UPG-UFEQH4C-TKYA6QM";
-        bennu.id = "YXA2PVY-XNUS5HZ-4ZC6A65-O3JRY3S-P6UKE6N-FSUBOYE-JZ7UJWR-ILXMUAW";
-        pinwheel.id = "AKS5L2A-NFCG5GV-3U5SSSZ-PLOX6BQ-ZL5ALXI-D7OK4KE-R2JPWRJ-B6AQJQ7";
-      };
-
-      folders = {
-        "hosts" = {
-          path = "/home/alex/backup/sync/hosts";
-          devices = [ "bennu" ];
-          versioning = {
-            type = "staggered";
-            params = {
-              maxAge = "2592000"; # 30 days
-            };
+      settings = {
+        extraOptions = {
+          gui = {
+            user = "syncthing";
+            password = "CBLPEBrHoGPOnfdZtLibnSAaPAALXfSU";
+            insecureSkipHostcheck = false;
           };
         };
 
-        "org" = {
-          path = "/home/alex/backup/sync/org";
-          devices = [ "phone" "bennu" "pinwheel" ];
-          versioning = {
-            type = "staggered";
-            params = {
-              maxAge = "2592000"; # 30 days
-            };
-          };
+        devices = {
+          phone.id = "NJIMX57-C2CGV76-GXMAQYV-ABWDA7Z-TS6UV2X-NVL5UPG-UFEQH4C-TKYA6QM";
+          bennu.id = "YXA2PVY-XNUS5HZ-4ZC6A65-O3JRY3S-P6UKE6N-FSUBOYE-JZ7UJWR-ILXMUAW";
+          pinwheel.id = "AKS5L2A-NFCG5GV-3U5SSSZ-PLOX6BQ-ZL5ALXI-D7OK4KE-R2JPWRJ-B6AQJQ7";
         };
 
-        "phone-gps" = {
-          path = "/home/alex/backup/sync/gps";
-          devices = [ "bennu" "phone" ];
-          versioning = {
-            type = "staggered";
-            params = {
-              maxAge = "2592000"; # 30 days
+        folders = {
+          "hosts" = {
+            path = "/home/alex/backup/sync/hosts";
+            devices = [ "bennu" ];
+            versioning = {
+              type = "staggered";
+              params = {
+                maxAge = "2592000"; # 30 days
+              };
             };
           };
-        };
 
-        "personal" = {
-          path = "/home/alex/backup/sync/personal";
-          devices = [ "bennu" "pinwheel" ];
-          versioning = {
-            type = "staggered";
-            params = {
-              maxAge = "2592000"; # 30 days
+          "org" = {
+            path = "/home/alex/backup/sync/org";
+            devices = [ "phone" "bennu" "pinwheel" ];
+            versioning = {
+              type = "staggered";
+              params = {
+                maxAge = "2592000"; # 30 days
+              };
             };
           };
-        };
 
-        "work" = {
-          path = "/home/alex/backup/sync/work";
-          devices = [ "bennu" "pinwheel" ];
-          versioning = {
-            type = "staggered";
-            params = {
-              maxAge = "2592000"; # 30 days
+          "phone-gps" = {
+            path = "/home/alex/backup/sync/gps";
+            devices = [ "bennu" "phone" ];
+            versioning = {
+              type = "staggered";
+              params = {
+                maxAge = "2592000"; # 30 days
+              };
             };
           };
-        };
 
-        "time-tracking" = {
-          path = "/home/alex/backup/sync/time-tracking";
-          devices = [ "phone" ];
-          versioning = {
-            type = "staggered";
-            params = {
-              maxAge = "2592000"; # 30 days
+          "personal" = {
+            path = "/home/alex/backup/sync/personal";
+            devices = [ "bennu" "pinwheel" ];
+            versioning = {
+              type = "staggered";
+              params = {
+                maxAge = "2592000"; # 30 days
+              };
             };
           };
-        };
 
-        "books" = {
-          path = "/home/alex/backup/books";
-          devices = [ "bennu" "pinwheel" ];
-          versioning = {
-            type = "staggered";
-            params = {
-              maxAge = "2592000"; # 30 days
+          "work" = {
+            path = "/home/alex/backup/sync/work";
+            devices = [ "bennu" "pinwheel" ];
+            versioning = {
+              type = "staggered";
+              params = {
+                maxAge = "2592000"; # 30 days
+              };
             };
           };
-        };
 
-        "audiobooks" = {
-          path = "/home/alex/media/sync/audiobooks";
-          devices = [ "phone" ];
+          "time-tracking" = {
+            path = "/home/alex/backup/sync/time-tracking";
+            devices = [ "phone" ];
+            versioning = {
+              type = "staggered";
+              params = {
+                maxAge = "2592000"; # 30 days
+              };
+            };
+          };
+
+          "books" = {
+            path = "/home/alex/backup/books";
+            devices = [ "bennu" "pinwheel" ];
+            versioning = {
+              type = "staggered";
+              params = {
+                maxAge = "2592000"; # 30 days
+              };
+            };
+          };
+
+          "audiobooks" = {
+            path = "/home/alex/media/sync/audiobooks";
+            devices = [ "phone" ];
+          };
         };
       };
     };