diff options
| author |  drduh <github@duh.to>
| 2025-04-22 00:30:37 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-04-22 00:30:37 +0000 |
| commit | 3912fc0f204cd0c4113bae38e19f68db8cbfa63c (patch) | |
| tree | e2f3fd20ff0d1166e35ab7014e6075c7bdc4b83d | |
| parent | 65f8efca51738893adf3116cd7d223e256732862 (diff) | |
| parent | 7d83cf9f13ec9fdb9735858e4e486b7cd063dca7 (diff) | |
| download | YubiKey-Guide-3912fc0f204cd0c4113bae38e19f68db8cbfa63c.tar.gz YubiKey-Guide-3912fc0f204cd0c4113bae38e19f68db8cbfa63c.tar.zst YubiKey-Guide-3912fc0f204cd0c4113bae38e19f68db8cbfa63c.zip | |
Merge pull request #490 from drduh/wip-20apr25
update nix readme reference to fix #486
| -rw-r--r-- | nix/flake.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/nix/flake.nix b/nix/flake.nix index 475885c..abcc83f 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -3,14 +3,11 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; - drduhConfig.url = "github:drduh/config"; - drduhConfig.flake = false; }; outputs = { self, nixpkgs, - drduhConfig, }: let mkSystem = system: nixpkgs.lib.nixosSystem { @@ -26,7 +23,7 @@ ... }: let gpgAgentConf = pkgs.runCommand "gpg-agent.conf" {} '' - sed '/pinentry-program/d' ${drduhConfig}/gpg-agent.conf > $out + sed '/pinentry-program/d' ${self}/../config/gpg-agent.conf > $out echo "pinentry-program ${pkgs.pinentry.curses}/bin/pinentry" >> $out ''; dicewareAddress = "localhost"; @@ -36,14 +33,14 @@ if [ -z "$viewer" ]; then viewer="${pkgs.glow}/bin/glow -p" fi - exec $viewer "${self}/README.md" + exec $viewer "${self}/../README.md" ''; shortcut = pkgs.makeDesktopItem { name = "yubikey-guide"; icon = "${pkgs.yubikey-manager-qt}/share/icons/hicolor/128x128/apps/ykman.png"; - desktopName = "drduh's YubiKey Guide"; + desktopName = "YubiKey Guide"; genericName = "Guide to using YubiKey for GnuPG and SSH"; - comment = "Open the guide in a reader program"; + comment = "Open YubiKey Guide in a reader program"; categories = ["Documentation"]; exec = "${viewYubikeyGuide}/bin/view-yubikey-guide"; }; @@ -247,7 +244,7 @@ echo "Creating \$GNUPGHOME…" install --verbose -m=0700 --directory="$GNUPGHOME" fi - [ ! -f "$GNUPGHOME/gpg.conf" ] && cp --verbose "${drduhConfig}/gpg.conf" "$GNUPGHOME/gpg.conf" + [ ! -f "$GNUPGHOME/gpg.conf" ] && cp --verbose "${self}/../config/gpg.conf" "$GNUPGHOME/gpg.conf" [ ! -f "$GNUPGHOME/gpg-agent.conf" ] && cp --verbose ${gpgAgentConf} "$GNUPGHOME/gpg-agent.conf" echo "\$GNUPGHOME is \"$GNUPGHOME\"" ''; |