From 0c990869d74b2465285b35ac54c2e0e4f5539446 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 9 Oct 2019 19:36:43 +0200
Subject: Fix mail setup error on other machines

---
 user/satoshipad.nix          | 2 --
 user/settings/satoshipay.nix | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/user/satoshipad.nix b/user/satoshipad.nix
index d5f404c6..738a5325 100644
--- a/user/satoshipad.nix
+++ b/user/satoshipad.nix
@@ -24,8 +24,6 @@
     ./settings/zsh.nix
   ];
 
-  accounts.email.accounts.satoshipay.primary = true;
-
   xsession.windowManager.i3 = {
     config = {
       assigns = {
diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix
index 822f6b6f..5d30f909 100644
--- a/user/settings/satoshipay.nix
+++ b/user/settings/satoshipay.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   inherit (pkgs) stdenv;
@@ -54,6 +54,7 @@ in
   in
   {
     inherit address;
+    primary = lib.mkDefault true;
     realName = "Alan Pearce";
     flavor = "gmail.com";
     passwordCommand = "${pkgs.python3Packages.keyring}/bin/keyring get satoshipay-google-mail ${address}";
-- 
cgit 1.4.1