update git config

Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>

home/programs/git/default.nix

@@ -5,8 +5,6 @@
 in {
   programs.git = {
     enable = true;
-    userName = username;
-    userEmail = email;
     ignores = [
       ".cache/"
       ".DS_Store"
@@ -19,13 +17,14 @@ in {
       "result"
       "result-*"
     ];
-    extraConfig = {
+    settings = {
+      user.name = username;
+      user.email = email;
       init.defaultBranch = "main";
       pull.rebase = "false";
       push.autoSetupRemote = true;
       color.ui = "1";
-    };
-    aliases = {
+      alias = {
         essa = "push --force";
         co = "checkout";
         fuck = "commit --amend -m";
@@ -52,4 +51,5 @@ in {
         edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
       };
     };
+  };
 }

home/programs/git/signing.nix

@@ -3,7 +3,7 @@
   # Obviously, change this to your own SSH key.
   home.file.".ssh/allowed_signers".text = "* ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINhWby7lUUXQNKbRu9/UOrGjWDf3fvoAwGHomWv/+lL";
 
-  programs.git.extraConfig = {
+  programs.git.settings = {
     commit.gpgsign = true;
     gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
     gpg.format = "ssh";