commit 9643bc8204ac1406462a4fe56d56616bccae7874
parent 211b414100ca37f9bd6aee0da1bd71a13175aae7
Author: William Casarin <jb55@jb55.com>
Date: Mon, 8 Feb 2021 09:03:09 -0800
charon: update notmuch tags and other things
Diffstat:
5 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/bin/notmuch-poll b/bin/notmuch-poll
@@ -59,8 +59,8 @@ notmuchcmd tag +lightning +clightning '(to:"ElementsProject/lightning" or to:"li
notmuchcmd tag +nix-dev +nix +list \(to:nix-dev@lists.science.uu.nl OR to:nix-dev@cs.uu.nl OR to:nix-devel@googlegroups.com OR from:nixos1@discoursemail.com\) and tag:inbox
notmuchcmd tag +redo +list to:redo-list.googlegroups.com and tag:inbox
-# filed
-notmuchcmd tag +filed '(tag:list or tag:rss or tag:busy)' and not tag:filed and not tag:best and not tag:flagged and tag:inbox
+# file busy
+notmuchcmd tag +filed tag:busy and not tag:filed and not tag:best and not tag:flagged and tag:inbox
# more contracting stuff
notmuchcmd tag +work +steamoji tag:inbox and to:steamoji
@@ -76,6 +76,6 @@ notmuchcmd tag +flagged -busy -filed tag:inbox and '(tag:list and tag:to-me) or
notmuchcmd tag +inbox -spam +flagged "bitcoin wizard" and tag:spam
# phone mail
-notmuchcmd tag -inbox tag:inbox and folder:".Archive"
+notmuchcmd tag -inbox tag:inbox and '(folder:".Archive" or folder:".Trash")'
printf "notmuch tagging done.\n"
diff --git a/nix-config/configuration.nix b/nix-config/configuration.nix
@@ -76,7 +76,7 @@ in {
documentation.nixos.enable = false;
documentation.dev.enable = true;
- documentation.man.generateCaches = true; # list manpages
+ #documentation.man.generateCaches = true; # list manpages
programs.ssh.startAgent = true;
diff --git a/nix-config/environment/default.nix b/nix-config/environment/default.nix
@@ -22,9 +22,9 @@ let jb55pkgs = import <jb55pkgs> { inherit pkgs; };
samp
sharefile
snap
- viscal
+ #viscal
zebra
- zoom-link-opener
+ #zoom-link-opener
define
];
myHaskellPackages = with pkgs.haskellPackages; [
diff --git a/nix-config/machines/charon/default.nix b/nix-config/machines/charon/default.nix
@@ -32,6 +32,14 @@ let gitExtra = {
gitCfg = extra.git-server { inherit config pkgs; extra = extra // gitExtra; };
hearpress = (import <jb55pkgs> { nixpkgs = pkgs; }).hearpress;
myemail = "jb55@jb55.com";
+ xmpp_modules = [
+ "csi"
+ "smacks"
+ "mam"
+ "cloud_notify"
+ "carbons"
+ "http_upload"
+ ];
radicale-rights = pkgs.writeText "radicale-rights" ''
[vanessa-famcal-access]
user = vanessa
@@ -105,17 +113,6 @@ in
#(import ./vidstats extra)
];
- # systemd.services.httpiped = {
- # description = "httpiped";
- # wantedBy = [ "multi-user.target" ];
- # after = [ "multi-user.target" ];
- # environment = {
- # PORT = httpipePort;
- # };
- # serviceConfig.Restart = "always";
- # serviceConfig.ExecStart = "${httpiped}/bin/httpiped";
- # };
-
services.xinetd.enable = true;
services.xinetd.services =
[
@@ -130,6 +127,7 @@ in
];
users.extraGroups.jb55cert.members = [ "prosody" "nginx" ];
+ users.extraGroups.vmail.members = [ "jb55" ];
services.gitDaemon.basePath = "/var/git-public/repos";
services.gitDaemon.enable = true;
@@ -184,11 +182,15 @@ in
security.acme.certs."sheetzen.com" = {
webroot = "/var/www/challenges";
+ group = "jb55cert";
+ allowKeysForGroup = true;
email = myemail;
};
security.acme.certs."bitcoinwizard.net" = {
webroot = "/var/www/challenges";
+ group = "jb55cert";
+ allowKeysForGroup = true;
email = myemail;
};
@@ -199,25 +201,26 @@ in
users = {
jb55 = {
password = "$6$KHmFLeDBaXBE1Jkg$eEN8HM3LpZ4muDK/JWC25qW9xSZq0AqsF4tlzEan7yctROJ9A/lSqz6gN1b1GtwE7efroXGHtDi2FEJ2ujDAl0";
- aliases = [ "postmaster" "bill" "will" "william" "me" "jb" ];
+ aliases = [ "postmaster" "bill" "will" "william" "me" "jb" "guestdaddy" ];
};
+
};
sieves = builtins.readFile ./dovecot/filters.sieve;
};
users.extraUsers.prosody.extraGroups = [ "jb55cert" ];
- services.prosody.enable = false;
+ services.prosody.enable = true;
services.prosody.admins = [ "jb55@jb55.com" ];
services.prosody.allowRegistration = false;
- services.prosody.extraModules = [
- # "cloud_notify"
- # "smacks"
- "carbons"
- # "http_upload"
- ];
+ services.prosody.extraModules = xmpp_modules;
+ services.prosody.package = pkgs.prosody.override {
+ withCommunityModules = xmpp_modules;
+ };
services.prosody.extraConfig = ''
c2s_require_encryption = true
+
+ http_upload_expire_after = 60 * 60 * 24 * 7
'';
services.prosody.ssl = {
cert = "/var/lib/acme/jb55.com/fullchain.pem";
diff --git a/nix-config/services/default.nix b/nix-config/services/default.nix
@@ -16,12 +16,12 @@ extra:
services.atd.enable = true;
- services.logrotate.enable = true;
- services.logrotate.extraConfig = ''
- dateext
- dateformat %Y-%m-%d.
- compresscmd ${pkgs.xz.bin}/bin/xz
- uncompresscmd ${pkgs.xz.bin}/bin/unxz
- compressext .xz
- '';
+ #services.logrotate.enable = false;
+ #services.logrotate.extraConfig = ''
+ # dateext
+ # dateformat %Y-%m-%d.
+ # compresscmd ${pkgs.xz.bin}/bin/xz
+ # uncompresscmd ${pkgs.xz.bin}/bin/unxz
+ # compressext .xz
+ #'';
}
