From 7278dc8306289a651d09212b172deee463590c91 Mon Sep 17 00:00:00 2001
From: John Ogle <john@ogle.fyi>
Date: Sun, 7 Dec 2025 22:17:54 -0800
Subject: [PATCH] Fix deprecated NixOS options to resolve flake check warnings

- Update system attribute to stdenv.hostPlatform.system in overlays
- Migrate git config to new settings structure (user.name, user.email)
- Move ssh.addKeysToAgent to matchBlocks configuration
- Disable ssh default config to prevent future deprecation warnings
---
 flake.nix                   |  6 +++---
 home/roles/base/default.nix | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9607294..9e8a6c8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,7 @@
         nixpkgs.overlays = [
           (final: prev: {
             unstable = import nixpkgs-unstable {
-              system = prev.system;
+              system = prev.stdenv.hostPlatform.system;
               config.allowUnfree = true;
             };
             custom = prev.callPackage ./packages {};
@@ -81,7 +81,7 @@
         nixpkgs.overlays = [
           (final: prev: {
             unstable = import nixpkgs-unstable {
-              system = prev.system;
+              system = prev.stdenv.hostPlatform.system;
               config.allowUnfree = true;
             };
             custom = prev.callPackage ./packages {};
@@ -107,7 +107,7 @@
         nixpkgs.overlays = [
           (final: prev: {
             unstable = import nixpkgs-unstable {
-              system = prev.system;
+              system = prev.stdenv.hostPlatform.system;
               config.allowUnfree = true;
               overlays = [
                 # Override claude-code in unstable to use our custom GCS-based build
diff --git a/home/roles/base/default.nix b/home/roles/base/default.nix
index 31adcae..068fed2 100644
--- a/home/roles/base/default.nix
+++ b/home/roles/base/default.nix
@@ -52,9 +52,9 @@ in
 
     programs.git = {
       enable = true;
-      userName = "John Ogle";
-      userEmail = "john@ogle.fyi";
-      extraConfig = {
+      settings = {
+        user.name = "John Ogle";
+        user.email = "john@ogle.fyi";
         safe.directory = "/etc/nixos";
       };
     };
@@ -69,8 +69,11 @@ in
 
     programs.ssh = {
       enable = true;
-      addKeysToAgent = "yes";
+      enableDefaultConfig = false;
       matchBlocks = {
+        "*" = {
+          addKeysToAgent = "yes";
+        };
         "nucdeb1" = {
           hostname = "nucdeb1.oglehome";
           user = "root";