1
0
Fork 0

Fix rbw usage

This commit is contained in:
Malte 2023-03-15 22:04:42 +01:00
parent ccbff07715
commit 9bf7453a50
5 changed files with 16 additions and 5 deletions

View file

@ -167,7 +167,7 @@
) )
( (
pkgs.writeShellScriptBin "print-ssh-pw" 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) pkgs.writeShellScriptBin "dingdingding" (builtins.readFile ./signal.sh)
@ -178,7 +178,7 @@
BROWSER = "firefox"; BROWSER = "firefox";
SUDO_ASKPASS = toString ( SUDO_ASKPASS = toString (
pkgs.writeShellScript "print-sudo-pw" 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}"
); );
}; };
}; };

View file

@ -33,7 +33,7 @@ in {
mail2rss = { mail2rss = {
Unit.Description = "Mail to rss exporter"; Unit.Description = "Mail to rss exporter";
Service = { 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"; ExecStart = "${mail2rss}/bin/mail2rss";
Type = "oneshot"; Type = "oneshot";
}; };

View file

@ -48,7 +48,7 @@
if (type == "caldav") if (type == "caldav")
then { then {
inherit username; 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; read_only = readOnly;
} }
else {} else {}

View file

@ -34,6 +34,8 @@ in {
pkgs.networkmanagerapplet # For when the gnome dialog sucks in asking for a wifi password. pkgs.networkmanagerapplet # For when the gnome dialog sucks in asking for a wifi password.
]; ];
services.fprintd.enable = true;
networking = { networking = {
hostName = "apollo"; hostName = "apollo";
domain = "m-0.eu"; domain = "m-0.eu";

View file

@ -12,7 +12,16 @@ in {
description = "maralorn"; description = "maralorn";
isNormalUser = true; isNormalUser = true;
uid = 1000; uid = 1000;
extraGroups = ["wheel" "systemd-journal" "networkmanager" "docker" "video" "adbusers" "dialout"]; extraGroups = [
"wheel"
"systemd-journal"
"networkmanager"
"docker"
"video"
"keys"
"adbusers"
"dialout"
];
inherit openssh passwordFile; inherit openssh passwordFile;
}; };
root = {inherit openssh passwordFile;}; root = {inherit openssh passwordFile;};