diff options
| author | makefu <github@syntax-fehler.de> | 2017-07-31 19:29:03 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-07-31 19:29:03 +0200 |
| commit | 681042eedf2dbad2f999dec5cf43a018c52f2d7d (patch) | |
| tree | 0d96f8e60624f8037a1280834e47a586e71ef403 /lass/2configs | |
| parent | adace5302f92fa8e41d7c3d1fde62623328a4633 (diff) | |
| parent | 47abe1c1a28eda6d8bb90d49356ded7e0341f1ea (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/2configs')
| -rw-r--r-- | lass/2configs/exim-smarthost.nix | 3 | ||||
| -rw-r--r-- | lass/2configs/mail.nix | 9 | ||||
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 8 |
3 files changed, 19 insertions, 1 deletions
diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index fe3aa20bf..a43dfa215 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -36,6 +36,9 @@ with import <stockholm/lib>; { from = "shack@lassul.us"; to = lass.mail; } { from = "nix@lassul.us"; to = lass.mail; } { from = "c-base@lassul.us"; to = lass.mail; } + { from = "paypal@lassul.us"; to = lass.mail; } + { from = "patreon@lassul.us"; to = lass.mail; } + { from = "steam@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index 9f5e3d523..fe82fea59 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -65,8 +65,15 @@ let ''} %r |" virtual-mailboxes \ - "INBOX" "notmuch://?query=tag:inbox and NOT tag:killed"\ + "INBOX" "notmuch://?query=tag:inbox \ + and NOT tag:killed \ + and NOT to:shackspace \ + and NOT to:c-base \ + and NOT to:nix-devel"\ "Unread" "notmuch://?query=tag:unread"\ + "shack" "notmuch://?query=to:shackspace"\ + "c-base" "notmuch://?query=to:c-base"\ + "nix" "notmuch://?query=to:nix-devel"\ "TODO" "notmuch://?query=tag:TODO"\ "Starred" "notmuch://?query=tag:*"\ "Archive" "notmuch://?query=tag:archive"\ diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 3e1ad6638..b0e5375c7 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -125,6 +125,7 @@ in { { from = "dominik@apanowicz.de"; to = "dominik_a@gmx.de"; } { from = "dma@ubikmedia.de"; to = "domsen"; } { from = "dma@ubikmedia.eu"; to = "domsen"; } + { from = "bruno@apanowicz.de"; to = "bruno"; } { from = "mail@jla-trading.com"; to = "jla-trading"; } { from = "jms@ubikmedia.eu"; to = "jms"; } { from = "ms@ubikmedia.eu"; to = "ms"; } @@ -151,6 +152,13 @@ in { createHome = true; }; + users.users.bruno = { + uid = genid_signed "bruno"; + home = "/home/bruno"; + useDefaultShell = true; + createHome = true; + }; + users.users.jla-trading = { uid = genid_signed "jla-trading"; home = "/home/jla-trading"; |