mail accout improvements

This commit is contained in:
Rouven Seifert 2023-03-06 15:05:35 +01:00
parent a5164282fa
commit 223b570ba6
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
4 changed files with 55 additions and 39 deletions

View file

@ -64,11 +64,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1678006026, "lastModified": 1678019241,
"narHash": "sha256-cGOfrU7JsKHAWXbPVDTOu2yyMb7GeWdUtJQNQSqht+w=", "narHash": "sha256-ntj0u3guaIu9dT8aZ3HtnEVhIsibtM7EaG/2VteKaTw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "68ba59578352815ac372b17fb3df9db39afb1407", "rev": "e314f6cf211e480ab8fa101a017e593a9bb9f21b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,11 +91,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1677946956, "lastModified": 1678093429,
"narHash": "sha256-5kzTfzNVzN/VOssGfNko5O2BTYciWSKlqb+q7oX1lh4=", "narHash": "sha256-TDegkSVDSTwOi9j1tc84xiIctxYwgt4kBLfKu88cjlQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "5184b542b1f505c90f9ef4715ae949ac45b2b7ef", "rev": "4f647a8e8be78d3817f126e41940bef49e81232e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -165,11 +165,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1677949148, "lastModified": 1678095239,
"narHash": "sha256-dEdcn+UYs8TUK3VTNCQk9TsJapJLEq50A4q7eC3/PTU=", "narHash": "sha256-4F6jovFJcwh6OkMsY94ZrHdrvVqZi1FX5pYv6V9LIQw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d63e86cbed3d399c4162594943bd8c1d8392e550", "rev": "f6610997b0fc5ea5f9e142c348fca27497efe1c7",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -113,14 +113,21 @@
user = "libvirtd"; user = "libvirtd";
}; };
}; };
services.logind = { services.logind = {
lidSwitch = "suspend-then-hibernate"; lidSwitch = "suspend-then-hibernate";
lidSwitchDocked = "suspend-then-hibernate"; lidSwitchDocked = "suspend-then-hibernate";
lidSwitchExternalPower = "suspend"; lidSwitchExternalPower = "suspend";
extraConfig = '' extraConfig = ''
HandlePowerKey = ignore HandlePowerKey = ignore
''; '';
};
services.tlp = {
enable = true;
settings = {
START_CHARGE_THRESH_BAT0 = 70;
STOP_CHARGE_THRESH_BAT0 = 85;
};
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View file

@ -1,13 +1,13 @@
{ config, pkgs, ... }: { config, pkgs, lib, ... }:
let let
gpg-default-key = "116987A8DD3F78FF8601BF4DB95E8FE6B11C4D09"; gpg-default-key = "116987A8DD3F78FF8601BF4DB95E8FE6B11C4D09";
in in
{ {
sops.secrets = { sops.secrets = {
"email/rfive" = {}; "email/rfive" = { };
"email/tu-dresden" = {}; "email/tu-dresden" = { };
"email/ifsr" = {}; "email/ifsr" = { };
"email/google" = {}; "email/google" = { };
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
imv imv
@ -91,13 +91,14 @@ in
}; };
}; };
}; };
neomutt = { neomutt = let c = mbsync.groups.rfive.channels; in
enable = true; {
mailboxName = " 󰒋 rfive.de"; enable = true;
extraMailboxes = [ "Sent" "Trash" "Junk" "Drafts" ]; mailboxName = " 󰒋 rfive.de";
}; extraMailboxes = lib.lists.forEach [ c.sent c.trash c.junk c.drafts ] (x: x.nearPattern);
};
}; };
"TU-Dresden" = { "TU-Dresden" = rec {
address = "rouven.seifert@mailbox.tu-dresden.de"; address = "rouven.seifert@mailbox.tu-dresden.de";
gpg.key = gpg-default-key; gpg.key = gpg-default-key;
realName = "Rouven Seifert"; realName = "Rouven Seifert";
@ -155,13 +156,14 @@ in
}; };
}; };
msmtp.enable = true; msmtp.enable = true;
neomutt = { neomutt = let c = mbsync.groups.tud.channels; in
enable = true; {
mailboxName = " TU Dresden"; enable = true;
extraMailboxes = [ "Opal" "Sent" "Trash" "Junk" "Drafts" ]; mailboxName = " TU Dresden";
}; extraMailboxes = lib.lists.forEach [ c.opal c.sent c.trash c.junk c.drafts ] (x: x.nearPattern);
};
}; };
"iFSR" = { "iFSR" = rec {
address = "rouven.seifert@ifsr.de"; address = "rouven.seifert@ifsr.de";
primary = true; primary = true;
gpg.key = gpg-default-key; gpg.key = gpg-default-key;
@ -188,6 +190,11 @@ in
farPattern = "INBOX"; farPattern = "INBOX";
extraConfig.Create = "near"; extraConfig.Create = "near";
}; };
channels.admin = {
nearPattern = "Admin spam";
farPattern = "Admin spam";
extraConfig.Create = "near";
};
channels.trash = { channels.trash = {
nearPattern = "Trash"; nearPattern = "Trash";
farPattern = "Trash"; farPattern = "Trash";
@ -198,7 +205,6 @@ in
farPattern = "Sent"; farPattern = "Sent";
extraConfig.Create = "near"; extraConfig.Create = "near";
}; };
# There is a lot of spam around, maybe we should not include that folder
channels.junk = { channels.junk = {
nearPattern = "Junk"; nearPattern = "Junk";
farPattern = "Public/Spam"; farPattern = "Public/Spam";
@ -217,10 +223,11 @@ in
}; };
}; };
msmtp.enable = true; msmtp.enable = true;
neomutt = { neomutt = let c = mbsync.groups.ifsr.channels; in
{
enable = true; enable = true;
mailboxName = " iFSR"; mailboxName = " iFSR";
extraMailboxes = [ "Sent" "Trash" "Drafts" ]; extraMailboxes = lib.lists.forEach [ c.admin c.sent c.trash c.junk c.drafts ] (x: x.nearPattern);
}; };
}; };
"gmail" = rec { "gmail" = rec {
@ -240,7 +247,7 @@ in
enable = true; enable = true;
create = "maildir"; create = "maildir";
expunge = "both"; expunge = "both";
groups.googlemail = { groups.gmail = {
channels.inbox = { channels.inbox = {
nearPattern = "INBOX"; nearPattern = "INBOX";
farPattern = "INBOX"; farPattern = "INBOX";
@ -274,10 +281,11 @@ in
}; };
}; };
msmtp.enable = true; msmtp.enable = true;
neomutt = { neomutt = let c = mbsync.groups.gmail.channels; in
{
enable = true; enable = true;
mailboxName = " 󰊫 gmail"; mailboxName = " 󰊫 gmail";
extraMailboxes = [ "Sent" "Trash" "Junk" "Drafts" ]; extraMailboxes = lib.lists.forEach [ c.sent c.trash c.junk c.drafts ] (x: x.nearPattern);
}; };
}; };
}; };

View file

@ -11,4 +11,5 @@
}; };
}; };
}; };
systemd.user.services.spotifyd.Unit.After = [ "sops-nix.service" ];
} }