From dba3a46ebd5713e811b02ffe0e1b4d8fb441a14e Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sat, 22 Oct 2016 15:37:20 +0200
Subject: [PATCH 1/4] fichier inutile

---
 public/hydra.nix | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 public/hydra.nix

diff --git a/public/hydra.nix b/public/hydra.nix
deleted file mode 100644
index 253902a..0000000
--- a/public/hydra.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  ####################################### HYDRA
-
-  virtualisation.virtualbox.host.enable = true;
-
-  # une fois installé :
-  # 1. créer chef SSH : ssh-keygen -C "hydra@pedro.dubronetwork.fr" -N "" -f /etc/nixos/id_buildfarm
-  # 2. récupérer la clef publique du serveur ssh : ssh-keyscan localhost + l'ajouter dans les knownHosts
-  # 2. créer un utilisateur
-  # su - hydra
-  # hydra-create-user jpierre03 --password toto --role 'admin'
-  # accessible à hydra.pedro.dubnronetwork.fr
-  services.hydra = {
-    enable = true;
-    hydraURL = "http://hydra.pedro.dubronetwork.fr";
-    notificationSender = "hydra@${config.networking.hostName}";
-    listenHost = "localhost";
-    minimumDiskFree = 50; # Go
-  };
-
-  programs.ssh.knownHosts."pedro.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD";
-  nix = {
-    distributedBuilds = true;
-    buildMachines = [
-      { hostName = "pedro.dubronetwork.fr"; maxJobs = 2; speedFactor = 10; sshKey = "/etc/nixos/id_buildfarm"; sshUser = "root"; system = "x86_64-linux"; }
-    ];
-    extraOptions = "auto-optimise-store = true";
-  };
-  #  nix.gc = {
-  #  automatic = true;
-  #};
-}

From 9e8d3b24b386688ec6867de7d9667be9ef8ca68f Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sat, 22 Oct 2016 15:37:50 +0200
Subject: [PATCH 2/4] correction du nom d'utilisateur pour le build

---
 public/service-hydra-build.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/service-hydra-build.nix b/public/service-hydra-build.nix
index c5b681a..e997a30 100644
--- a/public/service-hydra-build.nix
+++ b/public/service-hydra-build.nix
@@ -19,7 +19,7 @@ mkIf cfg.hydra-builder {
   virtualisation.virtualbox.host.enable = true;
   nix.gc.automatic = true;
 
-  users.users."hydrabuild" = {
+  users.users."hydrabld" = {
     description = "Execution des job hydra";
     group = "nixbld";
     isNormalUser = false;

From 2982725e0b8d12f00497f6f8abb88e1fe11cdb25 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Tue, 25 Oct 2016 19:52:10 +0200
Subject: [PATCH 3/4] fix: variables d'environnement pour gpg (et donc pass)

---
 public/bash-interactive-init.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/bash-interactive-init.sh b/public/bash-interactive-init.sh
index 3b9f2e6..aad7d75 100644
--- a/public/bash-interactive-init.sh
+++ b/public/bash-interactive-init.sh
@@ -16,3 +16,8 @@ case "$TERM" in
     xterm) TERM=xterm-256color;;
     screen) TERM=screen-256color;;
 esac
+
+# info gnupg, invocate gpg agent
+GPG_TTY=$(tty)
+export GPG_TTY
+

From 3b04c2edb0b7e418bc36309f153ba63ab83cf097 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Tue, 25 Oct 2016 19:52:45 +0200
Subject: [PATCH 4/4] alias gpg -> gpg2

---
 public/environment.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/environment.nix b/public/environment.nix
index 558f019..15fd39b 100644
--- a/public/environment.nix
+++ b/public/environment.nix
@@ -57,6 +57,7 @@ in
     ];
     shellAliases = {
       byobu = "byobu-tmux";
+      gpg = "gpg2";
       jacques-a-dit = "sudo";
       tree = "tree -C";
       tree1 = "tree -d -L 1";