diff --git a/config/modules/barbar.nix b/config/modules/barbar.nix
index edfb492..9f6e4d1 100644
--- a/config/modules/barbar.nix
+++ b/config/modules/barbar.nix
@@ -39,9 +39,12 @@
             ''}";
           };
           order = {
-            left = [ "workspaces" "weather" ];
+            left = [ "workspaces" ];
             middle = [ ];
-            right = [ "audio" "clock" ];
+            right = [
+              "audio"
+              "clock"
+            ];
           };
           modules.clock.show_seconds = false;
           modules.workspaces = {
diff --git a/config/modules/hyprland/doloro-settings.nix b/config/modules/hyprland/doloro-settings.nix
index ee1f4e6..1d707b0 100644
--- a/config/modules/hyprland/doloro-settings.nix
+++ b/config/modules/hyprland/doloro-settings.nix
@@ -202,23 +202,17 @@
                     scale = "1";
                   }
                 ];
-
-                # DP-2 is the main monitor: every workspace (1-10, matching the
-                # binds above and the window rules below) is bound to it, so
-                # new workspaces are never created on HDMI-A-1. Workspace 1 is
-                # DP-2's default, i.e. what it shows on startup.
-                workspace_rule =
-                  [
-                    {
-                      workspace = "1";
-                      monitor = "DP-2";
-                      default = true;
-                    }
-                  ]
-                  ++ builtins.genList (i: {
-                    workspace = toString (i + 2);
+                workspace_rule = [
+                  {
+                    workspace = "2";
                     monitor = "DP-2";
-                  }) 9;
+                    default = true;
+                  }
+                ]
+                ++ builtins.genList (i: {
+                  workspace = toString (i + 2);
+                  monitor = "DP-2";
+                }) 9;
 
                 device = {
                   name = "default";
diff --git a/config/modules/surface_patches.nix b/config/modules/surface_patches.nix
index faad9ce..b208cf7 100644
--- a/config/modules/surface_patches.nix
+++ b/config/modules/surface_patches.nix
@@ -47,10 +47,10 @@
           spiHid = {
             # drivers = [ "legacy" ];
             legacy = {
-              enable = true;
+              enable = false;
             };
             v4 = {
-              enable = false;
+              enable = true;
             };
           };
           ssamPmNotifier = {
@@ -60,7 +60,10 @@
             enable = true;
           };
           touchscreen = {
-            enable = false;
+            enable = true;
+          };
+          systemIdleState = {
+            enable = true;
           };
           video = {
             enable = true;
diff --git a/flake.lock b/flake.lock
index 6958ef0..f86fb73 100644
--- a/flake.lock
+++ b/flake.lock
@@ -570,11 +570,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1788939917,
-        "narHash": "sha256-y2DodfhsLPuTQnfKPAaA297rLVIYUP2NYKsUY+KwEDU=",
+        "lastModified": 1789273773,
+        "narHash": "sha256-M6Lg+eBxc1Xa2dDCQC3caY3eblA407+ExxvIry7L6LQ=",
         "owner": "vikingnope",
         "repo": "helium-browser-nix-flake",
-        "rev": "1d3da1c585b02da2592303aecb001fb6d3cde7bf",
+        "rev": "07b2696826ca7b95308902aa901f7a5d235c4f6e",
         "type": "github"
       },
       "original": {
@@ -590,11 +590,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789235087,
-        "narHash": "sha256-6hZ6Gy8isRQsWdI4l81Egag/PUIh68nSmFr2maInUNg=",
+        "lastModified": 1789430117,
+        "narHash": "sha256-t+U1mijItLJ64xZOifpfQ17kpAL73nU7pDI48ScacVc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fe48612c5321a2cc09b0f563757a9c9733d641f8",
+        "rev": "cda90fd8838825c689fde9d3f3b4e937937790df",
         "type": "github"
       },
       "original": {
@@ -678,11 +678,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1789241536,
-        "narHash": "sha256-O//GVrNjx6xOH+/08LBr5OJ7IQ147MDUu2AN3B/iGjY=",
+        "lastModified": 1789410052,
+        "narHash": "sha256-aN7spskmtcjzdiVvHcAqPcgCK8exJA5jEWHtHMhQv+c=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "c31b90c5fc87b6bfc494f4e66d5acc3b0ba5b0ad",
+        "rev": "c26dbf9337998ba9afcfe84050e36969bb787598",
         "type": "github"
       },
       "original": {
@@ -1135,11 +1135,11 @@
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1789127271,
-        "narHash": "sha256-vL/Fpo7Zxa7wvO8V5FAToUBvP+K3XsMB1wUglTtd/J0=",
+        "lastModified": 1789417814,
+        "narHash": "sha256-xV9fcqtH6jJLVBF3ocqBBwZkPKEke+BujhEwT4Ye9Tc=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "24cfdc1f9344b90a1eee329a3906e2f39f4d0f1e",
+        "rev": "d40fd26f323c898b0c195d41aa5efadd85f57832",
         "type": "github"
       },
       "original": {
@@ -1234,11 +1234,11 @@
     },
     "nixpkgs-darwin": {
       "locked": {
-        "lastModified": 1788883829,
-        "narHash": "sha256-VqVWOsQHnklc2R0UkDUhm4cyGmnlFWMC3f9Acp2blHY=",
+        "lastModified": 1789155820,
+        "narHash": "sha256-cTHZTeYRV42p62ss3ZEFnBXrW3WpLgDpYWYyat4V2b8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "555cb0f648dd138a7a3c250f4f4928767707c988",
+        "rev": "8029b6c369415ee1ef02a86f352806348f104db9",
         "type": "github"
       },
       "original": {
@@ -1265,11 +1265,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1789248843,
-        "narHash": "sha256-s8F5ErMKU8Rajwy6XkqBWVs8AuDvjRnxolSvMfUKFrQ=",
+        "lastModified": 1789458178,
+        "narHash": "sha256-wlQSxH1V1HN8sHaE4lkID7LlcEdu5iOb2lztHLyMcU4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e4d65c2135017ee3daf2fe40d8eca3479cc2a548",
+        "rev": "80472d1cd64e1090f05d2f79d7f683b8bd5243db",
         "type": "github"
       },
       "original": {
@@ -1329,11 +1329,11 @@
     },
     "nixpkgs_12": {
       "locked": {
-        "lastModified": 1789149629,
-        "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=",
+        "lastModified": 1789286504,
+        "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b",
+        "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec",
         "type": "github"
       },
       "original": {
@@ -1345,11 +1345,11 @@
     },
     "nixpkgs_13": {
       "locked": {
-        "lastModified": 1789012029,
-        "narHash": "sha256-1CBkBf+Nhggykzlx0jvXrj5rk20btl+tK8Fa8Ml/BL4=",
+        "lastModified": 1789073787,
+        "narHash": "sha256-xfX/toC2QV707s06GbP4II/TxYF0fNQj7s5/LClNDKc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d5dfd8e6716dde34398bc14bc87c10dece9c8c68",
+        "rev": "aff8a0b28396750446e5537a96461bc4facdb287",
         "type": "github"
       },
       "original": {
@@ -1393,11 +1393,11 @@
     },
     "nixpkgs_16": {
       "locked": {
-        "lastModified": 1788614874,
-        "narHash": "sha256-PRK1fSEiAcO29DkUoOlsVLGYRK3h1YKVr+qQJB0VcYQ=",
-        "rev": "c043004d1c6985732bcc1cbc5a9c9aecbbb4e0f0",
+        "lastModified": 1789149629,
+        "narHash": "sha256-eQUZVehWLDBbpBR2rq6DnuRee1ULT6Y675RhsYDSjYI=",
+        "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1068089.c043004d1c69/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1072397.eaad089433ca/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -1533,11 +1533,11 @@
         "systems": "systems_6"
       },
       "locked": {
-        "lastModified": 1789067777,
-        "narHash": "sha256-gN3OnYgJwCK0HX01dQGWusnirJuVHE9WigmSqOnyuCE=",
+        "lastModified": 1789344271,
+        "narHash": "sha256-ezmg5oQSZWYdmomx6K1J+/6w7dRc7bquDMggc8eAE28=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "16baff93297c63b6d4c497f00ffcf0b844b06fc6",
+        "rev": "afcfb8c1dc075881bbaa6fa5745aebbdb179f8b8",
         "type": "github"
       },
       "original": {
@@ -1576,11 +1576,11 @@
         "nixpkgs": "nixpkgs_14"
       },
       "locked": {
-        "lastModified": 1789164289,
-        "narHash": "sha256-uozt9mvCE+s5qDDmq+detqwa9JPFFzrHH7JsscMbQ/8=",
+        "lastModified": 1789448683,
+        "narHash": "sha256-d0xeAG/j7Li6U81t6XoZ2t472oihJaIil4pXxlcYvuM=",
         "ref": "main",
-        "rev": "25fd85bb7b05744d1aec77c2b93cdfc90474e43b",
-        "revCount": 489,
+        "rev": "7f598dd95d7d1d41fdeb7f90b6ef1f7ceeed0cc6",
+        "revCount": 504,
         "type": "git",
         "url": "https://git.molez.org/mandlm/omp-nix"
       },
@@ -1825,11 +1825,11 @@
         "systems": "systems_7"
       },
       "locked": {
-        "lastModified": 1788683578,
-        "narHash": "sha256-bERpuakmPAC2b36zgXy6OXh+SkZUjbaV+vV2sPmm6p8=",
+        "lastModified": 1789291406,
+        "narHash": "sha256-lfZ7yAaTZMuAzOSLjJ7ivrKIFk0E11koWTVgkWSXwuE=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "a4ef43fb13e3615f36e5a0935aabe8cc29363dc9",
+        "rev": "09eed5c95105aada9ffabd4c7eb6b345dc4ba66f",
         "type": "github"
       },
       "original": {
@@ -2216,11 +2216,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788682845,
-        "narHash": "sha256-E03KyK0Sj+ia+FSy47XC4v9enU1C/lGiW5ZKmcJoI1M=",
+        "lastModified": 1789289402,
+        "narHash": "sha256-7HHAIxdoDAJv09/I6DrMsAJFgol2cqJumaPCCZ+XdAU=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "3aadc420e763a8243aedd2ce925ae1dc13663ed9",
+        "rev": "4036109214cf20632000558935bd823b901fa886",
         "type": "github"
       },
       "original": {