diff --git a/common/packages.nix b/common/packages.nix
index 389f55a..f24079f 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -1,5 +1,6 @@
 { pkgs }: with pkgs; [
   nix-index
+  home-manager
 
   gcc
   git
diff --git a/home/home.nix b/home/home.nix
index 99f907e..682c97f 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -73,9 +73,29 @@
   #  /etc/profiles/per-user/benson/etc/profile.d/hm-session-vars.sh
   #
   home.sessionVariables = {
-    # EDITOR = "emacs";
+    EDITOR = "emacsclient";
   };
 
   # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
+  programs = {
+    home-manager.enable = true;
+    git = {
+      enable = true;
+      userName = "Benson Chu";
+      userEmail = "bensonchu457@gmail.com";
+      extraConfig = {
+        core = {
+          editor = "emacsclient";
+        };
+      };
+    };
+  };
+
+  services = {
+    mbsync = {
+      enable = true;
+      # frequency = "*:0/10";
+      verbose = true;
+    };
+  };
 }