3 files changed, 10 insertions, 31 deletions
diff --git a/modules/private/default.example.nix b/modules/private/default.example.nix
deleted file mode 100644
index e5b1a84..0000000
--- a/modules/private/default.example.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, ... }:
-
-{
-  # This file is a template for modules/private/default.nix
-  # Copy to modules/private/default.nix and fill in your secrets.
-
-  imports = [
-    ./git.nix
-    ./email.nix
-  ];
-}
diff --git a/modules/private/email.example.nix b/modules/private/email.example.nix
index ae3b475..0e35e26 100644
--- a/modules/private/email.example.nix
+++ b/modules/private/email.example.nix
@@ -1,16 +1,14 @@
 { config, ... }:
 
-let
-  mailDir = "${config.home.homeDirectory}/.local/mail";
-in
 {
-  accounts.email.accounts = {
+  config.accounts.email.accounts = {
     "example" = {
       realName = "Example User";
       address = "user@example.com";
       userName = "user@example.com";
       passwordCommand = "${config.programs.gopass.package}/bin/gopass show -o mail/example";
       flavor = "gmail.com";
+      primary = true;
 
       mbsync = {
         enable = true;
@@ -28,16 +26,4 @@ in
       imapnotify.enable = false;
     };
   };
-
-  # Mbsync config
-  programs.mbsync = {
-    enable = true;
-    directory = mailDir;
-  };
-
-  # Notmuch config
-  programs.notmuch = {
-    enable = true;
-    database.path = "${mailDir}/.notmuch";
-  };
 }
diff --git a/modules/private/git.example.nix b/modules/private/git.example.nix
index 888c769..70e59b4 100644
--- a/modules/private/git.example.nix
+++ b/modules/private/git.example.nix
@@ -1,8 +1,12 @@
-{ config, ... }:
+{ ... }:
 
 {
-  programs.git.signing = {
-    key = "EXAMPLE_GPG_KEY_ID";
-    signByDefault = true;
+  config.programs.git = {
+    username = "Arpit Chakladar";
+    email = "arpitchakladar+git@gmail.com";
+    signing = {
+      key = "EXAMPLE_GPG_KEY_ID";
+      signByDefault = true;
+    };
   };
 }