From 241347b92602165fe3a781818db6ea58c03b499d Mon Sep 17 00:00:00 2001
From: "Frankie B." <git@diskfloppy.me>
Date: Sun, 18 Feb 2024 01:09:22 +0000
Subject: Janky "fix" to make 1pass git/ssh work
---
homes/floppydisk/default.nix | 3 ++-
homes/floppydisk/git.nix | 17 +++++++++++++++++
homes/floppydisk/ssh.nix | 8 ++++++--
3 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 homes/floppydisk/git.nix
(limited to 'homes/floppydisk')
diff --git a/homes/floppydisk/default.nix b/homes/floppydisk/default.nix
index 345e17c..766f18b 100644
--- a/homes/floppydisk/default.nix
+++ b/homes/floppydisk/default.nix
@@ -1,12 +1,13 @@
{
pkgs,
lib,
- inputs,
...
}: {
imports = [
./packages.nix # home.packages and similar stuff
./neovim-flake.nix
+ ./ssh.nix
+ ./git.nix
];
home = {
diff --git a/homes/floppydisk/git.nix b/homes/floppydisk/git.nix
new file mode 100644
index 0000000..d6558fd
--- /dev/null
+++ b/homes/floppydisk/git.nix
@@ -0,0 +1,17 @@
+{
+ nixosConfig,
+ lib,
+ pkgs,
+ ...
+}: {
+ programs.git = {
+ extraConfig = {
+ init.defaultBranch = "master";
+ gpg.format = "ssh";
+ gpg."ssh".program = "${pkgs._1password-gui}/bin/op-ssh-sign";
+ commit.gpgsign = true;
+ user.signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcwriIE5K8SVewvVdgNvmhtAVvJPtMnNkkS4ETi5YgJ";
+ push.autoSetupRemote = true;
+ };
+ };
+}
diff --git a/homes/floppydisk/ssh.nix b/homes/floppydisk/ssh.nix
index 99e77c5..e59d218 100644
--- a/homes/floppydisk/ssh.nix
+++ b/homes/floppydisk/ssh.nix
@@ -12,6 +12,10 @@ in {
programs.ssh = {
enable = true;
forwardAgent = _1passwordAgent.enable;
- extraConfig = lib.optionalString _1passwordAgent.enable "IdentityAgent ${_1passwordAgent.path}";
+ extraConfig = ''
+ Host *
+ IdentityAgent ~/.1password/agent.sock
+ '';
};
-}
\ No newline at end of file
+}
+
--
cgit v1.2.3-54-g00ecf