From ceda644fabc6db525837b0e08943d5e876572235 Mon Sep 17 00:00:00 2001
From: randomuser <randomuser@tilde.club>
Date: Sat, 10 Feb 2024 18:40:24 -0600
Subject: [PATCH] ease mail integration, also add rbw as interface for
 bitwarden

---
 boxes/mlg/default.nix   |  1 +
 boxes/x230t/default.nix |  1 +
 builds/utils.nix        |  6 +-----
 home/isync/config       |  1 +
 home/msmtp/config       | 12 ++++++++++++
 home/msmtp/default.nix  |  9 +++++++++
 home/neomutt/neomuttrc  |  2 ++
 home/rbw/default.nix    | 12 ++++++++++++
 home/vdirsyncer/config  |  4 ++--
 home/x11.nix            |  2 ++
 modules/rbw.nix         |  6 ++++++
 modules/x11.nix         |  1 +
 12 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 home/msmtp/config
 create mode 100644 home/msmtp/default.nix
 create mode 100644 home/rbw/default.nix
 create mode 100644 modules/rbw.nix

diff --git a/boxes/mlg/default.nix b/boxes/mlg/default.nix
index ce3801f..ea33de3 100644
--- a/boxes/mlg/default.nix
+++ b/boxes/mlg/default.nix
@@ -10,6 +10,7 @@
     ../../modules/x11.nix
     ../../modules/discord.nix
     ../../modules/gaming.nix
+    ../../modules/rbw.nix
   ];
 
   environment.systemPackages = with pkgs; [
diff --git a/boxes/x230t/default.nix b/boxes/x230t/default.nix
index ac8264d..665c544 100644
--- a/boxes/x230t/default.nix
+++ b/boxes/x230t/default.nix
@@ -11,6 +11,7 @@
     ../../modules/anki.nix
     ../../modules/power-control.nix
     ../../modules/adb.nix
+    ../../modules/rbw.nix
   ];
 
   environment.systemPackages = with pkgs; [
diff --git a/builds/utils.nix b/builds/utils.nix
index bf1eda2..f4e2f49 100644
--- a/builds/utils.nix
+++ b/builds/utils.nix
@@ -41,11 +41,7 @@ stdenv.mkDerivation rec {
     for i in $(ls $src/sh); do
       cp $src/sh/$i $out/bin
       ln -sf $out/bin/tmenu_run $out/bin/regenerate
-<<<<<<< HEAD
-      wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq figlet curl fzy ytfzf ffmpeg sshuttle scrcpy ]}
-=======
-      wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq figlet curl fzy ytfzf ffmpeg sshuttle svkbd libsForQt5.kolourpaint ]}
->>>>>>> f481fd5f3f58fe7ac42fb5d07703be8d59fb4502
+      wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq figlet curl fzy ytfzf ffmpeg sshuttle svkbd scrcpy libsForQt5.kolourpaint ]}
     done
 
     cp c/status/main $out/bin/statusbar
diff --git a/home/isync/config b/home/isync/config
index 341644f..16994ab 100644
--- a/home/isync/config
+++ b/home/isync/config
@@ -2,6 +2,7 @@ IMAPStore main-remote
 Host mail.beepboop.systems
 Port 993
 User ryan@beepboop.systems
+PassCmd "rbw get mail.beepboop.systems"
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
diff --git a/home/msmtp/config b/home/msmtp/config
new file mode 100644
index 0000000..1c04651
--- /dev/null
+++ b/home/msmtp/config
@@ -0,0 +1,12 @@
+defaults
+auth on
+tls on
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+
+account default
+host mail.beepboop.systems
+port 587
+tls_starttls on
+from ryan@beepboop.systems
+user ryan@beepboop.systems
+passwordeval "rbw get mail.beepboop.systems"
diff --git a/home/msmtp/default.nix b/home/msmtp/default.nix
new file mode 100644
index 0000000..14e770a
--- /dev/null
+++ b/home/msmtp/default.nix
@@ -0,0 +1,9 @@
+{ lib, config, pkgs, home, ... }:
+
+{
+  home.file = {
+    ".config/msmtp/config" = {
+      source = ./config;
+    };
+  };
+}
diff --git a/home/neomutt/neomuttrc b/home/neomutt/neomuttrc
index 47e6287..71a15c4 100644
--- a/home/neomutt/neomuttrc
+++ b/home/neomutt/neomuttrc
@@ -10,6 +10,8 @@ set sidebar_visible
 set sidebar_format = "%B%<F? [%F}>%* %<N?%N/>%S"
 set mail_check_stats
 
+set sendmail = "msmtp -a default -C /home/usr/.config/msmtp/config"
+
 set from = "ryan@beepboop.systems"
 set spoolfile = +INBOX
 set record = "+Sent"
diff --git a/home/rbw/default.nix b/home/rbw/default.nix
new file mode 100644
index 0000000..6bdb45b
--- /dev/null
+++ b/home/rbw/default.nix
@@ -0,0 +1,12 @@
+{ lib, config, pkgs, home, ... }:
+
+{
+  programs.rbw = {
+    enable = true;
+    settings = {
+      base_url = "https://bitwarden.beepboop.systems";
+      email = "bit@beepboop.systems";
+      pinentry = "curses";
+    };
+  };
+}
diff --git a/home/vdirsyncer/config b/home/vdirsyncer/config
index 32d2053..0b0b6fa 100644
--- a/home/vdirsyncer/config
+++ b/home/vdirsyncer/config
@@ -36,7 +36,7 @@ type = "carddav"
 
 url = "https://radicale.beepboop.systems/ryan/20cda0dd-5922-4905-8956-859c989a6519/"
 username = "ryan"
-password.fetch = ["prompt", "password for radicale"]
+password.fetch = ["command", "rbw", "get", "beepboop.systems radicale instance"]
 
 [storage band_calendar_remote]
 type = "http"
@@ -48,4 +48,4 @@ type = "caldav"
 
 url = "https://radicale.beepboop.systems/ryan/edfbeaf1-e9f3-4d94-a512-40cdafdbc7a0/"
 username = "ryan"
-password.fetch = ["prompt", "password for radicale"]
+password.fetch = ["command", "rbw", "get", "beepboop.systems radicale instance"]
diff --git a/home/x11.nix b/home/x11.nix
index 3e2e6c2..b919cb6 100644
--- a/home/x11.nix
+++ b/home/x11.nix
@@ -16,6 +16,8 @@
     ./isync
     ./todoman
     ./neomutt
+    ./msmtp
+    ./rbw
 
     ./x11-progs.nix
     ./tty.nix
diff --git a/modules/rbw.nix b/modules/rbw.nix
new file mode 100644
index 0000000..f7757fb
--- /dev/null
+++ b/modules/rbw.nix
@@ -0,0 +1,6 @@
+{ lib, config, pkgs, ...}:
+{
+  environment.systemPackages = with pkgs; [
+    pinentry
+  ];
+}
diff --git a/modules/x11.nix b/modules/x11.nix
index c341db3..c7e9f27 100644
--- a/modules/x11.nix
+++ b/modules/x11.nix
@@ -22,6 +22,7 @@
     todoman
     sshfs
     rsync
+    msmtp
   ];
 
   services.xserver = {