From 9bf7453a507854bf14999bfd5f341eab52e91673 Mon Sep 17 00:00:00 2001
From: maralorn <mail@maralorn.de>
Date: Wed, 15 Mar 2023 22:04:42 +0100
Subject: [PATCH] Fix rbw usage

---
 home-manager/roles/default.nix          |  4 ++--
 home-manager/roles/mail2rss.nix         |  2 +-
 home-manager/roles/vdirsyncer.nix       |  2 +-
 nixos/machines/apollo/configuration.nix |  2 ++
 nixos/roles/admin.nix                   | 11 ++++++++++-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/home-manager/roles/default.nix b/home-manager/roles/default.nix
index 1e0b81fb..64407ad4 100644
--- a/home-manager/roles/default.nix
+++ b/home-manager/roles/default.nix
@@ -167,7 +167,7 @@
         )
         (
           pkgs.writeShellScriptBin "print-ssh-pw"
-          "rbw ${config.m-0.hostName}.m-0.eu ssh-key"
+          "rbw get ${config.m-0.hostName}.m-0.eu ssh-key"
         )
         (
           pkgs.writeShellScriptBin "dingdingding" (builtins.readFile ./signal.sh)
@@ -178,7 +178,7 @@
       BROWSER = "firefox";
       SUDO_ASKPASS = toString (
         pkgs.writeShellScript "print-sudo-pw"
-        "pass show eu/m-0/${config.m-0.hostName}.m-0.eu/${config.home.username}"
+        "rbw get ${config.m-0.hostName}.m-0.eu ${config.home.username}"
       );
     };
   };
diff --git a/home-manager/roles/mail2rss.nix b/home-manager/roles/mail2rss.nix
index 3524801c..47064a64 100644
--- a/home-manager/roles/mail2rss.nix
+++ b/home-manager/roles/mail2rss.nix
@@ -33,7 +33,7 @@ in {
       mail2rss = {
         Unit.Description = "Mail to rss exporter";
         Service = {
-          Environment = "PATH=${lib.makeBinPath [pkgs.coreutils config.programs.rbw.packages]}";
+          Environment = "PATH=${lib.makeBinPath [pkgs.coreutils config.programs.rbw.package]}";
           ExecStart = "${mail2rss}/bin/mail2rss";
           Type = "oneshot";
         };
diff --git a/home-manager/roles/vdirsyncer.nix b/home-manager/roles/vdirsyncer.nix
index 69423c7f..97896afc 100644
--- a/home-manager/roles/vdirsyncer.nix
+++ b/home-manager/roles/vdirsyncer.nix
@@ -48,7 +48,7 @@
         if (type == "caldav")
         then {
           inherit username;
-          "password.fetch" = ["command" (lib.getExe config.programs.rbw.package) passwordPath];
+          "password.fetch" = ["command" (lib.getExe config.programs.rbw.package) "get" passwordPath];
           read_only = readOnly;
         }
         else {}
diff --git a/nixos/machines/apollo/configuration.nix b/nixos/machines/apollo/configuration.nix
index 2b582bbe..f2307f56 100644
--- a/nixos/machines/apollo/configuration.nix
+++ b/nixos/machines/apollo/configuration.nix
@@ -34,6 +34,8 @@ in {
     pkgs.networkmanagerapplet # For when the gnome dialog sucks in asking for a wifi password.
   ];
 
+  services.fprintd.enable = true;
+
   networking = {
     hostName = "apollo";
     domain = "m-0.eu";
diff --git a/nixos/roles/admin.nix b/nixos/roles/admin.nix
index d4a63442..268e0202 100644
--- a/nixos/roles/admin.nix
+++ b/nixos/roles/admin.nix
@@ -12,7 +12,16 @@ in {
       description = "maralorn";
       isNormalUser = true;
       uid = 1000;
-      extraGroups = ["wheel" "systemd-journal" "networkmanager" "docker" "video" "adbusers" "dialout"];
+      extraGroups = [
+        "wheel"
+        "systemd-journal"
+        "networkmanager"
+        "docker"
+        "video"
+        "keys"
+        "adbusers"
+        "dialout"
+      ];
       inherit openssh passwordFile;
     };
     root = {inherit openssh passwordFile;};