From 29e54559af990489a233fdb81cc7e41d50429212 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Thu, 15 Apr 2021 17:22:43 -0400
Subject: fix install.sh and (almost) add opentimestamps with git wrapper

---
 install.sh       |  5 ++++-
 lib/common.nix   | 17 +++++++++++++++--
 lib/packages.nix |  1 +
 linux.nix        |  4 ++--
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index 1e8d2a9..ebb84c5 100755
--- a/install.sh
+++ b/install.sh
@@ -25,4 +25,7 @@ mkdir -p ~/.config/notmuch
 # symlinking must occur before initial generation. now we can install, and
 # pin our own nixpkgs.
 #
-nix-shell ./default.nix -A install
+# set channels
+nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
+nix-channel --update
+nix-shell '<home-manager>' -A install
diff --git a/lib/common.nix b/lib/common.nix
index d4eadc3..70995f9 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -84,6 +84,16 @@ in
       package = pkgs.gitAndTools.gitFull;
       signing = {
         key = gpgid;
+        # for some reason this fails...
+        #gpgPath =
+        #  let
+        #    script = pkgs.writeScriptBin "my-ots-git-gpg-wrapper" ''
+        #      #!/usr/bin/env bash
+        #      set -euxo pipefail
+        #      ${pkgs.opentimestamps-client}/bin/ots-git-gpg-wrapper --gpg-program ${pkgs.gnupg}/bin/gpg $@
+        #    '';
+        #  in
+        #    "${script}/bin/my-ots-git-gpg-wrapper";
       };
       aliases = {
         authors = "shortlog -s -n";
@@ -102,7 +112,10 @@ in
           composeencoding = "UTF-8";
           annotate = "yes";
         };
-        log.date = "local";
+        log = {
+          date = "local";
+          showSignature = true;
+        };
       };
 
     };
@@ -347,7 +360,7 @@ in
         gl = "git pull --prune";
         gp = "git push origin HEAD";
         gs = "git status -sb";
-        hs = "home-manager switch";
+        hs = "NIX_PATH=$HOME/.nix-defexpr/channels$\{NIX_PATH:+:\}$NIX_PATH home-manager switch";
         ll = "ls -lah";
         rm = "rm -i";
         s = ''
diff --git a/lib/packages.nix b/lib/packages.nix
index f8b3efb..4cc6fda 100644
--- a/lib/packages.nix
+++ b/lib/packages.nix
@@ -51,6 +51,7 @@ mononoki
 ncdu
 nix-prefetch-scripts
 noto-fonts-emoji
+opentimestamps-client
 ormolu
 paperkey
 pass
diff --git a/linux.nix b/linux.nix
index c4ebe9c..7f2ec02 100644
--- a/linux.nix
+++ b/linux.nix
@@ -357,8 +357,8 @@ in
     gpg-agent = {
       enable = true;
       enableScDaemon = true;
-      defaultCacheTtl = 72000;
-      maxCacheTtl = 7200;
+      defaultCacheTtl = 1800; # 30 minutes
+      maxCacheTtl = 7200; # 2 hours
       enableSshSupport = false;
       enableExtraSocket = true;
       verbose = true;
-- 
cgit v1.2.3