diff --git a/flake.nix b/flake.nix
index 53e5f9e..116e3a3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -63,18 +63,18 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
     nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixpkgs.url = "nixpkgs/nixos-25.05";
+    nixpkgs.url = "nixpkgs/nixos-25.11";
 
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
 
     # nixpkgs-master.url = "nixpkgs";
 
     nixvim = {
-      url = "github:nix-community/nixvim/nixos-25.05";
+      url = "github:nix-community/nixvim/nixos-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/hosts/common.nix b/hosts/common.nix
index c35aeaf..318047d 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -124,7 +124,7 @@
     useGlobalPkgs = true;
     useUserPackages = true;
     sharedModules = [
-      inputs.nixvim.homeManagerModules.nixvim
+      inputs.nixvim.homeModules.nixvim
       {
         home.stateVersion = config.system.stateVersion;
       }
diff --git a/hosts/odyssey/home-assistant/default.nix b/hosts/odyssey/home-assistant/default.nix
index 70ea937..de6941f 100644
--- a/hosts/odyssey/home-assistant/default.nix
+++ b/hosts/odyssey/home-assistant/default.nix
@@ -124,13 +124,13 @@
       "folder_watcher"
       "forecast_solar"
       "frontend"
-      "gdacs"
+      # "gdacs"
       "generic"
       "generic_hygrostat"
       "generic_thermostat"
       "geo_json_events"
       "geo_location"
-      "geo_rss_events"
+      # "geo_rss_events"
       "github"
       "group"
       "hardware"
diff --git a/users/jordan/artemis.nix b/users/jordan/artemis.nix
index b451c5b..250245b 100644
--- a/users/jordan/artemis.nix
+++ b/users/jordan/artemis.nix
@@ -12,7 +12,7 @@
   ];
 
   home.packages = with pkgs; [
-    jellyfin-media-player
+    # jellyfin-media-player
     unstable.lutris
     pcsx2
     xemu
diff --git a/users/jordan/atlas.nix b/users/jordan/atlas.nix
index 5cbe984..c99a7cf 100644
--- a/users/jordan/atlas.nix
+++ b/users/jordan/atlas.nix
@@ -10,7 +10,7 @@
   ];
 
   home.packages = with pkgs; [
-    jellyfin-media-player
+    # jellyfin-media-player
     qbittorrent
   ];
 }
diff --git a/users/jordan/common/git.nix b/users/jordan/common/git.nix
index 7dd97e4..a4ae2dc 100644
--- a/users/jordan/common/git.nix
+++ b/users/jordan/common/git.nix
@@ -5,12 +5,18 @@
 {
   programs.git = {
     enable = true;
-    aliases = {
-      amend = "commit --amend";
-      lg = "log --color --graph --abbrev-commit --";
-      ls = "ls-files";
-      unadd = "reset HEAD";
-      undo-commit = "reset --soft \"HEAD^\"";
+    settings = {
+      aliases = {
+        amend = "commit --amend";
+        lg = "log --color --graph --abbrev-commit --";
+        ls = "ls-files";
+        unadd = "reset HEAD";
+        undo-commit = "reset --soft \"HEAD^\"";
+      };
+      user = {
+        email = "jordan@vimium.com";
+        name = "Jordan Holt";
+      };
     };
     ignores = [
       ".Trash-*"
@@ -27,8 +33,6 @@
       "[._]*.un~"
       "cmake-build-*/"
     ];
-    userEmail = "jordan@vimium.com";
-    userName = "Jordan Holt";
     signing = {
       key = "B8CFFF61F1CCF520";
       signByDefault = true;
diff --git a/users/jordan/common/neovim.nix b/users/jordan/common/neovim.nix
index f40c966..47506db 100644
--- a/users/jordan/common/neovim.nix
+++ b/users/jordan/common/neovim.nix
@@ -176,9 +176,9 @@
 
     plugins.treesitter-refactor = {
       enable = true;
-      highlightDefinitions = {
+      settings.highlight_definitions = {
         enable = true;
-        clearOnCursorMove = false;
+        clear_on_cursor_move = false;
       };
     };
 
diff --git a/users/jordan/common/ssh.nix b/users/jordan/common/ssh.nix
index b5bae23..c745156 100644
--- a/users/jordan/common/ssh.nix
+++ b/users/jordan/common/ssh.nix
@@ -7,7 +7,7 @@
 
   programs.ssh = {
     enable = true;
-    addKeysToAgent = "yes";
+    matchBlocks."*".addKeysToAgent = "yes";
   };
 
   home.persistence."/state".files = [
diff --git a/users/jordan/helios.nix b/users/jordan/helios.nix
index 80c61bd..402666e 100644
--- a/users/jordan/helios.nix
+++ b/users/jordan/helios.nix
@@ -14,6 +14,6 @@
   programs.nh.enable = true;
 
   home.packages = with pkgs; [
-    jellyfin-media-player
+    # jellyfin-media-player
   ];
 }
diff --git a/users/jordan/odyssey.nix b/users/jordan/odyssey.nix
index 4044016..4d1ed62 100644
--- a/users/jordan/odyssey.nix
+++ b/users/jordan/odyssey.nix
@@ -22,7 +22,7 @@
     gimp
     handbrake
     inkscape
-    jellyfin-media-player
+    # jellyfin-media-player
     krita
     unstable.lutris
     mkvtoolnix