aly: move secrets to home-manager config

This commit is contained in:
Aly Raffauf 2024-07-07 13:20:16 -04:00
parent d4fdcc8602
commit b084f65130
2 changed files with 7 additions and 14 deletions

View file

@ -1,19 +1,23 @@
{ {
config, config,
lib, lib,
osConfig,
pkgs, pkgs,
... ...
}: let }: let
mkPassword = secret: "${lib.getExe' pkgs.coreutils "cat"} ${secret}"; mkPassword = secret: "${lib.getExe' pkgs.coreutils "cat"} ${secret}";
in { in {
age.secrets = {
achacegaGmail.file = ../../../secrets/mail/achacega_gmail.age;
alyraffaufFastmail.file = ../../../secrets/mail/alyraffauf_fastmail.age;
};
accounts.email.accounts = { accounts.email.accounts = {
"alyraffauf@fastmail.com" = { "alyraffauf@fastmail.com" = {
address = "alyraffauf@fastmail.com"; address = "alyraffauf@fastmail.com";
aliases = ["aly@raffauflabs.com"]; aliases = ["aly@raffauflabs.com"];
flavor = "fastmail.com"; flavor = "fastmail.com";
himalaya.enable = true; himalaya.enable = true;
passwordCommand = mkPassword osConfig.age.secrets.alyraffaufFastmail.path; passwordCommand = mkPassword config.age.secrets.alyraffaufFastmail.path;
primary = true; primary = true;
realName = "Aly Raffauf"; realName = "Aly Raffauf";
@ -41,7 +45,7 @@ in {
aliases = ["alyraffauf@gmail.com"]; aliases = ["alyraffauf@gmail.com"];
flavor = "gmail.com"; flavor = "gmail.com";
himalaya.enable = true; himalaya.enable = true;
passwordCommand = mkPassword osConfig.age.secrets.achacegaGmail.path; passwordCommand = mkPassword config.age.secrets.achacegaGmail.path;
realName = "Aly Raffauf"; realName = "Aly Raffauf";
signature = { signature = {

View file

@ -5,17 +5,6 @@
... ...
}: { }: {
config = lib.mkIf config.ar.users.aly.enable { config = lib.mkIf config.ar.users.aly.enable {
age.secrets = {
alyraffaufFastmail = {
file = ../../../secrets/mail/alyraffauf_fastmail.age;
owner = "aly";
};
achacegaGmail = {
file = ../../../secrets/mail/achacega_gmail.age;
owner = "aly";
};
};
home-manager.users.aly = home-manager.users.aly =
lib.attrsets.optionalAttrs lib.attrsets.optionalAttrs
config.ar.users.aly.manageHome config.ar.users.aly.manageHome