Switch to using pass-git-helper for https git auth
Remove gitFull and associated secret-store auth save mechanism Also set default pinentry flavour to curses, but still set to gnome3 in hyprland setup - provides fall back for non-GUI interfaces
This commit is contained in:
parent
42051a089a
commit
dfaa360dfe
6
home/accounts/git-pass-mapping.ini
Normal file
6
home/accounts/git-pass-mapping.ini
Normal file
|
@ -0,0 +1,6 @@
|
|||
[DEFAULT]
|
||||
username_extractor=regex_search
|
||||
regex_username=^login: (.*)$
|
||||
|
||||
[*]
|
||||
target=git/${host}
|
|
@ -1,7 +1,6 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = [ pkgs.pinentry ];
|
||||
{ config, lib, pkgs, ... }: {
|
||||
xdg.configFile."pass-git-helper/git-pass-mapping.ini".source =
|
||||
./git-pass-mapping.ini;
|
||||
programs = {
|
||||
gpg.enable = true;
|
||||
password-store = {
|
||||
|
@ -13,6 +12,9 @@
|
|||
PASSWORD_STORE_ENABLE_EXTENSIONS = "true";
|
||||
};
|
||||
};
|
||||
git.extraConfig.credential = {
|
||||
helper = "${pkgs.pass-git-helper}/bin/pass-git-helper";
|
||||
};
|
||||
};
|
||||
services = {
|
||||
gpg-agent = rec {
|
||||
|
@ -20,7 +22,7 @@
|
|||
maxCacheTtl = 86400;
|
||||
defaultCacheTtl = maxCacheTtl;
|
||||
defaultCacheTtlSsh = maxCacheTtl;
|
||||
pinentryFlavor = "gnome3";
|
||||
pinentryFlavor = lib.mkDefault "curses";
|
||||
extraConfig = ''
|
||||
no-allow-external-cache
|
||||
'';
|
||||
|
|
|
@ -70,7 +70,6 @@
|
|||
};
|
||||
git = {
|
||||
enable = true;
|
||||
package = pkgs.gitFull;
|
||||
userName = "Evie Litherland-Smith";
|
||||
userEmail = lib.mkDefault "evie@xenia.me.uk";
|
||||
delta = {
|
||||
|
@ -89,7 +88,6 @@
|
|||
init.defaultBranch = "main";
|
||||
merge.conflictstyle = "diff3";
|
||||
diff.colorMoved = "default";
|
||||
credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret";
|
||||
};
|
||||
};
|
||||
ssh = {
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ config, lib, pkgs, ... }: {
|
||||
imports = [ ./waybar/default.nix ];
|
||||
services = {
|
||||
gpg-agent.pinentryFlavor = "gnome3";
|
||||
avizo.enable = true;
|
||||
syncthing.enable = true;
|
||||
udiskie = {
|
||||
|
|
|
@ -8,7 +8,8 @@
|
|||
coreutils
|
||||
libsecret
|
||||
gnumake
|
||||
gitFull
|
||||
git
|
||||
pinentry
|
||||
zip
|
||||
unzip
|
||||
fd
|
||||
|
|
Loading…
Reference in a new issue