From 90e06eb0eceaf6585087a50664b12541acbf6bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Czy=C5=BC?= <mike@c2yz.com>
Date: Thu, 7 Nov 2024 18:22:24 +0100
Subject: [PATCH] git config

---
 home/programs/git.nix      | 18 +++++++-----------
 home/programs/packages.nix |  6 ++++--
 hosts/modules/ssh.nix      |  3 +++
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/home/programs/git.nix b/home/programs/git.nix
index ae4ba5d..f993428 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -1,29 +1,25 @@
-{ pkgs, config, ... }: {
+{
   programs.git = {
     enable = true;
 
     userName = "Michał Czyż";
     userEmail = "mike@c2yz.com";
 
+    signing = {
+      key = "9745B9E27E2B1ABB";
+      signByDefault = true;
+    };
+
     extraConfig = {
       init.defaultBranch = "main";
       push.autoSetupRemote = true;
-      user.signingkey = "9745B9E27E2B1ABB";
       commit.gpgsign = true;
       push.enabled = true;
       column.ui = "auto";
       branch.sort = "-committerdate";
       pull.rebase = "false";
       rerere.enabled = true;
-      # gpg = {
-      #   format = "ssh";
-      #   ssh.defaultKeyCommand = pkgs.writeShellScript "git_key" ''
-      #     if ssh-add -L | grep -vq '${config.local.keys.senpai}'; then
-      #       ssh-add -t 1m ~/.ssh/id_ed25519
-      #     fi
-      #     echo 'key::${config.local.keys.senpai}'
-      #   '';
-      # };
+      tag.gpgSign = true;
       push.gpgsign = "if-asked";
     };
   };
diff --git a/home/programs/packages.nix b/home/programs/packages.nix
index 32c61b7..94dfeaa 100644
--- a/home/programs/packages.nix
+++ b/home/programs/packages.nix
@@ -1,5 +1,8 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
+  programs.direnv.enable = true;
+  programs.direnv.nix-direnv.enable = true;
+
   home.packages = with pkgs; [
     # > graphics < #
     tuxpaint
@@ -77,6 +80,5 @@
     vim
     nixfmt-rfc-style
     nemo
-    nix-direnv
   ];
 }
diff --git a/hosts/modules/ssh.nix b/hosts/modules/ssh.nix
index 0d38e09..38f36b1 100644
--- a/hosts/modules/ssh.nix
+++ b/hosts/modules/ssh.nix
@@ -12,4 +12,7 @@
     };
   };
 
+  programs.ssh = {
+    startAgent = true;
+  };
 }