switch deprecated programs.ssh.matchBlocks to settings

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776998627,
+        "lastModified": 1779728104,
-        "narHash": "sha256-n0ENc4Xi1d3ApoHTRsfssC6AAroFgIKXJzJFykxNanY=",
+        "narHash": "sha256-Apxb4B9JWPyV1RUqXkaPRACwulRwHZmaZQ674Rr+Sn0=",
         "owner": "Lumpiasty",
         "repo": "acer-wmi-ext",
-        "rev": "d0be381bbd661ed4bb327a9c92b980a0b9edacac",
+        "rev": "5fc3299fef7ece6e0f646ba1ad1d3a22a788df2f",
         "type": "github"
       },
       "original": {
@@ -67,11 +67,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778887053,
+        "lastModified": 1779510126,
-        "narHash": "sha256-0tSElqIlp+tbsMrbxVwzKlF3wrRO2GPGHmDqrMbaphs=",
+        "narHash": "sha256-AN19hN63A3nuuUsOo42dERR/fmMt/rSEqNc1F3xjpAs=",
         "owner": "sadjow",
         "repo": "claude-code-nix",
-        "rev": "faa8786775fa232366f95a6f8dc2de67a1fea0e5",
+        "rev": "304b96c0998c76633bacbb44daa6a5de40f92273",
         "type": "github"
       },
       "original": {
@@ -226,11 +226,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779143091,
+        "lastModified": 1779678629,
-        "narHash": "sha256-qxiUVquHM09KOV1aD4We9q0ooPWO4qOc0v9J9NDWSAo=",
+        "narHash": "sha256-gHcIFg0mm+KFsg7iZQt67kni3+qR5U3PhEC9P7vKlZ4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "736c2084ea750a049ecdbdd7ff5817d2eeeef444",
+        "rev": "612bbe3b405ad5f71d7bf9edecc04b678a061652",
         "type": "github"
       },
       "original": {
@@ -267,11 +267,11 @@
     "linux-ntfs": {
       "flake": false,
       "locked": {
-        "lastModified": 1777784940,
+        "lastModified": 1779240458,
-        "narHash": "sha256-Dbh1r86X0uNx8keTkdg+uzq4/+DHm+IiTuxrHXlklXA=",
+        "narHash": "sha256-wAK9GX2au7bCw2pQB2cYJp1U9bOuS44bKKlLgBURD5c=",
         "owner": "namjaejeon",
         "repo": "linux-ntfs",
-        "rev": "9e031cf453d8b3c226aac7cb7105af46efd79690",
+        "rev": "5893a4b30e4a821348ab158f594f2c3c9409694e",
         "type": "github"
       },
       "original": {
@@ -341,11 +341,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1779099457,
+        "lastModified": 1779258371,
-        "narHash": "sha256-u73aVD/lUmmT3JV+kPDztl7zPwQKd0eobD1AbJltaGs=",
+        "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "8792fab9d4a6454a9201675f01326f827ce35ead",
+        "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77",
         "type": "github"
       },
       "original": {
@@ -357,11 +357,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778869304,
+        "lastModified": 1779560665,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
         "type": "github"
       },
       "original": {

home-modules/dev.nix

@@ -13,17 +13,32 @@
       };
     };
 
-    programs.vscode = {
+    # programs.vscode = {
+    #   enable = true;
+    #   profiles.default.extensions = [
+    #     pkgs.vscode-extensions.github.copilot
+    #     pkgs.vscode-extensions.github.copilot-chat
+    #     pkgs.vscode-extensions.arrterian.nix-env-selector
+    #     pkgs.vscode-extensions.jnoortheen.nix-ide
+    #   ];
+    #   # profiles.default.userSettings = {
+    #   #   "claudeCode.claudeProcessWrapper" = "${pkgs.claude-code}/bin/claude-code";
+    #   # };
+    #   argvSettings = {
+    #     # https://github.com/microsoft/vscode/issues/262065#issue-3328712020
+    #     disable-hardware-acceleration = osConfig.networking.hostName == "acer";
+    #     # If not set, vscode errors out when starting with "argv.json incorrect"
+    #     enable-crash-reporter = false;
+    #   };
+    # };
+
+    programs.vscodium = {
       enable = true;
-      profiles.default.extensions = [
+      profiles.default.extensions = with pkgs; [
-        pkgs.vscode-extensions.github.copilot
+        vscode-extensions.mkhl.direnv
-        pkgs.vscode-extensions.github.copilot-chat
+        vscode-extensions.jnoortheen.nix-ide
-        pkgs.vscode-extensions.arrterian.nix-env-selector
+        vscode-extensions.hashicorp.hcl
-        pkgs.vscode-extensions.jnoortheen.nix-ide
       ];
-      # profiles.default.userSettings = {
-      #   "claudeCode.claudeProcessWrapper" = "${pkgs.claude-code}/bin/claude-code";
-      # };
       argvSettings = {
         # https://github.com/microsoft/vscode/issues/262065#issue-3328712020
         disable-hardware-acceleration = osConfig.networking.hostName == "acer";
@@ -93,15 +108,15 @@
       # `programs.ssh.matchBlocks."*"`.
       enableDefaultConfig = false;
 
-      matchBlocks."*" = {
+      settings."*" = {
-        user = "root";
+        User = "root";
-        controlMaster = "auto";
+        ControlMaster = "auto";
-        controlPersist = "3600";
+        ControlPersist = "3600";
-        controlPath = "/run/user/%i/ssh-socket-%r@%h:%p";
+        ControlPath = "/run/user/%i/ssh-socket-%r@%h:%p";
-        serverAliveInterval = 20;
+        ServerAliveInterval = 20;
       };
 
-      matchBlocks."github.com".user = "git";
+      settings."github.com".User = "git";
 
       extraConfig = ''
         Include config_local

modules/system/zfs.nix

@@ -32,5 +32,6 @@
         RemainAfterExit = true;
       };
     };
+    boot.zfs.forceImportRoot = false; # New default in 26.11
   };
 }