update to new home-manager syntax

2 files changed, 17 insertions, 13 deletions

diff --git a/home-manager/.config/home-manager/common/default.nix b/home-manager/.config/home-manager/common/default.nix
index cbfd3ef..716911a 100644
--- a/home-manager/.config/home-manager/common/default.nix
+++ b/home-manager/.config/home-manager/common/default.nix
@@ -85,22 +85,26 @@
     };
     git = {
       enable = true;
-      userName  = "Kumar Damani";
-      userEmail = "me@kumardamani.net";
-      aliases = {
-        lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
-      };
-      delta = {
-        enable = true;
-      };
-      lfs = {
-        enable = true;
-      };
-      extraConfig = {
+      settings = {
+        user = {
+          name = "Kumar Damani";
+          email = "me@kumardamani.net";
+        };
+        alias = {
+          lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
+        };
         core = { ignorecase = true; };
         push = { autoSetupRemote = true; };
         rebase = { updateRefs = true; };
       };
+      lfs = {
+        enable = true;
+      };
+      signing.format = null;
+    };
+    delta = {
+      enable = true;
+      enableGitIntegration = true;
     };
     fzf = {
       enable = true;
diff --git a/home-manager/.config/home-manager/per-user/kdamani-work/home.nix b/home-manager/.config/home-manager/per-user/kdamani-work/home.nix
index 585c798..a388e98 100644
--- a/home-manager/.config/home-manager/per-user/kdamani-work/home.nix
+++ b/home-manager/.config/home-manager/per-user/kdamani-work/home.nix
@@ -14,5 +14,5 @@
     step-cli
     teleport
   ];
-  programs.git.userEmail = lib.mkForce "kdamani@kepler.space";
+  programs.git.settings.user.email = lib.mkForce "kdamani@kepler.space";
 }