From 66d3268b80620ae1236cbfb7cbf07543061be607 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 20 Jan 2023 11:52:01 -0500 Subject: working on my email setup Change-Id: Iff7f41d9474c0a6785c3f049b7b76da75c130d81 --- lib/email.nix | 17 ++++++----------- lib/linux.nix | 5 ----- profiles/laptop.nix | 10 ++++++++++ profiles/workshop.nix | 3 ++- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/email.nix b/lib/email.nix index 23a41a3..e874dd6 100644 --- a/lib/email.nix +++ b/lib/email.nix @@ -5,11 +5,6 @@ let homedir = builtins.getEnv "HOME"; in { - #nixpkgs.overlays = [ - # (self: super: { - # notmuch = pkgs.callPackage ../pkgs/notmuch.nix {}; - # }) - #]; accounts = { email = { maildirBasePath = "${homedir}/Mail"; @@ -69,12 +64,12 @@ in extraConfig = builtins.readFile ./afew.ini; }; - #alot = { - # enable = true; - # extraConfig = '' - # theme = solarized_light - # ''; - #}; + alot = { + enable = false; + extraConfig = '' + theme = solarized_light + ''; + }; mbsync = { enable = true; diff --git a/lib/linux.nix b/lib/linux.nix index 91c0c33..ad85407 100644 --- a/lib/linux.nix +++ b/lib/linux.nix @@ -2,9 +2,6 @@ let inherit (import ./const.nix) fontSize homedir gpgid; - getHostname = pkgs.runCommand "hostname" {} - "${pkgs.hostname}/bin/hostname > $out"; - hostname = lib.strings.removeSuffix "\n" (builtins.readFile "${getHostname}"); base16-scheme = "atelier-sulphurpool"; base16-scheme-filename = lib.strings.concatStrings (lib.strings.splitString "-" base16-scheme); theme = lib.removeSuffix "\n" (builtins.readFile "${homedir}/.local/share/xtheme"); @@ -33,7 +30,6 @@ in { imports = [ ./common.nix - ./email.nix ]; home = { pointerCursor = { @@ -140,7 +136,6 @@ in keybase.enable = false; mbsync = { - enable = if hostname == "lithium" then true else false; frequency = "*:0/5"; postExec = "${pkgs.notmuch}/bin/notmuch new"; }; diff --git a/profiles/laptop.nix b/profiles/laptop.nix index 39c875c..3e25609 100644 --- a/profiles/laptop.nix +++ b/profiles/laptop.nix @@ -8,6 +8,7 @@ ../lib/emacs.nix ../lib/ssh.nix ../lib/packages.nix + ../lib/email.nix ]; home = { @@ -114,4 +115,13 @@ ]; }; }; + + services.muchsync = { + remotes = { + server = { + frequency = "*:/10"; + remote.host = "dev.simatime.com"; + }; + }; + }; } diff --git a/profiles/workshop.nix b/profiles/workshop.nix index 311aeab..9f92ea1 100644 --- a/profiles/workshop.nix +++ b/profiles/workshop.nix @@ -7,6 +7,7 @@ ../lib/ssh.nix ../lib/packages.nix ../lib/emacs.nix + ../lib/email.nix ]; home = { @@ -51,5 +52,5 @@ ''; }; - + services.mbsync.enable = true; } -- cgit v1.2.3