diff --git a/flake.nix b/flake.nix
index 37c0869..d39d8bd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,11 +62,18 @@
       };
 
       terre-neuvas = nixpkgs-stable.lib.nixosSystem {
-        specialArgs = { inherit agenix; };
+        specialArgs = { inherit agenix; inherit nvim-config; };
         system = "x86_64-linux";
         modules = [
           ./hosts/terre-neuvas/configuration.nix
           home-manager-stable.nixosModules.home-manager
+          {
+            home-manager = {
+              useGlobalPkgs = true ;
+              useUserPackages = true ;
+              extraSpecialArgs = {inherit nvim-config; };
+            };
+          }
           agenix.nixosModules.default
         ];
       };
diff --git a/hm/common/git.nix b/hm/common/git.nix
index 897afa0..770d55d 100644
--- a/hm/common/git.nix
+++ b/hm/common/git.nix
@@ -1,14 +1,20 @@
-_:
+{ lib, config,  ...}:
 let
 globals = import ../../config/globals.nix;
+nixosRelease = lib.attrByPath [ "system" "nixos" "release" ] "0.0" config;
+newGit = lib.versionAtLeast nixosRelease "25.11";
 in {
-  programs.git = {
+  programs.git = if newGit then {
     enable = true;
     settings.user = {
       name = globals.admin.name;
       email = globals.admin.email;
+      };
+    } else {
+      enable = true;
+      userName = globals.admin.name;
+      userEmail = globals.admin.email;
     };
-  };
 }
 # vim: set ts=2 sw=2 sts=2 et :