1
1
Fork 0

Compare commits

...

2 commits

Author SHA1 Message Date
1dbd2b876c
zerotierone: initial service
Signed-off-by: Myned <dev@bjork.tech>
2024-09-28 13:06:11 -05:00
71efe79cb2
pam: work around keyring not unlocking with fingerprint login
Signed-off-by: Myned <dev@bjork.tech>
2024-09-28 12:44:57 -05:00
5 changed files with 26 additions and 6 deletions

View file

@ -10,6 +10,5 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.seahorse.enable = true; programs.seahorse.enable = true;
services.gnome.gnome-keyring.enable = true;
}; };
} }

View file

@ -47,6 +47,7 @@ with lib; {
swaync.enable = true; swaync.enable = true;
swayosd.enable = true; swayosd.enable = true;
#// xembed-sni-proxy.enable = true; #// xembed-sni-proxy.enable = true;
zerotierone.enable = true;
}) })
]; ];
} }

View file

@ -8,9 +8,10 @@ with lib; let
in { in {
options.custom.services.gnome-keyring.enable = mkOption {default = false;}; options.custom.services.gnome-keyring.enable = mkOption {default = false;};
config.home-manager.users.${config.custom.username} = mkIf cfg.enable { config = mkIf cfg.enable {
# https://wiki.archlinux.org/title/GNOME/Keyring # https://wiki.archlinux.org/title/GNOME/Keyring
# https://gitlab.gnome.org/GNOME/gnome-keyring # https://gitlab.gnome.org/GNOME/gnome-keyring
services.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
home-manager.users.${config.custom.username}.services.gnome-keyring.enable = true;
}; };
} }

View file

@ -33,6 +33,9 @@ in {
}; };
}; };
# Use password at login to unlock keyring
security.pam.services.greetd.fprintAuth = false;
# Attempt to prevent bootlogs from polluting the tty # Attempt to prevent bootlogs from polluting the tty
# https://github.com/apognu/tuigreet/issues/68 # https://github.com/apognu/tuigreet/issues/68
systemd.services.greetd.serviceConfig = { systemd.services.greetd.serviceConfig = {
@ -44,8 +47,5 @@ in {
TTYVHangup = true; TTYVHangup = true;
TTYVTDisallocate = true; TTYVTDisallocate = true;
}; };
# FIXME: Does not unlock at login
security.pam.services.greetd.enableGnomeKeyring = true; # Allow PAM unlocking
}; };
} }

View file

@ -0,0 +1,19 @@
{
config,
lib,
...
}:
with lib; let
cfg = config.custom.services.zerotierone;
in {
options.custom.services.zerotierone.enable = mkOption {default = false;};
config = mkIf cfg.enable {
#!! Configuration is imperative
# https://www.zerotier.com/
# https://github.com/zerotier/ZeroTierOne
services.zerotierone = {
enable = true;
};
};
}