Enable ssh-agent instead of leaving it to gpg

This commit is contained in:
Sameer Rahmani 2024-03-09 22:08:36 +00:00
parent 40a728dca5
commit 667a1e46cf
Signed by: lxsameer
GPG Key ID: 8741FACBF412FFA5
5 changed files with 8 additions and 32 deletions

View File

@ -1,27 +0,0 @@
# Universe - The big bang to my universe
#
# Copyright (c) 2023-2024 Sameer Rahmani <lxsameer@gnu.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, version 2.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
{ lib, stdenv, runCommand, gpg_public_key, fingerprint, user, gnupg }:
runCommand "universe-secrets-${user}" { } ''
mkdir -p $out/build
${gnupg}/bin/gpg --homedir $out/build -k
echo '${fingerprint}:6' | ${gnupg}/bin/gpg --homedir $out/build --import-ownertrust
${gnupg}/bin/gpg --homedir $out/build --import ${gpg_public_key}
mv -v $out/build/pubring.kbx $out/build/trustdb.gpg $out/
echo 'disable-ccid' > $out/scdaemon.conf
rm -rf $out/build
''

View File

@ -238,11 +238,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1709591737,
"narHash": "sha256-R0eaG1RDOBsAgnDKrG+WSBxDHi2+M3Qo918415JwZoM=",
"lastModified": 1710021649,
"narHash": "sha256-erHUBiFoe08pi2wlg6PGcSTrhtt3OrE8KxohJOBV/Zc=",
"ref": "v4",
"rev": "248fbdf082ac9fb45c360aafcc7691436792aa12",
"revCount": 1049,
"rev": "70f14f5928c6cffb3be81784425b57d984a00acd",
"revCount": 1050,
"type": "git",
"url": "https://devheroes.codes/FG42/FG42"
},

View File

@ -39,7 +39,7 @@ rec {
# (r)age by default can't find age-plugin-yubikey during the configuration
# this is a wrapper to force age-plugin-yubikey into its PATH
age.ageBin = "${rager}/bin/rager";
environment.systemPackages = builtins.trace ">> ${rager}" [
environment.systemPackages = [
(inputs.agenix.packages.x86_64-linux.default.override { ageBin = "${rager}/bin/rager"; })
];

View File

@ -386,4 +386,5 @@
storePath = "$HOME/.pass_store";
};
services.ssh-agent.enable = true;
}

View File

@ -341,4 +341,6 @@
qt = {
platformTheme = "gtk";
};
services.ssh-agent.enable = true;
}