diff --git a/flake.lock b/flake.lock
index 4b0a963..214bbb1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -45,32 +45,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1764866045,
-        "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
+        "lastModified": 1789267039,
+        "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
+        "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764831616,
-        "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=",
+        "lastModified": 1789114715,
+        "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4",
+        "rev": "21a67dc470149f337cecafbe965d8d252a390518",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 012818a..51a36b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,14 +5,14 @@
     nixpkgs = {
       # N.B. we use the nixos-x branch as this is updated *after* successful hydra builds
       # rather than release-x. See https://wiki.nixos.org/wiki/Channel_branches
-      url = "github:nixos/nixpkgs/nixos-25.11";
+      url = "github:nixos/nixpkgs/nixos-26.05";
     };
     nixpkgs-unstable = {
       url = "github:nixos/nixpkgs";
     };
     # Other modules
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils.url = "github:numtide/flake-utils";
diff --git a/home/default.nix b/home/default.nix
index 94480a6..5ce58bc 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -110,7 +110,7 @@ in
       enableDefaultConfig = false;
       package = pkgs.openssh; # Use modern ssh
       includes = [ "~/.ssh/config.local" ];
-      matchBlocks."*" = {
+      settings."Host *" = {
         user = "samw";
         serverAliveInterval = 30;
         serverAliveCountMax = 10;
diff --git a/home/macs.nix b/home/macs.nix
index 7e4a1f6..409866a 100644
--- a/home/macs.nix
+++ b/home/macs.nix
@@ -1,6 +1,5 @@
 {
   pkgs,
-  lib,
   ...
 }:
 {
@@ -14,11 +13,7 @@
     "/Applications/Sublime Merge.app/Contents/SharedSupport/bin"
   ];
   # Use secretive for SSH agent
-  programs.ssh.matchBlocks.all = lib.mkIf pkgs.stdenv.isDarwin {
-    host = "*";
-    extraOptions."IdentityAgent" =
-      "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
-  };
+  programs.ssh.settings."Host *".IdentityAgent = "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
   programs.zsh.sessionVariables = {
     SSH_AUTH_SOCK = "$HOME/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
     # Make connection muxing permission work.
diff --git a/home/vim.nix b/home/vim.nix
index af42a70..eb11ca3 100644
--- a/home/vim.nix
+++ b/home/vim.nix
@@ -12,18 +12,23 @@
     enable = true;
     viAlias = true;
     vimAlias = true;
+
+    # defaults changed from true in 26.05
+    withRuby = false; 
+    withPython3 = false;
+
     plugins = with pkgs.vimPlugins; [
       # Basic stuff
       vim-sensible
       vim-noctu # 16color colorscheme
       gruvbox-nvim
-      fzfWrapper # The basic "built in" fzf stuff
+      fzf-wrapper # The basic "built in" fzf stuff
       fzf-vim # The fancier opt in fzf stuff
       # The only language plugin you always need... because if it's running nixos you
       # *will* be editing nix files!
       vim-nix
       # Git stuff
-      fugitive
+      vim-fugitive
       vim-gitgutter
       # More stuff idk
       emmet-vim
diff --git a/home/vscode.nix b/home/vscode.nix
index 521680b..28c1562 100644
--- a/home/vscode.nix
+++ b/home/vscode.nix
@@ -1,8 +1,7 @@
 { pkgs, ... }:
 {
-  programs.vscode = {
+  programs.vscodium = {
     enable = true;
-    package = pkgs.vscodium;
     mutableExtensionsDir = false;
     profiles.default.extensions = with pkgs.vscode-extensions; [
       rust-lang.rust-analyzer