updates, adguard and notmuch fixes

This commit is contained in:
Rouven Seifert 2023-04-30 21:50:47 +02:00
parent 138f05a468
commit a9cfb32b12
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
3 changed files with 52 additions and 22 deletions

View file

@ -23,11 +23,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682759296, "lastModified": 1682779989,
"narHash": "sha256-FgBfP1e+TnED0lT3L9G6KJ6j07xQElFMRdLIsmKQ0Ss=", "narHash": "sha256-H8AjcIBYFYrlRobYJ+n1B+ZJ6TsaaeZpuLn4iRqVvr4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "27d89b49e3cd3c83b9609a6ff9173a9b8d2d9ad4", "rev": "3144311f31194b537808ae6848f86f3dbf977d59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -46,11 +46,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682757268, "lastModified": 1682813751,
"narHash": "sha256-ezHDCHqgGroygZ6gcwK0oREX6blYsA53QmTwbxFninc=", "narHash": "sha256-gwR5vd1rVD6W/3BXbVohrfZKKOhPtp66vthGIG9758Y=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "ce6c13f86b71740b782af44f1b49bdecdf822d1c", "rev": "02312cac59e8b22a823043ef64a34bc9cf0eef02",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -162,11 +162,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1680876084, "lastModified": 1682836095,
"narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", "narHash": "sha256-PdzpJhuXBz71AgWNWMMYLbB8GMMce6QguhQY/6HOOcc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", "rev": "e4a21ddcb45ee5f5c85a5d9e9698debf77fb98c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +208,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1682173319, "lastModified": 1682817260,
"narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=", "narHash": "sha256-kFMXzKNj4d/0Iqbm5l57rHSLyUeyCLMuvlROZIuuhvk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c", "rev": "db1e4eeb0f9a9028bcb920e00abbc1409dd3ef36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -224,11 +224,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1682692304, "lastModified": 1682786779,
"narHash": "sha256-9/lyXN2BpHw+1xE+D2ySBSLMCHWqiWu5tPHBMRDib8M=", "narHash": "sha256-m7QFzPS/CE8hbkbIVK4UStihAQMtczr0vSpOgETOM1g=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "937a9d1ee7b1351d8c55fff6611a8edf6e7c1c37", "rev": "08e4dc3a907a6dfec8bb3bbf1540d8abbffea22b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -281,11 +281,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1682539132, "lastModified": 1682823324,
"narHash": "sha256-djX/Vp1snR1XHyk400HKCfwWVoLBE8uiQalTXMH7Kj0=", "narHash": "sha256-KNu3OAqVyoKwnDP+gqptjQYCnZXxEwXccR89c0r1/8k=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4a330ead6a990365c9bb48f30523ac048fb6d8ae", "rev": "4f308f76633f81253a12b80e7b05b80d325005b2",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,7 +1,7 @@
{ ... }: { ... }:
{ {
networking.firewall.allowedTCPPorts = [53]; networking.firewall.allowedTCPPorts = [ 53 ];
networking.firewall.allowedUDPPorts = [53]; networking.firewall.allowedUDPPorts = [ 53 ];
services.adguardhome = { services.adguardhome = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;

View file

@ -225,7 +225,25 @@ in
}; };
}; };
msmtp.enable = true; msmtp.enable = true;
notmuch.enable = true; # notmuch.enable = true;
notmuch = {
enable = true;
neomutt = {
enable = true;
virtualMailboxes = [
# we have to put ALL of our virtual mailboxes into the primary account
# TODO make an issue
{
name = "IFSR-Unread";
query = "folder:iFSR/Inbox tag:unread";
}
{
name = "Gmail-Unread";
query = "folder:gmail/Inbox tag:unread";
}
];
};
};
neomutt = let c = mbsync.groups.ifsr.channels; in neomutt = let c = mbsync.groups.ifsr.channels; in
{ {
enable = true; enable = true;
@ -284,7 +302,19 @@ in
}; };
}; };
msmtp.enable = true; msmtp.enable = true;
notmuch.enable = true; # notmuch.enable = true;
notmuch = {
enable = true;
neomutt = {
enable = true;
virtualMailboxes = [
{
name = "gmail-Unread";
query = "tag:unread";
}
];
};
};
neomutt = let c = mbsync.groups.gmail.channels; in neomutt = let c = mbsync.groups.gmail.channels; in
{ {
enable = true; enable = true;