treewide: fix evaluation warnings

users/jordan/common/git.nix

@@ -17,6 +17,9 @@
         email = "jordan@vimium.com";
         name = "Jordan Holt";
       };
+      rebase.autosquash = true;
+      push.default = "current";
+      pull.rebase = true;
     };
     ignores = [
       ".Trash-*"
@@ -37,10 +40,5 @@
       key = "B8CFFF61F1CCF520";
       signByDefault = true;
     };
-    extraConfig = {
-      rebase.autosquash = true;
-      push.default = "current";
-      pull.rebase = true;
-    };
   };
 }

users/jordan/common/shell.nix

@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  config,
   ...
 }:
 let
@@ -19,7 +20,7 @@ in
         strategy = [ "completion" ];
       };
       defaultKeymap = "viins";
-      dotDir = ".config/zsh";
+      dotDir = "${config.xdg.configHome}/zsh";
       enableCompletion = true;
       enableVteIntegration = true;