Home Gen7 @ 2025-10-08-14:51 by admin-jroeger@T14-OE130-7-ubuntu

This commit is contained in:
Jonas Röger 2025-10-08 14:51:50 +02:00
parent b30a811d6c
commit 5532a99dd4
3 changed files with 32 additions and 15 deletions

View File

@ -190,7 +190,7 @@
isHM = true; isHM = true;
}; };
}; };
homeConfigurations."jroeger" = home-manager.lib.homeManagerConfiguration { homeConfigurations."admin-jroeger" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
# Specify your home configuration modules here, for example, # Specify your home configuration modules here, for example,
@ -201,7 +201,7 @@
inputs.plasma-manager.homeManagerModules.plasma-manager inputs.plasma-manager.homeManagerModules.plasma-manager
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
./modules ./modules
./home/jroeger.nix ./home/admin-jroeger.nix
]; ];
# Optionally use extraSpecialArgs # Optionally use extraSpecialArgs

View File

@ -1,8 +1,8 @@
{...}: { {...}: {
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should
# manage. # manage.
home.username = "jroeger"; home.username = "admin-jroeger";
home.homeDirectory = "/home/jroeger"; home.homeDirectory = "/home/admin-jroeger";
# hive modules # hive modules
hive.kitty.enable = true; hive.kitty.enable = true;

View File

@ -13,6 +13,7 @@ in {
default = "qt"; default = "qt";
description = "The pinentry flavour to use"; description = "The pinentry flavour to use";
}; };
withCCID = mkEnableOption "Use stand-aline CCID (instead of a running pcscd service)";
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@ -26,17 +27,33 @@ in {
trust = "ultimate"; trust = "ultimate";
} }
]; ];
scdaemonSettings = {
disable-ccid = !cfg.withCCID;
};
};
services.gpg-agent = {
enable = true;
enableSshSupport = true;
enableZshIntegration = true;
pinentry =
if cfg.pinentry == "gnome3"
then {
package = pkgs.pinentry-gnome3;
program = "pinentry-gnome3";
}
else if cfg.pinentry == "qt"
then {
package = pkgs.pinentry-qt;
program = "pinentry-qt";
}
else {};
sshKeys = [config.programs.git.signing.key];
};
home.sessionVariables = {
SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh";
};
systemd.user.settings.Manager.DefaultEnvironment = {
SSH_AUTH_SOCK = "/run/user/%U/gnupg/S.gpg-agent.ssh";
}; };
# services.gpg-agent = {
# enable = true;
# enableSshSupport = true;
# enableZshIntegration = true;
# };
# home.sessionVariables = {
# SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh";
# };
# systemd.user.settings.Manager.DefaultEnvironment = lib.mapAttrs (_: lib.mkDefault) {
# SSH_AUTH_SOCK = "/run/user/%U/gnupg/S.gpg-agent.ssh";
# };
}; };
} }