Compare commits
No commits in common. "9accabdc6a7bb8978e3542f09dc142dd3ceb8ee5" and "42ed7abf8a1da65317a16e3feb9f42259707171d" have entirely different histories.
9accabdc6a
...
42ed7abf8a
|
@ -56,7 +56,6 @@
|
||||||
];
|
];
|
||||||
local-zone = [
|
local-zone = [
|
||||||
"\"b12f.io\" transparent"
|
"\"b12f.io\" transparent"
|
||||||
"\"pub.solar\" transparent"
|
|
||||||
];
|
];
|
||||||
local-data = [
|
local-data = [
|
||||||
"\"stroopwafel.b12f.io. 10800 IN A 10.13.12.5\""
|
"\"stroopwafel.b12f.io. 10800 IN A 10.13.12.5\""
|
||||||
|
@ -107,8 +106,6 @@
|
||||||
"\"h${"w" + "dz" + "z.n"}et. 10800 IN AAAA fd00:b12f:acab:1312:acab:7::\""
|
"\"h${"w" + "dz" + "z.n"}et. 10800 IN AAAA fd00:b12f:acab:1312:acab:7::\""
|
||||||
"\"mail.h${"w" + "dz" + "z.n"}et. 10800 IN A 10.13.12.7\""
|
"\"mail.h${"w" + "dz" + "z.n"}et. 10800 IN A 10.13.12.7\""
|
||||||
"\"mail.h${"w" + "dz" + "z.n"}et. 10800 IN AAAA fd00:b12f:acab:1312:acab:7::\""
|
"\"mail.h${"w" + "dz" + "z.n"}et. 10800 IN AAAA fd00:b12f:acab:1312:acab:7::\""
|
||||||
|
|
||||||
"\"mezza.git.pub.solar. 10800 IN CNAME git.pub.solar\""
|
|
||||||
];
|
];
|
||||||
|
|
||||||
tls-cert-bundle = "/etc/ssl/certs/ca-certificates.crt";
|
tls-cert-bundle = "/etc/ssl/certs/ca-certificates.crt";
|
||||||
|
|
|
@ -137,16 +137,6 @@ in {
|
||||||
address = mkEmailAddress "crew" "pub.solar";
|
address = mkEmailAddress "crew" "pub.solar";
|
||||||
host = "mail.pub.solar";
|
host = "mail.pub.solar";
|
||||||
}
|
}
|
||||||
{
|
|
||||||
address = mkEmailAddress "mail" "momo.koeln";
|
|
||||||
host = "mail.momo.koeln";
|
|
||||||
emptysignature = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
address = mkEmailAddress "admins" "momo.koeln";
|
|
||||||
host = "mail.momo.koeln";
|
|
||||||
emptysignature = true;
|
|
||||||
}
|
|
||||||
# {
|
# {
|
||||||
# address = mkEmailAddress "benjamin.yule.baedorf" "verkstedt.com";
|
# address = mkEmailAddress "benjamin.yule.baedorf" "verkstedt.com";
|
||||||
# flavor = "gmail";
|
# flavor = "gmail";
|
||||||
|
@ -182,7 +172,6 @@ in {
|
||||||
programs.msmtp.enable = true;
|
programs.msmtp.enable = true;
|
||||||
programs.neomutt = {
|
programs.neomutt = {
|
||||||
enable = true;
|
enable = true;
|
||||||
sort = "reverse-threads";
|
|
||||||
binds = [
|
binds = [
|
||||||
# Moving around
|
# Moving around
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,21 +32,16 @@ in {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
IdentitiesOnly yes
|
IdentitiesOnly yes
|
||||||
|
IdentityFile /home/${psCfg.user.name}/.ssh/id_yubi_gpg.pub
|
||||||
|
IdentityFile /home/${psCfg.user.name}/.ssh/id_ed25519_mezza
|
||||||
|
IdentityFile /home/${psCfg.user.name}/.ssh/id_ed25519_sk-464
|
||||||
|
IdentityFile /home/${psCfg.user.name}/.ssh/id_ed25519_sk-485
|
||||||
'';
|
'';
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
"* !mezza.git.pub.solar".extraOptions = {
|
|
||||||
IdentityFile = "/home/${psCfg.user.name}/.ssh/id_yubi_gpg.pub";
|
|
||||||
};
|
|
||||||
|
|
||||||
"git.pub.solar" = {
|
"git.pub.solar" = {
|
||||||
user = "gitea";
|
user = "gitea";
|
||||||
};
|
};
|
||||||
|
|
||||||
"mezza.git.pub.solar" = {
|
|
||||||
user = "gitea";
|
|
||||||
identityFile = "/home/${psCfg.user.name}/.ssh/id_ed25519_mezza";
|
|
||||||
};
|
|
||||||
|
|
||||||
"aur.archlinux.org" = {
|
"aur.archlinux.org" = {
|
||||||
user = "aur";
|
user = "aur";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue