move git config out of common.nix

2 files changed, 31 insertions, 30 deletions

diff --git a/common.nix b/common.nix
index 332b308..9c54a76 100644
--- a/common.nix
+++ b/common.nix
@@ -4,7 +4,6 @@ let
   homedir = builtins.getEnv "HOME";
   locale = "en_US.UTF-8";
   gpgid = "D09299626FA78AF8";
-  gitCommitTemplate = ./git-commit-template;
 in
 {
   home = {
@@ -110,35 +109,6 @@ in
       extraConfig = builtins.readFile ./vimrc;
     };
 
-    git = {
-      enable = true;
-      userName  = "Ben Sima";
-      userEmail = "ben@bsima.me";
-      ignores = [ "*~" "*.swp" ];
-      package = pkgs.gitAndTools.gitFull;
-      signing = {
-        key = gpgid;
-        signByDefault = false;
-      };
-      aliases = {
-        authors = "shortlog -s -n";
-      };
-      extraConfig = ''
-        [push]
-        default = simple
-
-        [commit]
-        template = ${gitCommitTemplate}
-
-        [sendemail]
-        smtpuser = ben@bsima.me
-        smptserverport = 587
-        smptserver = mail.bsima.me
-        chainreplyto = false
-        composeencoding = UTF-8
-      '';
-    };
-
     bash = {
       enable = true;
       initExtra = ''
diff --git a/linux.nix b/linux.nix
index 4af1267..b7a55fc 100644
--- a/linux.nix
+++ b/linux.nix
@@ -2,6 +2,8 @@
 
 let
   homedir = builtins.getEnv "HOME";
+  gitCommitTemplate = ./git-commit-template;
+  gpgid = "D09299626FA78AF8";
   cmdtree = pkgs.stdenv.mkDerivation {
     name = "cmdtree";
     src = fetchGit {
@@ -358,6 +360,35 @@ in
   };
 
   programs = {
+    git = {
+      enable = true;
+      userName  = "Ben Sima";
+      userEmail = "ben@bsima.me";
+      ignores = [ "*~" "*.swp" ];
+      package = pkgs.gitAndTools.gitFull;
+      signing = {
+        key = gpgid;
+        signByDefault = false;
+      };
+      aliases = {
+        authors = "shortlog -s -n";
+      };
+      extraConfig = ''
+        [push]
+        default = simple
+
+        [commit]
+        template = ${gitCommitTemplate}
+
+        [sendemail]
+        smtpuser = ben@bsima.me
+        smptserverport = 587
+        smptserver = mail.bsima.me
+        chainreplyto = false
+        composeencoding = UTF-8
+      '';
+    };
+
     emacs = {
       enable = true;
       extraPackages = epkgs: import ./emacs-packages.nix { inherit epkgs; };