From 9c82b37bb66e4063cfd798e4a8e753e870170a0f Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Thu, 12 Nov 2020 17:23:45 -0800
Subject: Remove deprecated syntax

---
 linux.nix | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'linux.nix')

diff --git a/linux.nix b/linux.nix
index edbaf9c..a1b9107 100644
--- a/linux.nix
+++ b/linux.nix
@@ -3,7 +3,6 @@
 let
   homedir = builtins.getEnv "HOME";
   hostname = builtins.getEnv "HOSTNAME";
-  gitCommitTemplate = ./lib/git-commit-template;
   gpgid = "D09299626FA78AF8";
   cmdtree = pkgs.stdenv.mkDerivation {
     name = "cmdtree";
@@ -391,20 +390,17 @@ in
       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
-      '';
+      extraConfig = {
+        push.default = "simple";
+        commit.template = builtins.readFile ./lib/git-commit-template;
+        sendemail = {
+          smtpuser = "ben@bsima.me";
+          smtpserverport = 587;
+          smtpserver = "mail.bsima.me";
+          chainreplyto = false;
+          composeencoding = "UTF-8";
+        };
+      };
     };
 
     emacs = {
-- 
cgit v1.2.3