Git now waits for /run/secrets/
This commit is contained in:
		
							parent
							
								
									608cff7116
								
							
						
					
					
						commit
						72b8720bcc
					
				@ -64,6 +64,7 @@
 | 
			
		||||
    wget
 | 
			
		||||
    git
 | 
			
		||||
    tree
 | 
			
		||||
    file
 | 
			
		||||
    ripgrep
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -6,8 +6,6 @@
 | 
			
		||||
}:
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
  home-manager.users.mysaa.programs.gpg.homedir = "/run/secrets/gpg/";
 | 
			
		||||
 | 
			
		||||
  home-manager.users.mysaa.programs.git = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    userEmail = "mysaa@hadoly.fr";
 | 
			
		||||
 | 
			
		||||
@ -4,11 +4,26 @@
 | 
			
		||||
  pkgs,
 | 
			
		||||
  ...
 | 
			
		||||
}:
 | 
			
		||||
{
 | 
			
		||||
let
 | 
			
		||||
  gpg-wrapper = pkgs.writeShellScriptBin "gpg" ''
 | 
			
		||||
    until ${pkgs.coreutils}/bin/timeout 1 [ -d /run/secrets/gpg/ ]
 | 
			
		||||
    do
 | 
			
		||||
      echo "Waiting for '/run/secrets/' to be mounted" >&2
 | 
			
		||||
      sleep 1
 | 
			
		||||
    done
 | 
			
		||||
    if [ -z "$GNUPGHOME" ]
 | 
			
		||||
    then export GNUPGHOME="/run/secrets/gpg/"
 | 
			
		||||
    fi
 | 
			
		||||
    ${pkgs.gnupg}/bin/gpg "$@"
 | 
			
		||||
  '';
 | 
			
		||||
in {
 | 
			
		||||
 | 
			
		||||
  home-manager.users.mysaa.home.packages = [
 | 
			
		||||
    gpg-wrapper
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  home-manager.users.mysaa.programs.git.signing.signer = "${gpg-wrapper}/bin/gpg";
 | 
			
		||||
 | 
			
		||||
  home-manager.users.mysaa.home.sessionVariables = {
 | 
			
		||||
    GNUPGHOME = "/run/secrets/gpg/";
 | 
			
		||||
  };
 | 
			
		||||
  fileSystems."/run/secrets" = {
 | 
			
		||||
    device = "/dev/disk/by-uuid/545bfd15-0973-4395-9d05-6c4c78a9e45c";
 | 
			
		||||
    fsType = "ext4";
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user