diff options
| author | Ben Sima <ben@bsima.me> | 2021-04-15 17:22:43 -0400 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2021-04-15 17:22:43 -0400 |
| commit | 29e54559af990489a233fdb81cc7e41d50429212 (patch) | |
| tree | 4ce4b32b5d51101b1601a4a6331d53b110a3c41b /lib | |
| parent | 6eb3fd14976e3ecd5677f51d8574d428ea045d87 (diff) | |
fix install.sh and (almost) add opentimestamps with git wrapper
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.nix | 17 | ||||
| -rw-r--r-- | lib/packages.nix | 1 |
2 files changed, 16 insertions, 2 deletions
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 |