From 55fe810aef234a3194668653018b1d486a7d200d Mon Sep 17 00:00:00 2001
From: Trevor Vallender <trevor@tsvallender.co.uk>
Date: Fri, 24 Mar 2023 13:36:47 +0000
Subject: [PATCH] Set up aerc accounts

---
 users/tsv/aerc/accounts.conf | 18 ++++++++++++++++++
 users/tsv/aerc/aerc.conf     |  7 ++++---
 users/tsv/home.nix           |  5 +++++
 users/tsv/psqlrc             |  1 +
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 users/tsv/aerc/accounts.conf
 create mode 100644 users/tsv/psqlrc

diff --git a/users/tsv/aerc/accounts.conf b/users/tsv/aerc/accounts.conf
new file mode 100644
index 0000000..5e4bf3c
--- /dev/null
+++ b/users/tsv/aerc/accounts.conf
@@ -0,0 +1,18 @@
+[Personal]
+source   = imaps://trevor%40tsvallender.co.uk@mail.tsvallender.co.uk
+outgoing = smtps+plain://trevor%40tsvallender.co.uk@mail.tsvallender.co.uk
+default  = INBOX
+from     = Trevor Vallender <trevor@tsvallender.co.uk>
+copy-to  = Sent
+source-cred-cmd = bw get password 3138af18-75b2-4985-90ed-adfd00b18e95
+outgoing-cred-cmd = bw get password 3138af18-75b2-4985-90ed-adfd00b18e95
+
+[Foxsoft]
+source   = imaps://trevor%40foxsoft.co.uk@imap.gmail.com
+outgoing = smtps+plain://trevor%40foxsoft.co.uk@smtp.gmail.com
+default  = INBOX
+from     = Trevor Vallender <trevor@foxsoft.co.uk>
+copy-to  = Sent
+source-cred-cmd = bw get password bf0f7425-341e-4195-a17d-afca00b4dd86
+outgoing-cred-cmd = bw get password bf0f7425-341e-4195-a17d-afca00b4dd86
+
diff --git a/users/tsv/aerc/aerc.conf b/users/tsv/aerc/aerc.conf
index ae00695..702cc86 100644
--- a/users/tsv/aerc/aerc.conf
+++ b/users/tsv/aerc/aerc.conf
@@ -1,6 +1,7 @@
 
 [general]
 default-save-path=~/downloads
+unsafe-accounts-conf=true
 
 [ui]
 mouse-enabled=true
@@ -14,13 +15,13 @@ icon-invalid=⚠
 
 threading-enabled=true
 
-
 [viewer]
-pager=less -r
+pager=nvim
+alternatives=text/html,text/plain
 
 [filters]
 text/plain=colorize
 text/calendar=calendar
 message/delivery-status=colorize
 message/rfc822=colorize
-text/html=w3m -T text/html
+text/html=pandoc -f html -t markdown_strict-raw_html
diff --git a/users/tsv/home.nix b/users/tsv/home.nix
index 5eeb490..08e1041 100644
--- a/users/tsv/home.nix
+++ b/users/tsv/home.nix
@@ -22,6 +22,7 @@
     awscli2
     awsebcli
     bitwarden
+    bitwarden-cli
     cachix
     calibre
     chromium
@@ -44,6 +45,8 @@
     libreoffice
     lshw
     nerdfonts
+    pandoc
+    pspg
     ripgrep
     ruby_3_1
     rubyPackages_3_1.dip
@@ -94,6 +97,7 @@
   home.file.".bash_profile".source = ./bash_profile;
   home.file.".bashrc".source = ./bashrc;
   home.file.".tmux.conf".source = ./tmux.conf;
+  home.file.".psqlrc".source = ./psqlrc;
   home.file.".w3m/config".source = ./w3m/config;
   xdg.configFile."git/config".source = ./git/config;
   xdg.configFile."git/config_foxsoft".source = ./git/config_foxsoft;
@@ -102,6 +106,7 @@
   xdg.configFile."kitty/kitty.conf".source = ./kitty/kitty.conf;
   xdg.configFile."kitty/gruvbox_dark_soft.conf".source = ./kitty/gruvbox_dark_soft.conf;
   xdg.configFile."aerc/aerc.conf".source = ./aerc/aerc.conf;
+  xdg.configFile."aerc/accounts.conf".source = ./aerc/accounts.conf;
   home.file.".ssh/config".source = ./ssh/config;
   home.file.".LESS_TERMCAP".source = ./LESS_TERMCAP;
   services.syncthing.enable = true;
diff --git a/users/tsv/psqlrc b/users/tsv/psqlrc
new file mode 100644
index 0000000..2a28ac7
--- /dev/null
+++ b/users/tsv/psqlrc
@@ -0,0 +1 @@
+\setenv PAGER 'pspg'